diff --git a/Examples/python/simulation/ex06_Reflectometry/FootprintCorrection.py b/Examples/python/simulation/ex06_Reflectometry/FootprintCorrection.py
index 8cf816685870090a3dbb912edfd11025a81e90c0..09feec5f35774390b479f9b2ae5515d77c16f711 100644
--- a/Examples/python/simulation/ex06_Reflectometry/FootprintCorrection.py
+++ b/Examples/python/simulation/ex06_Reflectometry/FootprintCorrection.py
@@ -66,8 +66,10 @@ def plot(sim_result_1, sim_result_2):
     Plots results from two different simulations
     """
 
-    plt.semilogy(*get_plot_data(sim_result_1), *get_plot_data(sim_result_2))
-
+    x1, y1 = get_plot_data(sim_result_1)
+    x2, y2 = get_plot_data(sim_result_2)
+    plt.semilogy(x1, y1, x2, y2)
+    
     plt.xlabel(r'$\alpha_i \; (deg)$', fontsize=16)
     plt.ylabel(r'Intensity', fontsize=16)
 
diff --git a/Wrap/python/__init__.py.in b/Wrap/python/__init__.py.in
index 38ee0f5a9f6cc54f25919c3c0795212b3b496318..6ee593b40aad69bf2beb94c4624039acc73b5512 100644
--- a/Wrap/python/__init__.py.in
+++ b/Wrap/python/__init__.py.in
@@ -7,8 +7,8 @@ sys.path.append(os.path.abspath(
 # this line needed to fix python3 import problem
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 
-from .libBornAgainFit import *
-from .libBornAgainCore import *
+from libBornAgainFit import *
+from libBornAgainCore import *
 
 
 # To prevent inclusion of plotting tools during functional tests:
diff --git a/Wrap/swig/extendFit.i b/Wrap/swig/extendFit.i
index 62d1189fe932bc2c36100f5a339e33ffdee35d02..d3cd6bcb195a03471521a518210f6950116924bf 100644
--- a/Wrap/swig/extendFit.i
+++ b/Wrap/swig/extendFit.i
@@ -45,13 +45,8 @@ namespace Fit {
 
 %extend Parameter{
 %pythoncode %{
-__swig_getmethods__["value"] = value
-__swig_setmethods__["value"] = setValue
-__swig_getmethods__["error"] = error
-__swig_setmethods__["error"] = setError
-if _newclass:
-    value = property(value, setValue)
-    error = property(error, setError)
+value = property(value, setValue)
+error = property(error, setError)
 
 
 %}
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index 14e62823acd068b961249819a46bf3e79cd9be2a..0751cb5f5b214ccb507d247e6ab3135ba2fbfa49 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -15,7 +15,7 @@
 //
 // ************************************************************************** //
 
-%module(directors="1") "libBornAgainCore"
+%module(directors="1", moduleimport="import $module") "libBornAgainCore"
 
 %feature("autodoc");
 
diff --git a/Wrap/swig/libBornAgainFit.i b/Wrap/swig/libBornAgainFit.i
index 876f6e1bf791c0f7afb1c1487f9b174da5483260..5276b9706b54fd74a4cb2dc5afcc8e07c6731fad 100644
--- a/Wrap/swig/libBornAgainFit.i
+++ b/Wrap/swig/libBornAgainFit.i
@@ -15,7 +15,7 @@
 //
 // ************************************************************************** //
 
-%module(directors="1") "libBornAgainFit"
+%module(directors="1", moduleimport="import $module") "libBornAgainFit"
 
 %feature("autodoc");
 
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 52d21f9f16388a20acec5f1af012f2bf4b71e7b0..1e2a5abee9d7e700191c636bbfe5e32986944da8 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -1,85 +1,20 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.12
+# Version 4.0.1
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 from sys import version_info as _swig_python_version_info
-if _swig_python_version_info >= (2, 7, 0):
-    def swig_import_helper():
-        import importlib
-        pkg = __name__.rpartition('.')[0]
-        mname = '.'.join((pkg, '_libBornAgainCore')).lstrip('.')
-        try:
-            return importlib.import_module(mname)
-        except ImportError:
-            return importlib.import_module('_libBornAgainCore')
-    _libBornAgainCore = swig_import_helper()
-    del swig_import_helper
-elif _swig_python_version_info >= (2, 6, 0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_libBornAgainCore', [dirname(__file__)])
-        except ImportError:
-            import _libBornAgainCore
-            return _libBornAgainCore
-        try:
-            _mod = imp.load_module('_libBornAgainCore', fp, pathname, description)
-        finally:
-            if fp is not None:
-                fp.close()
-        return _mod
-    _libBornAgainCore = swig_import_helper()
-    del swig_import_helper
-else:
-    import _libBornAgainCore
-del _swig_python_version_info
+if _swig_python_version_info < (2, 7, 0):
+    raise RuntimeError("Python 2.7 or later required")
 
-try:
-    _swig_property = property
-except NameError:
-    pass  # Python < 2.2 doesn't have 'property'.
+import _libBornAgainCore
 
 try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
 
-def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
-    if (name == "thisown"):
-        return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name, None)
-    if method:
-        return method(self, value)
-    if (not static):
-        if _newclass:
-            object.__setattr__(self, name, value)
-        else:
-            self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-
-def _swig_setattr(self, class_type, name, value):
-    return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-
-
-def _swig_getattr(self, class_type, name):
-    if (name == "thisown"):
-        return self.this.own()
-    method = class_type.__swig_getmethods__.get(name, None)
-    if method:
-        return method(self)
-    raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
-
-
 def _swig_repr(self):
     try:
         strthis = "proxy of " + self.this.__repr__()
@@ -87,130 +22,128 @@ def _swig_repr(self):
         strthis = ""
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
-try:
-    _object = object
-    _newclass = 1
-except __builtin__.Exception:
-    class _object:
-        pass
-    _newclass = 0
 
-try:
-    import weakref
-    weakref_proxy = weakref.proxy
-except __builtin__.Exception:
-    weakref_proxy = lambda x: x
+def _swig_setattr_nondynamic_instance_variable(set):
+    def set_instance_attr(self, name, value):
+        if name == "thisown":
+            self.this.own(value)
+        elif name == "this":
+            set(self, name, value)
+        elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add instance attributes to %s" % self)
+    return set_instance_attr
+
+
+def _swig_setattr_nondynamic_class_variable(set):
+    def set_class_attr(cls, name, value):
+        if hasattr(cls, name) and not isinstance(getattr(cls, name), property):
+            set(cls, name, value)
+        else:
+            raise AttributeError("You cannot add class attributes to %s" % cls)
+    return set_class_attr
+
+
+def _swig_add_metaclass(metaclass):
+    """Class decorator for adding a metaclass to a SWIG wrapped class - a slimmed down version of six.add_metaclass"""
+    def wrapper(cls):
+        return metaclass(cls.__name__, cls.__bases__, cls.__dict__.copy())
+    return wrapper
+
 
+class _SwigNonDynamicMeta(type):
+    """Meta class to enforce nondynamic attributes (no new attributes) for a class"""
+    __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
 
-class SwigPyIterator(_object):
-    """Proxy of C++ swig::SwigPyIterator class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SwigPyIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SwigPyIterator, name)
+import weakref
+
+class SwigPyIterator(object):
+    r"""Proxy of C++ swig::SwigPyIterator class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_SwigPyIterator
-    __del__ = lambda self: None
 
     def value(self):
-        """value(SwigPyIterator self) -> PyObject *"""
+        r"""value(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainCore.SwigPyIterator_value(self)
 
-
     def incr(self, n=1):
-        """
-        incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator
-        incr(SwigPyIterator self) -> SwigPyIterator
-        """
+        r"""incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator_incr(self, n)
 
-
     def decr(self, n=1):
-        """
-        decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator
-        decr(SwigPyIterator self) -> SwigPyIterator
-        """
+        r"""decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator_decr(self, n)
 
-
     def distance(self, x):
-        """distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"""
+        r"""distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"""
         return _libBornAgainCore.SwigPyIterator_distance(self, x)
 
-
     def equal(self, x):
-        """equal(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""equal(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainCore.SwigPyIterator_equal(self, x)
 
-
     def copy(self):
-        """copy(SwigPyIterator self) -> SwigPyIterator"""
+        r"""copy(SwigPyIterator self) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator_copy(self)
 
-
     def next(self):
-        """next(SwigPyIterator self) -> PyObject *"""
+        r"""next(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainCore.SwigPyIterator_next(self)
 
-
     def __next__(self):
-        """__next__(SwigPyIterator self) -> PyObject *"""
+        r"""__next__(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainCore.SwigPyIterator___next__(self)
 
-
     def previous(self):
-        """previous(SwigPyIterator self) -> PyObject *"""
+        r"""previous(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainCore.SwigPyIterator_previous(self)
 
-
     def advance(self, n):
-        """advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator_advance(self, n)
 
-
     def __eq__(self, x):
-        """__eq__(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""__eq__(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainCore.SwigPyIterator___eq__(self, x)
 
-
     def __ne__(self, x):
-        """__ne__(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""__ne__(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainCore.SwigPyIterator___ne__(self, x)
 
-
     def __iadd__(self, n):
-        """__iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator___iadd__(self, n)
 
-
     def __isub__(self, n):
-        """__isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator___isub__(self, n)
 
-
     def __add__(self, n):
-        """__add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainCore.SwigPyIterator___add__(self, n)
 
-
     def __sub__(self, *args):
-        """
+        r"""
         __sub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator
         __sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t
         """
         return _libBornAgainCore.SwigPyIterator___sub__(self, *args)
-
     def __iter__(self):
         return self
-SwigPyIterator_swigregister = _libBornAgainCore.SwigPyIterator_swigregister
-SwigPyIterator_swigregister(SwigPyIterator)
+
+# Register SwigPyIterator in _libBornAgainCore:
+_libBornAgainCore.SwigPyIterator_swigregister(SwigPyIterator)
 
 SHARED_PTR_DISOWN = _libBornAgainCore.SHARED_PTR_DISOWN
 
+
 import warnings
 def deprecated(message):
   def deprecated_decorator(func):
@@ -224,104 +157,86 @@ def deprecated(message):
       return deprecated_func
   return deprecated_decorator
 
-class vdouble1d_t(_object):
-    """Proxy of C++ std::vector<(double)> class."""
+class vdouble1d_t(object):
+    r"""Proxy of C++ std::vector< double > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble1d_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vdouble1d_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vdouble1d_t self) -> SwigPyIterator"""
+        r"""iterator(vdouble1d_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vdouble1d_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vdouble1d_t self) -> bool"""
+        r"""__nonzero__(vdouble1d_t self) -> bool"""
         return _libBornAgainCore.vdouble1d_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vdouble1d_t self) -> bool"""
+        r"""__bool__(vdouble1d_t self) -> bool"""
         return _libBornAgainCore.vdouble1d_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""__len__(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainCore.vdouble1d_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"""
+        r"""__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"""
         return _libBornAgainCore.vdouble1d_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)
         __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)
         """
         return _libBornAgainCore.vdouble1d_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"""
+        r"""__delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"""
         return _libBornAgainCore.vdouble1d_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vdouble1d_t self, std::vector< double >::difference_type i)
         __delitem__(vdouble1d_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vdouble1d_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vdouble1d_t self, PySliceObject * slice) -> vdouble1d_t
         __getitem__(vdouble1d_t self, std::vector< double >::difference_type i) -> std::vector< double >::value_type const &
         """
         return _libBornAgainCore.vdouble1d_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vdouble1d_t self, PySliceObject * slice, vdouble1d_t v)
         __setitem__(vdouble1d_t self, PySliceObject * slice)
         __setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)
         """
         return _libBornAgainCore.vdouble1d_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vdouble1d_t self) -> std::vector< double >::value_type"""
+        r"""pop(vdouble1d_t self) -> std::vector< double >::value_type"""
         return _libBornAgainCore.vdouble1d_t_pop(self)
 
-
     def append(self, x):
-        """append(vdouble1d_t self, std::vector< double >::value_type const & x)"""
+        r"""append(vdouble1d_t self, std::vector< double >::value_type const & x)"""
         return _libBornAgainCore.vdouble1d_t_append(self, x)
 
-
     def empty(self):
-        """empty(vdouble1d_t self) -> bool"""
+        r"""empty(vdouble1d_t self) -> bool"""
         return _libBornAgainCore.vdouble1d_t_empty(self)
 
-
     def size(self):
-        """size(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""size(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainCore.vdouble1d_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vdouble1d_t self, vdouble1d_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -329,211 +244,172 @@ class vdouble1d_t(_object):
         """
         return _libBornAgainCore.vdouble1d_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vdouble1d_t self) -> std::vector< double >::iterator"""
+        r"""begin(vdouble1d_t self) -> std::vector< double >::iterator"""
         return _libBornAgainCore.vdouble1d_t_begin(self)
 
-
     def end(self):
-        """end(vdouble1d_t self) -> std::vector< double >::iterator"""
+        r"""end(vdouble1d_t self) -> std::vector< double >::iterator"""
         return _libBornAgainCore.vdouble1d_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
+        r"""rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
         return _libBornAgainCore.vdouble1d_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
+        r"""rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
         return _libBornAgainCore.vdouble1d_t_rend(self)
 
-
     def clear(self):
-        """clear(vdouble1d_t self)"""
+        r"""clear(vdouble1d_t self)"""
         return _libBornAgainCore.vdouble1d_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"""
+        r"""get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"""
         return _libBornAgainCore.vdouble1d_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vdouble1d_t self)"""
+        r"""pop_back(vdouble1d_t self)"""
         return _libBornAgainCore.vdouble1d_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vdouble1d_t self, std::vector< double >::iterator pos) -> std::vector< double >::iterator
         erase(vdouble1d_t self, std::vector< double >::iterator first, std::vector< double >::iterator last) -> std::vector< double >::iterator
         """
         return _libBornAgainCore.vdouble1d_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vdouble1d_t self) -> vdouble1d_t
+        __init__(vdouble1d_t self, vdouble1d_t other) -> vdouble1d_t
+        __init__(vdouble1d_t self, std::vector< double >::size_type size) -> vdouble1d_t
+        __init__(vdouble1d_t self, std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t
         """
-        __init__(std::vector<(double)> self) -> vdouble1d_t
-        __init__(std::vector<(double)> self, vdouble1d_t arg2) -> vdouble1d_t
-        __init__(std::vector<(double)> self, std::vector< double >::size_type size) -> vdouble1d_t
-        __init__(std::vector<(double)> self, std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t
-        """
-        this = _libBornAgainCore.new_vdouble1d_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vdouble1d_t_swiginit(self, _libBornAgainCore.new_vdouble1d_t(*args))
 
     def push_back(self, x):
-        """push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"""
+        r"""push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"""
         return _libBornAgainCore.vdouble1d_t_push_back(self, x)
 
-
     def front(self):
-        """front(vdouble1d_t self) -> std::vector< double >::value_type const &"""
+        r"""front(vdouble1d_t self) -> std::vector< double >::value_type const &"""
         return _libBornAgainCore.vdouble1d_t_front(self)
 
-
     def back(self):
-        """back(vdouble1d_t self) -> std::vector< double >::value_type const &"""
+        r"""back(vdouble1d_t self) -> std::vector< double >::value_type const &"""
         return _libBornAgainCore.vdouble1d_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"""
+        r"""assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"""
         return _libBornAgainCore.vdouble1d_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vdouble1d_t self, std::vector< double >::size_type new_size)
         resize(vdouble1d_t self, std::vector< double >::size_type new_size, std::vector< double >::value_type const & x)
         """
         return _libBornAgainCore.vdouble1d_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator
         insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::size_type n, std::vector< double >::value_type const & x)
         """
         return _libBornAgainCore.vdouble1d_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vdouble1d_t self, std::vector< double >::size_type n)"""
+        r"""reserve(vdouble1d_t self, std::vector< double >::size_type n)"""
         return _libBornAgainCore.vdouble1d_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""capacity(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainCore.vdouble1d_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vdouble1d_t
-    __del__ = lambda self: None
-vdouble1d_t_swigregister = _libBornAgainCore.vdouble1d_t_swigregister
-vdouble1d_t_swigregister(vdouble1d_t)
 
-class vdouble2d_t(_object):
-    """Proxy of C++ std::vector<(std::vector<(double)>)> class."""
+# Register vdouble1d_t in _libBornAgainCore:
+_libBornAgainCore.vdouble1d_t_swigregister(vdouble1d_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble2d_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vdouble2d_t, name)
+class vdouble2d_t(object):
+    r"""Proxy of C++ std::vector< std::vector< double > > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vdouble2d_t self) -> SwigPyIterator"""
+        r"""iterator(vdouble2d_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vdouble2d_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vdouble2d_t self) -> bool"""
+        r"""__nonzero__(vdouble2d_t self) -> bool"""
         return _libBornAgainCore.vdouble2d_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vdouble2d_t self) -> bool"""
+        r"""__bool__(vdouble2d_t self) -> bool"""
         return _libBornAgainCore.vdouble2d_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""__len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainCore.vdouble2d_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"""
+        r"""__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"""
         return _libBornAgainCore.vdouble2d_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)
         __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)
         """
         return _libBornAgainCore.vdouble2d_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"""
+        r"""__delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"""
         return _libBornAgainCore.vdouble2d_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i)
         __delitem__(vdouble2d_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vdouble2d_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vdouble2d_t self, PySliceObject * slice) -> vdouble2d_t
         __getitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i) -> vdouble1d_t
         """
         return _libBornAgainCore.vdouble2d_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vdouble2d_t self, PySliceObject * slice, vdouble2d_t v)
         __setitem__(vdouble2d_t self, PySliceObject * slice)
         __setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)
         """
         return _libBornAgainCore.vdouble2d_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vdouble2d_t self) -> vdouble1d_t"""
+        r"""pop(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainCore.vdouble2d_t_pop(self)
 
-
     def append(self, x):
-        """append(vdouble2d_t self, vdouble1d_t x)"""
+        r"""append(vdouble2d_t self, vdouble1d_t x)"""
         return _libBornAgainCore.vdouble2d_t_append(self, x)
 
-
     def empty(self):
-        """empty(vdouble2d_t self) -> bool"""
+        r"""empty(vdouble2d_t self) -> bool"""
         return _libBornAgainCore.vdouble2d_t_empty(self)
 
-
     def size(self):
-        """size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainCore.vdouble2d_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vdouble2d_t self, vdouble2d_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -541,211 +417,172 @@ class vdouble2d_t(_object):
         """
         return _libBornAgainCore.vdouble2d_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
+        r"""begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
         return _libBornAgainCore.vdouble2d_t_begin(self)
 
-
     def end(self):
-        """end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
+        r"""end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
         return _libBornAgainCore.vdouble2d_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
+        r"""rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
         return _libBornAgainCore.vdouble2d_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
+        r"""rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
         return _libBornAgainCore.vdouble2d_t_rend(self)
 
-
     def clear(self):
-        """clear(vdouble2d_t self)"""
+        r"""clear(vdouble2d_t self)"""
         return _libBornAgainCore.vdouble2d_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"""
+        r"""get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"""
         return _libBornAgainCore.vdouble2d_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vdouble2d_t self)"""
+        r"""pop_back(vdouble2d_t self)"""
         return _libBornAgainCore.vdouble2d_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator
         erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator first, std::vector< std::vector< double > >::iterator last) -> std::vector< std::vector< double > >::iterator
         """
         return _libBornAgainCore.vdouble2d_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vdouble2d_t self) -> vdouble2d_t
+        __init__(vdouble2d_t self, vdouble2d_t other) -> vdouble2d_t
+        __init__(vdouble2d_t self, std::vector< std::vector< double > >::size_type size) -> vdouble2d_t
+        __init__(vdouble2d_t self, std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t
         """
-        __init__(std::vector<(std::vector<(double)>)> self) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, vdouble2d_t arg2) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, std::vector< std::vector< double > >::size_type size) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t
-        """
-        this = _libBornAgainCore.new_vdouble2d_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vdouble2d_t_swiginit(self, _libBornAgainCore.new_vdouble2d_t(*args))
 
     def push_back(self, x):
-        """push_back(vdouble2d_t self, vdouble1d_t x)"""
+        r"""push_back(vdouble2d_t self, vdouble1d_t x)"""
         return _libBornAgainCore.vdouble2d_t_push_back(self, x)
 
-
     def front(self):
-        """front(vdouble2d_t self) -> vdouble1d_t"""
+        r"""front(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainCore.vdouble2d_t_front(self)
 
-
     def back(self):
-        """back(vdouble2d_t self) -> vdouble1d_t"""
+        r"""back(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainCore.vdouble2d_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"""
+        r"""assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"""
         return _libBornAgainCore.vdouble2d_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size)
         resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size, vdouble1d_t x)
         """
         return _libBornAgainCore.vdouble2d_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator
         insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)
         """
         return _libBornAgainCore.vdouble2d_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"""
+        r"""reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"""
         return _libBornAgainCore.vdouble2d_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainCore.vdouble2d_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vdouble2d_t
-    __del__ = lambda self: None
-vdouble2d_t_swigregister = _libBornAgainCore.vdouble2d_t_swigregister
-vdouble2d_t_swigregister(vdouble2d_t)
 
-class vector_integer_t(_object):
-    """Proxy of C++ std::vector<(int)> class."""
+# Register vdouble2d_t in _libBornAgainCore:
+_libBornAgainCore.vdouble2d_t_swigregister(vdouble2d_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_integer_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_integer_t, name)
+class vector_integer_t(object):
+    r"""Proxy of C++ std::vector< int > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_integer_t self) -> SwigPyIterator"""
+        r"""iterator(vector_integer_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_integer_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_integer_t self) -> bool"""
+        r"""__nonzero__(vector_integer_t self) -> bool"""
         return _libBornAgainCore.vector_integer_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_integer_t self) -> bool"""
+        r"""__bool__(vector_integer_t self) -> bool"""
         return _libBornAgainCore.vector_integer_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""__len__(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainCore.vector_integer_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"""
+        r"""__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"""
         return _libBornAgainCore.vector_integer_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)
         __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)
         """
         return _libBornAgainCore.vector_integer_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"""
+        r"""__delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"""
         return _libBornAgainCore.vector_integer_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_integer_t self, std::vector< int >::difference_type i)
         __delitem__(vector_integer_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_integer_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_integer_t self, PySliceObject * slice) -> vector_integer_t
         __getitem__(vector_integer_t self, std::vector< int >::difference_type i) -> std::vector< int >::value_type const &
         """
         return _libBornAgainCore.vector_integer_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_integer_t self, PySliceObject * slice, vector_integer_t v)
         __setitem__(vector_integer_t self, PySliceObject * slice)
         __setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)
         """
         return _libBornAgainCore.vector_integer_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_integer_t self) -> std::vector< int >::value_type"""
+        r"""pop(vector_integer_t self) -> std::vector< int >::value_type"""
         return _libBornAgainCore.vector_integer_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_integer_t self, std::vector< int >::value_type const & x)"""
+        r"""append(vector_integer_t self, std::vector< int >::value_type const & x)"""
         return _libBornAgainCore.vector_integer_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_integer_t self) -> bool"""
+        r"""empty(vector_integer_t self) -> bool"""
         return _libBornAgainCore.vector_integer_t_empty(self)
 
-
     def size(self):
-        """size(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""size(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainCore.vector_integer_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_integer_t self, vector_integer_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -753,211 +590,172 @@ class vector_integer_t(_object):
         """
         return _libBornAgainCore.vector_integer_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_integer_t self) -> std::vector< int >::iterator"""
+        r"""begin(vector_integer_t self) -> std::vector< int >::iterator"""
         return _libBornAgainCore.vector_integer_t_begin(self)
 
-
     def end(self):
-        """end(vector_integer_t self) -> std::vector< int >::iterator"""
+        r"""end(vector_integer_t self) -> std::vector< int >::iterator"""
         return _libBornAgainCore.vector_integer_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
+        r"""rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
         return _libBornAgainCore.vector_integer_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
+        r"""rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
         return _libBornAgainCore.vector_integer_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_integer_t self)"""
+        r"""clear(vector_integer_t self)"""
         return _libBornAgainCore.vector_integer_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"""
+        r"""get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"""
         return _libBornAgainCore.vector_integer_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_integer_t self)"""
+        r"""pop_back(vector_integer_t self)"""
         return _libBornAgainCore.vector_integer_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_integer_t self, std::vector< int >::iterator pos) -> std::vector< int >::iterator
         erase(vector_integer_t self, std::vector< int >::iterator first, std::vector< int >::iterator last) -> std::vector< int >::iterator
         """
         return _libBornAgainCore.vector_integer_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_integer_t self) -> vector_integer_t
+        __init__(vector_integer_t self, vector_integer_t other) -> vector_integer_t
+        __init__(vector_integer_t self, std::vector< int >::size_type size) -> vector_integer_t
+        __init__(vector_integer_t self, std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t
         """
-        __init__(std::vector<(int)> self) -> vector_integer_t
-        __init__(std::vector<(int)> self, vector_integer_t arg2) -> vector_integer_t
-        __init__(std::vector<(int)> self, std::vector< int >::size_type size) -> vector_integer_t
-        __init__(std::vector<(int)> self, std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t
-        """
-        this = _libBornAgainCore.new_vector_integer_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_integer_t_swiginit(self, _libBornAgainCore.new_vector_integer_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_integer_t self, std::vector< int >::value_type const & x)"""
+        r"""push_back(vector_integer_t self, std::vector< int >::value_type const & x)"""
         return _libBornAgainCore.vector_integer_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_integer_t self) -> std::vector< int >::value_type const &"""
+        r"""front(vector_integer_t self) -> std::vector< int >::value_type const &"""
         return _libBornAgainCore.vector_integer_t_front(self)
 
-
     def back(self):
-        """back(vector_integer_t self) -> std::vector< int >::value_type const &"""
+        r"""back(vector_integer_t self) -> std::vector< int >::value_type const &"""
         return _libBornAgainCore.vector_integer_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"""
+        r"""assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"""
         return _libBornAgainCore.vector_integer_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_integer_t self, std::vector< int >::size_type new_size)
         resize(vector_integer_t self, std::vector< int >::size_type new_size, std::vector< int >::value_type const & x)
         """
         return _libBornAgainCore.vector_integer_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator
         insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::size_type n, std::vector< int >::value_type const & x)
         """
         return _libBornAgainCore.vector_integer_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_integer_t self, std::vector< int >::size_type n)"""
+        r"""reserve(vector_integer_t self, std::vector< int >::size_type n)"""
         return _libBornAgainCore.vector_integer_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""capacity(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainCore.vector_integer_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_integer_t
-    __del__ = lambda self: None
-vector_integer_t_swigregister = _libBornAgainCore.vector_integer_t_swigregister
-vector_integer_t_swigregister(vector_integer_t)
 
-class vinteger2d_t(_object):
-    """Proxy of C++ std::vector<(std::vector<(int)>)> class."""
+# Register vector_integer_t in _libBornAgainCore:
+_libBornAgainCore.vector_integer_t_swigregister(vector_integer_t)
+
+class vinteger2d_t(object):
+    r"""Proxy of C++ std::vector< std::vector< int > > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vinteger2d_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vinteger2d_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vinteger2d_t self) -> SwigPyIterator"""
+        r"""iterator(vinteger2d_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vinteger2d_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vinteger2d_t self) -> bool"""
+        r"""__nonzero__(vinteger2d_t self) -> bool"""
         return _libBornAgainCore.vinteger2d_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vinteger2d_t self) -> bool"""
+        r"""__bool__(vinteger2d_t self) -> bool"""
         return _libBornAgainCore.vinteger2d_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
+        r"""__len__(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
         return _libBornAgainCore.vinteger2d_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j) -> vinteger2d_t"""
+        r"""__getslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j) -> vinteger2d_t"""
         return _libBornAgainCore.vinteger2d_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)
         __setslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j, vinteger2d_t v)
         """
         return _libBornAgainCore.vinteger2d_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)"""
+        r"""__delslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)"""
         return _libBornAgainCore.vinteger2d_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i)
         __delitem__(vinteger2d_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vinteger2d_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vinteger2d_t self, PySliceObject * slice) -> vinteger2d_t
         __getitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i) -> vector_integer_t
         """
         return _libBornAgainCore.vinteger2d_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vinteger2d_t self, PySliceObject * slice, vinteger2d_t v)
         __setitem__(vinteger2d_t self, PySliceObject * slice)
         __setitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, vector_integer_t x)
         """
         return _libBornAgainCore.vinteger2d_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vinteger2d_t self) -> vector_integer_t"""
+        r"""pop(vinteger2d_t self) -> vector_integer_t"""
         return _libBornAgainCore.vinteger2d_t_pop(self)
 
-
     def append(self, x):
-        """append(vinteger2d_t self, vector_integer_t x)"""
+        r"""append(vinteger2d_t self, vector_integer_t x)"""
         return _libBornAgainCore.vinteger2d_t_append(self, x)
 
-
     def empty(self):
-        """empty(vinteger2d_t self) -> bool"""
+        r"""empty(vinteger2d_t self) -> bool"""
         return _libBornAgainCore.vinteger2d_t_empty(self)
 
-
     def size(self):
-        """size(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
+        r"""size(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
         return _libBornAgainCore.vinteger2d_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vinteger2d_t self, vinteger2d_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -965,211 +763,172 @@ class vinteger2d_t(_object):
         """
         return _libBornAgainCore.vinteger2d_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"""
+        r"""begin(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"""
         return _libBornAgainCore.vinteger2d_t_begin(self)
 
-
     def end(self):
-        """end(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"""
+        r"""end(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"""
         return _libBornAgainCore.vinteger2d_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"""
+        r"""rbegin(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"""
         return _libBornAgainCore.vinteger2d_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"""
+        r"""rend(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"""
         return _libBornAgainCore.vinteger2d_t_rend(self)
 
-
     def clear(self):
-        """clear(vinteger2d_t self)"""
+        r"""clear(vinteger2d_t self)"""
         return _libBornAgainCore.vinteger2d_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vinteger2d_t self) -> std::vector< std::vector< int > >::allocator_type"""
+        r"""get_allocator(vinteger2d_t self) -> std::vector< std::vector< int > >::allocator_type"""
         return _libBornAgainCore.vinteger2d_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vinteger2d_t self)"""
+        r"""pop_back(vinteger2d_t self)"""
         return _libBornAgainCore.vinteger2d_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos) -> std::vector< std::vector< int > >::iterator
         erase(vinteger2d_t self, std::vector< std::vector< int > >::iterator first, std::vector< std::vector< int > >::iterator last) -> std::vector< std::vector< int > >::iterator
         """
         return _libBornAgainCore.vinteger2d_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vinteger2d_t self) -> vinteger2d_t
+        __init__(vinteger2d_t self, vinteger2d_t other) -> vinteger2d_t
+        __init__(vinteger2d_t self, std::vector< std::vector< int > >::size_type size) -> vinteger2d_t
+        __init__(vinteger2d_t self, std::vector< std::vector< int > >::size_type size, vector_integer_t value) -> vinteger2d_t
         """
-        __init__(std::vector<(std::vector<(int)>)> self) -> vinteger2d_t
-        __init__(std::vector<(std::vector<(int)>)> self, vinteger2d_t arg2) -> vinteger2d_t
-        __init__(std::vector<(std::vector<(int)>)> self, std::vector< std::vector< int > >::size_type size) -> vinteger2d_t
-        __init__(std::vector<(std::vector<(int)>)> self, std::vector< std::vector< int > >::size_type size, vector_integer_t value) -> vinteger2d_t
-        """
-        this = _libBornAgainCore.new_vinteger2d_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vinteger2d_t_swiginit(self, _libBornAgainCore.new_vinteger2d_t(*args))
 
     def push_back(self, x):
-        """push_back(vinteger2d_t self, vector_integer_t x)"""
+        r"""push_back(vinteger2d_t self, vector_integer_t x)"""
         return _libBornAgainCore.vinteger2d_t_push_back(self, x)
 
-
     def front(self):
-        """front(vinteger2d_t self) -> vector_integer_t"""
+        r"""front(vinteger2d_t self) -> vector_integer_t"""
         return _libBornAgainCore.vinteger2d_t_front(self)
 
-
     def back(self):
-        """back(vinteger2d_t self) -> vector_integer_t"""
+        r"""back(vinteger2d_t self) -> vector_integer_t"""
         return _libBornAgainCore.vinteger2d_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vinteger2d_t self, std::vector< std::vector< int > >::size_type n, vector_integer_t x)"""
+        r"""assign(vinteger2d_t self, std::vector< std::vector< int > >::size_type n, vector_integer_t x)"""
         return _libBornAgainCore.vinteger2d_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vinteger2d_t self, std::vector< std::vector< int > >::size_type new_size)
         resize(vinteger2d_t self, std::vector< std::vector< int > >::size_type new_size, vector_integer_t x)
         """
         return _libBornAgainCore.vinteger2d_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos, vector_integer_t x) -> std::vector< std::vector< int > >::iterator
         insert(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos, std::vector< std::vector< int > >::size_type n, vector_integer_t x)
         """
         return _libBornAgainCore.vinteger2d_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vinteger2d_t self, std::vector< std::vector< int > >::size_type n)"""
+        r"""reserve(vinteger2d_t self, std::vector< std::vector< int > >::size_type n)"""
         return _libBornAgainCore.vinteger2d_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
+        r"""capacity(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"""
         return _libBornAgainCore.vinteger2d_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vinteger2d_t
-    __del__ = lambda self: None
-vinteger2d_t_swigregister = _libBornAgainCore.vinteger2d_t_swigregister
-vinteger2d_t_swigregister(vinteger2d_t)
 
-class vector_longinteger_t(_object):
-    """Proxy of C++ std::vector<(unsigned long)> class."""
+# Register vinteger2d_t in _libBornAgainCore:
+_libBornAgainCore.vinteger2d_t_swigregister(vinteger2d_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_longinteger_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_longinteger_t, name)
+class vector_longinteger_t(object):
+    r"""Proxy of C++ std::vector< unsigned long > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_longinteger_t self) -> SwigPyIterator"""
+        r"""iterator(vector_longinteger_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_longinteger_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_longinteger_t self) -> bool"""
+        r"""__nonzero__(vector_longinteger_t self) -> bool"""
         return _libBornAgainCore.vector_longinteger_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_longinteger_t self) -> bool"""
+        r"""__bool__(vector_longinteger_t self) -> bool"""
         return _libBornAgainCore.vector_longinteger_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""__len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainCore.vector_longinteger_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"""
+        r"""__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"""
         return _libBornAgainCore.vector_longinteger_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)
         __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)
         """
         return _libBornAgainCore.vector_longinteger_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"""
+        r"""__delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"""
         return _libBornAgainCore.vector_longinteger_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i)
         __delitem__(vector_longinteger_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_longinteger_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_longinteger_t self, PySliceObject * slice) -> vector_longinteger_t
         __getitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i) -> std::vector< unsigned long >::value_type const &
         """
         return _libBornAgainCore.vector_longinteger_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_longinteger_t self, PySliceObject * slice, vector_longinteger_t v)
         __setitem__(vector_longinteger_t self, PySliceObject * slice)
         __setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainCore.vector_longinteger_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"""
+        r"""pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"""
         return _libBornAgainCore.vector_longinteger_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
+        r"""append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainCore.vector_longinteger_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_longinteger_t self) -> bool"""
+        r"""empty(vector_longinteger_t self) -> bool"""
         return _libBornAgainCore.vector_longinteger_t_empty(self)
 
-
     def size(self):
-        """size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainCore.vector_longinteger_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_longinteger_t self, vector_longinteger_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -1177,211 +936,172 @@ class vector_longinteger_t(_object):
         """
         return _libBornAgainCore.vector_longinteger_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
+        r"""begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
         return _libBornAgainCore.vector_longinteger_t_begin(self)
 
-
     def end(self):
-        """end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
+        r"""end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
         return _libBornAgainCore.vector_longinteger_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
+        r"""rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
         return _libBornAgainCore.vector_longinteger_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
+        r"""rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
         return _libBornAgainCore.vector_longinteger_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_longinteger_t self)"""
+        r"""clear(vector_longinteger_t self)"""
         return _libBornAgainCore.vector_longinteger_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"""
+        r"""get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"""
         return _libBornAgainCore.vector_longinteger_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_longinteger_t self)"""
+        r"""pop_back(vector_longinteger_t self)"""
         return _libBornAgainCore.vector_longinteger_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_longinteger_t self, std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator
         erase(vector_longinteger_t self, std::vector< unsigned long >::iterator first, std::vector< unsigned long >::iterator last) -> std::vector< unsigned long >::iterator
         """
         return _libBornAgainCore.vector_longinteger_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_longinteger_t self) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, vector_longinteger_t other) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, std::vector< unsigned long >::size_type size) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t
         """
-        __init__(std::vector<(unsigned long)> self) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, vector_longinteger_t arg2) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, std::vector< unsigned long >::size_type size) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t
-        """
-        this = _libBornAgainCore.new_vector_longinteger_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_longinteger_t_swiginit(self, _libBornAgainCore.new_vector_longinteger_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
+        r"""push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainCore.vector_longinteger_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
+        r"""front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
         return _libBornAgainCore.vector_longinteger_t_front(self)
 
-
     def back(self):
-        """back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
+        r"""back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
         return _libBornAgainCore.vector_longinteger_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"""
+        r"""assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainCore.vector_longinteger_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size)
         resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainCore.vector_longinteger_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator
         insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainCore.vector_longinteger_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"""
+        r"""reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"""
         return _libBornAgainCore.vector_longinteger_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainCore.vector_longinteger_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_longinteger_t
-    __del__ = lambda self: None
-vector_longinteger_t_swigregister = _libBornAgainCore.vector_longinteger_t_swigregister
-vector_longinteger_t_swigregister(vector_longinteger_t)
 
-class vector_complex_t(_object):
-    """Proxy of C++ std::vector<(std::complex<(double)>)> class."""
+# Register vector_longinteger_t in _libBornAgainCore:
+_libBornAgainCore.vector_longinteger_t_swigregister(vector_longinteger_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_complex_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_complex_t, name)
+class vector_complex_t(object):
+    r"""Proxy of C++ std::vector< std::complex< double > > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_complex_t self) -> SwigPyIterator"""
+        r"""iterator(vector_complex_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_complex_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_complex_t self) -> bool"""
+        r"""__nonzero__(vector_complex_t self) -> bool"""
         return _libBornAgainCore.vector_complex_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_complex_t self) -> bool"""
+        r"""__bool__(vector_complex_t self) -> bool"""
         return _libBornAgainCore.vector_complex_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""__len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainCore.vector_complex_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"""
+        r"""__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"""
         return _libBornAgainCore.vector_complex_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)
         __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)
         """
         return _libBornAgainCore.vector_complex_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"""
+        r"""__delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"""
         return _libBornAgainCore.vector_complex_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i)
         __delitem__(vector_complex_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_complex_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_complex_t self, PySliceObject * slice) -> vector_complex_t
         __getitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i) -> std::vector< std::complex< double > >::value_type const &
         """
         return _libBornAgainCore.vector_complex_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_complex_t self, PySliceObject * slice, vector_complex_t v)
         __setitem__(vector_complex_t self, PySliceObject * slice)
         __setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainCore.vector_complex_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"""
+        r"""pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"""
         return _libBornAgainCore.vector_complex_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainCore.vector_complex_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_complex_t self) -> bool"""
+        r"""empty(vector_complex_t self) -> bool"""
         return _libBornAgainCore.vector_complex_t_empty(self)
 
-
     def size(self):
-        """size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainCore.vector_complex_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_complex_t self, vector_complex_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -1389,211 +1109,172 @@ class vector_complex_t(_object):
         """
         return _libBornAgainCore.vector_complex_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
+        r"""begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
         return _libBornAgainCore.vector_complex_t_begin(self)
 
-
     def end(self):
-        """end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
+        r"""end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
         return _libBornAgainCore.vector_complex_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
+        r"""rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
         return _libBornAgainCore.vector_complex_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
+        r"""rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
         return _libBornAgainCore.vector_complex_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_complex_t self)"""
+        r"""clear(vector_complex_t self)"""
         return _libBornAgainCore.vector_complex_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"""
+        r"""get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"""
         return _libBornAgainCore.vector_complex_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_complex_t self)"""
+        r"""pop_back(vector_complex_t self)"""
         return _libBornAgainCore.vector_complex_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_complex_t self, std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator
         erase(vector_complex_t self, std::vector< std::complex< double > >::iterator first, std::vector< std::complex< double > >::iterator last) -> std::vector< std::complex< double > >::iterator
         """
         return _libBornAgainCore.vector_complex_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_complex_t self) -> vector_complex_t
+        __init__(vector_complex_t self, vector_complex_t other) -> vector_complex_t
+        __init__(vector_complex_t self, std::vector< std::complex< double > >::size_type size) -> vector_complex_t
+        __init__(vector_complex_t self, std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t
         """
-        __init__(std::vector<(std::complex<(double)>)> self) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, vector_complex_t arg2) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, std::vector< std::complex< double > >::size_type size) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t
-        """
-        this = _libBornAgainCore.new_vector_complex_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_complex_t_swiginit(self, _libBornAgainCore.new_vector_complex_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainCore.vector_complex_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
+        r"""front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
         return _libBornAgainCore.vector_complex_t_front(self)
 
-
     def back(self):
-        """back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
+        r"""back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
         return _libBornAgainCore.vector_complex_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainCore.vector_complex_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size)
         resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainCore.vector_complex_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator
         insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainCore.vector_complex_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"""
+        r"""reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"""
         return _libBornAgainCore.vector_complex_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainCore.vector_complex_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_complex_t
-    __del__ = lambda self: None
-vector_complex_t_swigregister = _libBornAgainCore.vector_complex_t_swigregister
-vector_complex_t_swigregister(vector_complex_t)
 
-class vector_string_t(_object):
-    """Proxy of C++ std::vector<(std::string)> class."""
+# Register vector_complex_t in _libBornAgainCore:
+_libBornAgainCore.vector_complex_t_swigregister(vector_complex_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_string_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_string_t, name)
+class vector_string_t(object):
+    r"""Proxy of C++ std::vector< std::string > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_string_t self) -> SwigPyIterator"""
+        r"""iterator(vector_string_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_string_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_string_t self) -> bool"""
+        r"""__nonzero__(vector_string_t self) -> bool"""
         return _libBornAgainCore.vector_string_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_string_t self) -> bool"""
+        r"""__bool__(vector_string_t self) -> bool"""
         return _libBornAgainCore.vector_string_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""__len__(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainCore.vector_string_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"""
+        r"""__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"""
         return _libBornAgainCore.vector_string_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)
         __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)
         """
         return _libBornAgainCore.vector_string_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"""
+        r"""__delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"""
         return _libBornAgainCore.vector_string_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_string_t self, std::vector< std::string >::difference_type i)
         __delitem__(vector_string_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_string_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_string_t self, PySliceObject * slice) -> vector_string_t
         __getitem__(vector_string_t self, std::vector< std::string >::difference_type i) -> std::vector< std::string >::value_type const &
         """
         return _libBornAgainCore.vector_string_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_string_t self, PySliceObject * slice, vector_string_t v)
         __setitem__(vector_string_t self, PySliceObject * slice)
         __setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainCore.vector_string_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_string_t self) -> std::vector< std::string >::value_type"""
+        r"""pop(vector_string_t self) -> std::vector< std::string >::value_type"""
         return _libBornAgainCore.vector_string_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_string_t self, std::vector< std::string >::value_type const & x)"""
+        r"""append(vector_string_t self, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainCore.vector_string_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_string_t self) -> bool"""
+        r"""empty(vector_string_t self) -> bool"""
         return _libBornAgainCore.vector_string_t_empty(self)
 
-
     def size(self):
-        """size(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""size(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainCore.vector_string_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_string_t self, vector_string_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -1601,143 +1282,115 @@ class vector_string_t(_object):
         """
         return _libBornAgainCore.vector_string_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_string_t self) -> std::vector< std::string >::iterator"""
+        r"""begin(vector_string_t self) -> std::vector< std::string >::iterator"""
         return _libBornAgainCore.vector_string_t_begin(self)
 
-
     def end(self):
-        """end(vector_string_t self) -> std::vector< std::string >::iterator"""
+        r"""end(vector_string_t self) -> std::vector< std::string >::iterator"""
         return _libBornAgainCore.vector_string_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
+        r"""rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
         return _libBornAgainCore.vector_string_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
+        r"""rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
         return _libBornAgainCore.vector_string_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_string_t self)"""
+        r"""clear(vector_string_t self)"""
         return _libBornAgainCore.vector_string_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"""
+        r"""get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"""
         return _libBornAgainCore.vector_string_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_string_t self)"""
+        r"""pop_back(vector_string_t self)"""
         return _libBornAgainCore.vector_string_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_string_t self, std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator
         erase(vector_string_t self, std::vector< std::string >::iterator first, std::vector< std::string >::iterator last) -> std::vector< std::string >::iterator
         """
         return _libBornAgainCore.vector_string_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_string_t self) -> vector_string_t
+        __init__(vector_string_t self, vector_string_t other) -> vector_string_t
+        __init__(vector_string_t self, std::vector< std::string >::size_type size) -> vector_string_t
+        __init__(vector_string_t self, std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t
         """
-        __init__(std::vector<(std::string)> self) -> vector_string_t
-        __init__(std::vector<(std::string)> self, vector_string_t arg2) -> vector_string_t
-        __init__(std::vector<(std::string)> self, std::vector< std::string >::size_type size) -> vector_string_t
-        __init__(std::vector<(std::string)> self, std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t
-        """
-        this = _libBornAgainCore.new_vector_string_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_string_t_swiginit(self, _libBornAgainCore.new_vector_string_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"""
+        r"""push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainCore.vector_string_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_string_t self) -> std::vector< std::string >::value_type const &"""
+        r"""front(vector_string_t self) -> std::vector< std::string >::value_type const &"""
         return _libBornAgainCore.vector_string_t_front(self)
 
-
     def back(self):
-        """back(vector_string_t self) -> std::vector< std::string >::value_type const &"""
+        r"""back(vector_string_t self) -> std::vector< std::string >::value_type const &"""
         return _libBornAgainCore.vector_string_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"""
+        r"""assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainCore.vector_string_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_string_t self, std::vector< std::string >::size_type new_size)
         resize(vector_string_t self, std::vector< std::string >::size_type new_size, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainCore.vector_string_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator
         insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainCore.vector_string_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_string_t self, std::vector< std::string >::size_type n)"""
+        r"""reserve(vector_string_t self, std::vector< std::string >::size_type n)"""
         return _libBornAgainCore.vector_string_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""capacity(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainCore.vector_string_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_string_t
-    __del__ = lambda self: None
-vector_string_t_swigregister = _libBornAgainCore.vector_string_t_swigregister
-vector_string_t_swigregister(vector_string_t)
 
-class map_string_double_t(_object):
-    """Proxy of C++ std::map<(std::string,double)> class."""
+# Register vector_string_t in _libBornAgainCore:
+_libBornAgainCore.vector_string_t_swigregister(vector_string_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, map_string_double_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, map_string_double_t, name)
+class map_string_double_t(object):
+    r"""Proxy of C++ std::map< std::string,double > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(map_string_double_t self) -> SwigPyIterator"""
+        r"""iterator(map_string_double_t self) -> SwigPyIterator"""
         return _libBornAgainCore.map_string_double_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(map_string_double_t self) -> bool"""
+        r"""__nonzero__(map_string_double_t self) -> bool"""
         return _libBornAgainCore.map_string_double_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(map_string_double_t self) -> bool"""
+        r"""__bool__(map_string_double_t self) -> bool"""
         return _libBornAgainCore.map_string_double_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(map_string_double_t self) -> std::map< std::string,double >::size_type"""
+        r"""__len__(map_string_double_t self) -> std::map< std::string,double >::size_type"""
         return _libBornAgainCore.map_string_double_t___len__(self)
-
     def __iter__(self):
         return self.key_iterator()
     def iterkeys(self):
@@ -1748,89 +1401,71 @@ class map_string_double_t(_object):
         return self.iterator()
 
     def __getitem__(self, key):
-        """__getitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> std::map< std::string,double >::mapped_type const &"""
+        r"""__getitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> std::map< std::string,double >::mapped_type const &"""
         return _libBornAgainCore.map_string_double_t___getitem__(self, key)
 
-
     def __delitem__(self, key):
-        """__delitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)"""
+        r"""__delitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)"""
         return _libBornAgainCore.map_string_double_t___delitem__(self, key)
 
-
     def has_key(self, key):
-        """has_key(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"""
+        r"""has_key(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"""
         return _libBornAgainCore.map_string_double_t_has_key(self, key)
 
-
     def keys(self):
-        """keys(map_string_double_t self) -> PyObject *"""
+        r"""keys(map_string_double_t self) -> PyObject *"""
         return _libBornAgainCore.map_string_double_t_keys(self)
 
-
     def values(self):
-        """values(map_string_double_t self) -> PyObject *"""
+        r"""values(map_string_double_t self) -> PyObject *"""
         return _libBornAgainCore.map_string_double_t_values(self)
 
-
     def items(self):
-        """items(map_string_double_t self) -> PyObject *"""
+        r"""items(map_string_double_t self) -> PyObject *"""
         return _libBornAgainCore.map_string_double_t_items(self)
 
-
     def __contains__(self, key):
-        """__contains__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"""
+        r"""__contains__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"""
         return _libBornAgainCore.map_string_double_t___contains__(self, key)
 
-
     def key_iterator(self):
-        """key_iterator(map_string_double_t self) -> SwigPyIterator"""
+        r"""key_iterator(map_string_double_t self) -> SwigPyIterator"""
         return _libBornAgainCore.map_string_double_t_key_iterator(self)
 
-
     def value_iterator(self):
-        """value_iterator(map_string_double_t self) -> SwigPyIterator"""
+        r"""value_iterator(map_string_double_t self) -> SwigPyIterator"""
         return _libBornAgainCore.map_string_double_t_value_iterator(self)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)
         __setitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key, std::map< std::string,double >::mapped_type const & x)
         """
         return _libBornAgainCore.map_string_double_t___setitem__(self, *args)
 
-
     def asdict(self):
-        """asdict(map_string_double_t self) -> PyObject *"""
+        r"""asdict(map_string_double_t self) -> PyObject *"""
         return _libBornAgainCore.map_string_double_t_asdict(self)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(map_string_double_t self, std::less< std::string > const & other) -> map_string_double_t
+        __init__(map_string_double_t self) -> map_string_double_t
+        __init__(map_string_double_t self, map_string_double_t other) -> map_string_double_t
         """
-        __init__(std::map<(std::string,double)> self, std::less< std::string > const & arg2) -> map_string_double_t
-        __init__(std::map<(std::string,double)> self) -> map_string_double_t
-        __init__(std::map<(std::string,double)> self, map_string_double_t arg2) -> map_string_double_t
-        """
-        this = _libBornAgainCore.new_map_string_double_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.map_string_double_t_swiginit(self, _libBornAgainCore.new_map_string_double_t(*args))
 
     def empty(self):
-        """empty(map_string_double_t self) -> bool"""
+        r"""empty(map_string_double_t self) -> bool"""
         return _libBornAgainCore.map_string_double_t_empty(self)
 
-
     def size(self):
-        """size(map_string_double_t self) -> std::map< std::string,double >::size_type"""
+        r"""size(map_string_double_t self) -> std::map< std::string,double >::size_type"""
         return _libBornAgainCore.map_string_double_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(map_string_double_t self, map_string_double_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -1838,98 +1473,73 @@ class map_string_double_t(_object):
         """
         return _libBornAgainCore.map_string_double_t_swap(self, v)
 
-
     def begin(self):
-        """begin(map_string_double_t self) -> std::map< std::string,double >::iterator"""
+        r"""begin(map_string_double_t self) -> std::map< std::string,double >::iterator"""
         return _libBornAgainCore.map_string_double_t_begin(self)
 
-
     def end(self):
-        """end(map_string_double_t self) -> std::map< std::string,double >::iterator"""
+        r"""end(map_string_double_t self) -> std::map< std::string,double >::iterator"""
         return _libBornAgainCore.map_string_double_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"""
+        r"""rbegin(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"""
         return _libBornAgainCore.map_string_double_t_rbegin(self)
 
-
     def rend(self):
-        """rend(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"""
+        r"""rend(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"""
         return _libBornAgainCore.map_string_double_t_rend(self)
 
-
     def clear(self):
-        """clear(map_string_double_t self)"""
+        r"""clear(map_string_double_t self)"""
         return _libBornAgainCore.map_string_double_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(map_string_double_t self) -> std::map< std::string,double >::allocator_type"""
+        r"""get_allocator(map_string_double_t self) -> std::map< std::string,double >::allocator_type"""
         return _libBornAgainCore.map_string_double_t_get_allocator(self)
 
-
     def count(self, x):
-        """count(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type"""
+        r"""count(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type"""
         return _libBornAgainCore.map_string_double_t_count(self, x)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type
         erase(map_string_double_t self, std::map< std::string,double >::iterator position)
         erase(map_string_double_t self, std::map< std::string,double >::iterator first, std::map< std::string,double >::iterator last)
         """
         return _libBornAgainCore.map_string_double_t_erase(self, *args)
 
-
     def find(self, x):
-        """find(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
+        r"""find(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
         return _libBornAgainCore.map_string_double_t_find(self, x)
 
-
     def lower_bound(self, x):
-        """lower_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
+        r"""lower_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
         return _libBornAgainCore.map_string_double_t_lower_bound(self, x)
 
-
     def upper_bound(self, x):
-        """upper_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
+        r"""upper_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"""
         return _libBornAgainCore.map_string_double_t_upper_bound(self, x)
-
     __swig_destroy__ = _libBornAgainCore.delete_map_string_double_t
-    __del__ = lambda self: None
-map_string_double_t_swigregister = _libBornAgainCore.map_string_double_t_swigregister
-map_string_double_t_swigregister(map_string_double_t)
 
-class pair_double_t(_object):
-    """Proxy of C++ std::pair<(double,double)> class."""
+# Register map_string_double_t in _libBornAgainCore:
+_libBornAgainCore.map_string_double_t_swigregister(map_string_double_t)
+
+class pair_double_t(object):
+    r"""Proxy of C++ std::pair< double,double > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, pair_double_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, pair_double_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(std::pair<(double,double)> self) -> pair_double_t
-        __init__(std::pair<(double,double)> self, double first, double second) -> pair_double_t
-        __init__(std::pair<(double,double)> self, pair_double_t p) -> pair_double_t
-        """
-        this = _libBornAgainCore.new_pair_double_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["first"] = _libBornAgainCore.pair_double_t_first_set
-    __swig_getmethods__["first"] = _libBornAgainCore.pair_double_t_first_get
-    if _newclass:
-        first = _swig_property(_libBornAgainCore.pair_double_t_first_get, _libBornAgainCore.pair_double_t_first_set)
-    __swig_setmethods__["second"] = _libBornAgainCore.pair_double_t_second_set
-    __swig_getmethods__["second"] = _libBornAgainCore.pair_double_t_second_get
-    if _newclass:
-        second = _swig_property(_libBornAgainCore.pair_double_t_second_get, _libBornAgainCore.pair_double_t_second_set)
+        r"""
+        __init__(pair_double_t self) -> pair_double_t
+        __init__(pair_double_t self, double first, double second) -> pair_double_t
+        __init__(pair_double_t self, pair_double_t other) -> pair_double_t
+        """
+        _libBornAgainCore.pair_double_t_swiginit(self, _libBornAgainCore.new_pair_double_t(*args))
+    first = property(_libBornAgainCore.pair_double_t_first_get, _libBornAgainCore.pair_double_t_first_set, doc=r"""first : double""")
+    second = property(_libBornAgainCore.pair_double_t_second_get, _libBornAgainCore.pair_double_t_second_set, doc=r"""second : double""")
     def __len__(self):
         return 2
     def __repr__(self):
@@ -1945,108 +1555,90 @@ class pair_double_t(_object):
         else:
             self.second = val
     __swig_destroy__ = _libBornAgainCore.delete_pair_double_t
-    __del__ = lambda self: None
-pair_double_t_swigregister = _libBornAgainCore.pair_double_t_swigregister
-pair_double_t_swigregister(pair_double_t)
 
-class vector_pair_double_t(_object):
-    """Proxy of C++ std::vector<(std::pair<(double,double)>)> class."""
+# Register pair_double_t in _libBornAgainCore:
+_libBornAgainCore.pair_double_t_swigregister(pair_double_t)
+
+class vector_pair_double_t(object):
+    r"""Proxy of C++ std::vector< std::pair< double,double > > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_pair_double_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_pair_double_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_pair_double_t self) -> SwigPyIterator"""
+        r"""iterator(vector_pair_double_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_pair_double_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_pair_double_t self) -> bool"""
+        r"""__nonzero__(vector_pair_double_t self) -> bool"""
         return _libBornAgainCore.vector_pair_double_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_pair_double_t self) -> bool"""
+        r"""__bool__(vector_pair_double_t self) -> bool"""
         return _libBornAgainCore.vector_pair_double_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+        r"""__len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
         return _libBornAgainCore.vector_pair_double_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"""
+        r"""__getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"""
         return _libBornAgainCore.vector_pair_double_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)
         __setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pair_double_t v)
         """
         return _libBornAgainCore.vector_pair_double_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"""
+        r"""__delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"""
         return _libBornAgainCore.vector_pair_double_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i)
         __delitem__(vector_pair_double_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_pair_double_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_pair_double_t self, PySliceObject * slice) -> vector_pair_double_t
         __getitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pair_double_t
         """
         return _libBornAgainCore.vector_pair_double_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_pair_double_t self, PySliceObject * slice, vector_pair_double_t v)
         __setitem__(vector_pair_double_t self, PySliceObject * slice)
         __setitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, pair_double_t x)
         """
         return _libBornAgainCore.vector_pair_double_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_pair_double_t self) -> pair_double_t"""
+        r"""pop(vector_pair_double_t self) -> pair_double_t"""
         return _libBornAgainCore.vector_pair_double_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_pair_double_t self, pair_double_t x)"""
+        r"""append(vector_pair_double_t self, pair_double_t x)"""
         return _libBornAgainCore.vector_pair_double_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_pair_double_t self) -> bool"""
+        r"""empty(vector_pair_double_t self) -> bool"""
         return _libBornAgainCore.vector_pair_double_t_empty(self)
 
-
     def size(self):
-        """size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+        r"""size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
         return _libBornAgainCore.vector_pair_double_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_pair_double_t self, vector_pair_double_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -2054,147 +1646,125 @@ class vector_pair_double_t(_object):
         """
         return _libBornAgainCore.vector_pair_double_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
+        r"""begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
         return _libBornAgainCore.vector_pair_double_t_begin(self)
 
-
     def end(self):
-        """end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
+        r"""end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"""
         return _libBornAgainCore.vector_pair_double_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
+        r"""rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
         return _libBornAgainCore.vector_pair_double_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
+        r"""rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"""
         return _libBornAgainCore.vector_pair_double_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_pair_double_t self)"""
+        r"""clear(vector_pair_double_t self)"""
         return _libBornAgainCore.vector_pair_double_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"""
+        r"""get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"""
         return _libBornAgainCore.vector_pair_double_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_pair_double_t self)"""
+        r"""pop_back(vector_pair_double_t self)"""
         return _libBornAgainCore.vector_pair_double_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator
         erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator
         """
         return _libBornAgainCore.vector_pair_double_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_pair_double_t self) -> vector_pair_double_t
+        __init__(vector_pair_double_t self, vector_pair_double_t other) -> vector_pair_double_t
+        __init__(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type size) -> vector_pair_double_t
+        __init__(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type size, pair_double_t value) -> vector_pair_double_t
         """
-        __init__(std::vector<(std::pair<(double,double)>)> self) -> vector_pair_double_t
-        __init__(std::vector<(std::pair<(double,double)>)> self, vector_pair_double_t arg2) -> vector_pair_double_t
-        __init__(std::vector<(std::pair<(double,double)>)> self, std::vector< std::pair< double,double > >::size_type size) -> vector_pair_double_t
-        __init__(std::vector<(std::pair<(double,double)>)> self, std::vector< std::pair< double,double > >::size_type size, pair_double_t value) -> vector_pair_double_t
-        """
-        this = _libBornAgainCore.new_vector_pair_double_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_pair_double_t_swiginit(self, _libBornAgainCore.new_vector_pair_double_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_pair_double_t self, pair_double_t x)"""
+        r"""push_back(vector_pair_double_t self, pair_double_t x)"""
         return _libBornAgainCore.vector_pair_double_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_pair_double_t self) -> pair_double_t"""
+        r"""front(vector_pair_double_t self) -> pair_double_t"""
         return _libBornAgainCore.vector_pair_double_t_front(self)
 
-
     def back(self):
-        """back(vector_pair_double_t self) -> pair_double_t"""
+        r"""back(vector_pair_double_t self) -> pair_double_t"""
         return _libBornAgainCore.vector_pair_double_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"""
+        r"""assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"""
         return _libBornAgainCore.vector_pair_double_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size)
         resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pair_double_t x)
         """
         return _libBornAgainCore.vector_pair_double_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, pair_double_t x) -> std::vector< std::pair< double,double > >::iterator
         insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)
         """
         return _libBornAgainCore.vector_pair_double_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"""
+        r"""reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"""
         return _libBornAgainCore.vector_pair_double_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
+        r"""capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"""
         return _libBornAgainCore.vector_pair_double_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_pair_double_t
-    __del__ = lambda self: None
-vector_pair_double_t_swigregister = _libBornAgainCore.vector_pair_double_t_swigregister
-vector_pair_double_t_swigregister(vector_pair_double_t)
+
+# Register vector_pair_double_t in _libBornAgainCore:
+_libBornAgainCore.vector_pair_double_t_swigregister(vector_pair_double_t)
 
 import libBornAgainFit
 
 def GetMajorVersionNumber():
-    """GetMajorVersionNumber() -> int"""
+    r"""GetMajorVersionNumber() -> int"""
     return _libBornAgainCore.GetMajorVersionNumber()
 
 def GetMinorVersionNumber():
-    """GetMinorVersionNumber() -> int"""
+    r"""GetMinorVersionNumber() -> int"""
     return _libBornAgainCore.GetMinorVersionNumber()
 
 def GetPatchVersionNumber():
-    """GetPatchVersionNumber() -> int"""
+    r"""GetPatchVersionNumber() -> int"""
     return _libBornAgainCore.GetPatchVersionNumber()
 
 def GetName():
-    """GetName() -> std::string"""
+    r"""GetName() -> std::string"""
     return _libBornAgainCore.GetName()
 
 def GetVersionNumber():
-    """GetVersionNumber() -> std::string"""
+    r"""GetVersionNumber() -> std::string"""
     return _libBornAgainCore.GetVersionNumber()
 
 def vecOfLambdaAlphaPhi(_lambda, _alpha, _phi):
-    """
+    r"""
     vecOfLambdaAlphaPhi(double _lambda, double _alpha, double _phi) -> kvector_t
-
     BA_CORE_API_ BasicVector3D<double> vecOfLambdaAlphaPhi(double _lambda, double _alpha, double _phi)
 
     Creates a vector<double> as a wavevector with given wavelength and angles. Specifically needed for grazing-incidence scattering. 
 
     """
     return _libBornAgainCore.vecOfLambdaAlphaPhi(_lambda, _alpha, _phi)
-class ICloneable(_object):
-    """
+class ICloneable(object):
+    r"""
 
 
     Interface for polymorphic classes that should not be copied, except by explicit cloning.
@@ -2205,40 +1775,34 @@ class ICloneable(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ICloneable, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ICloneable, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_ICloneable
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ICloneable self) -> ICloneable
-
         virtual ICloneable* ICloneable::clone() const =0
 
         """
         return _libBornAgainCore.ICloneable_clone(self)
 
-
     def transferToCPP(self):
-        """transferToCPP(ICloneable self)"""
+        r"""transferToCPP(ICloneable self)"""
         return self.__disown__()
 
-ICloneable_swigregister = _libBornAgainCore.ICloneable_swigregister
-ICloneable_swigregister(ICloneable)
+# Register ICloneable in _libBornAgainCore:
+_libBornAgainCore.ICloneable_swigregister(ICloneable)
 cvar = _libBornAgainCore.cvar
 major_version_number = cvar.major_version_number
 minor_version_number = cvar.minor_version_number
 patch_version_number = cvar.patch_version_number
 
-class INamed(_object):
-    """
+class INamed(object):
+    r"""
 
 
     Interface for named objects.
@@ -2247,17 +1811,13 @@ class INamed(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, INamed, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, INamed, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(INamed self) -> INamed
         __init__(INamed self, std::string const & name) -> INamed
-
         INamed::INamed(const std::string &name)
 
         """
@@ -2265,32 +1825,26 @@ class INamed(_object):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_INamed(_self, *args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.INamed_swiginit(self, _libBornAgainCore.new_INamed(_self, *args))
     __swig_destroy__ = _libBornAgainCore.delete_INamed
-    __del__ = lambda self: None
 
     def getName(self):
-        """
+        r"""
         getName(INamed self) -> std::string
-
         std::string INamed::getName() const
 
         """
         return _libBornAgainCore.INamed_getName(self)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_INamed(self)
-        return weakref_proxy(self)
-INamed_swigregister = _libBornAgainCore.INamed_swigregister
-INamed_swigregister(INamed)
+        return weakref.proxy(self)
+
+# Register INamed in _libBornAgainCore:
+_libBornAgainCore.INamed_swigregister(INamed)
 
 class IParameterized(INamed):
-    """
+    r"""
 
 
     Manages a local parameter pool, and a tree of child pools.
@@ -2299,22 +1853,13 @@ class IParameterized(INamed):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [INamed]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IParameterized, name, value)
-    __swig_getmethods__ = {}
-    for _s in [INamed]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IParameterized, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(IParameterized self, std::string const & name) -> IParameterized
-        __init__(IParameterized self) -> IParameterized
+        r"""
+        __init__(IParameterized self, std::string const & name="") -> IParameterized
         __init__(IParameterized self, IParameterized other) -> IParameterized
-
         IParameterized::IParameterized(const IParameterized &other)
 
         """
@@ -2322,18 +1867,12 @@ class IParameterized(INamed):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_IParameterized(_self, *args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IParameterized_swiginit(self, _libBornAgainCore.new_IParameterized(_self, *args))
     __swig_destroy__ = _libBornAgainCore.delete_IParameterized
-    __del__ = lambda self: None
 
     def parameterPool(self):
-        """
+        r"""
         parameterPool(IParameterized self) -> ParameterPool
-
         ParameterPool* IParameterized::parameterPool() const
 
         Returns pointer to the parameter pool. 
@@ -2341,11 +1880,9 @@ class IParameterized(INamed):
         """
         return _libBornAgainCore.IParameterized_parameterPool(self)
 
-
     def createParameterTree(self):
-        """
+        r"""
         createParameterTree(IParameterized self) -> ParameterPool
-
         ParameterPool * IParameterized::createParameterTree() const
 
         Creates new parameter pool, with all local parameters and those of its children. 
@@ -2353,11 +1890,9 @@ class IParameterized(INamed):
         """
         return _libBornAgainCore.IParameterized_createParameterTree(self)
 
-
     def parametersToString(self):
-        """
+        r"""
         parametersToString(IParameterized self) -> std::string
-
         std::string IParameterized::parametersToString() const
 
         Returns multiline string representing available parameters. 
@@ -2365,52 +1900,41 @@ class IParameterized(INamed):
         """
         return _libBornAgainCore.IParameterized_parametersToString(self)
 
-
     def registerParameter(self, name, parpointer):
-        """
+        r"""
         registerParameter(IParameterized self, std::string const & name, double * parpointer) -> RealParameter
-
         RealParameter & IParameterized::registerParameter(const std::string &name, double *parpointer)
 
         """
         return _libBornAgainCore.IParameterized_registerParameter(self, name, parpointer)
 
-
     def registerVector(self, *args):
-        """
-        registerVector(IParameterized self, std::string const & base_name, kvector_t p_vec, std::string const & units)
-        registerVector(IParameterized self, std::string const & base_name, kvector_t p_vec)
-
+        r"""
+        registerVector(IParameterized self, std::string const & base_name, kvector_t p_vec, std::string const & units=BornAgain::UnitsNm)
         void IParameterized::registerVector(const std::string &base_name, kvector_t *p_vec, const std::string &units=BornAgain::UnitsNm)
 
         """
         return _libBornAgainCore.IParameterized_registerVector(self, *args)
 
-
     def setParameterValue(self, name, value):
-        """
+        r"""
         setParameterValue(IParameterized self, std::string const & name, double value)
-
         void IParameterized::setParameterValue(const std::string &name, double value)
 
         """
         return _libBornAgainCore.IParameterized_setParameterValue(self, name, value)
 
-
     def setVectorValue(self, base_name, value):
-        """
+        r"""
         setVectorValue(IParameterized self, std::string const & base_name, kvector_t value)
-
         void IParameterized::setVectorValue(const std::string &base_name, kvector_t value)
 
         """
         return _libBornAgainCore.IParameterized_setVectorValue(self, base_name, value)
 
-
     def parameter(self, name):
-        """
+        r"""
         parameter(IParameterized self, std::string const & name) -> RealParameter
-
         RealParameter * IParameterized::parameter(const std::string &name) const
 
         Returns parameter with given 'name'. 
@@ -2418,11 +1942,9 @@ class IParameterized(INamed):
         """
         return _libBornAgainCore.IParameterized_parameter(self, name)
 
-
     def onChange(self):
-        """
+        r"""
         onChange(IParameterized self)
-
         virtual void IParameterized::onChange()
 
         Action to be taken in inherited class when a parameter has changed. 
@@ -2430,65 +1952,58 @@ class IParameterized(INamed):
         """
         return _libBornAgainCore.IParameterized_onChange(self)
 
-
     def removeParameter(self, name):
-        """
+        r"""
         removeParameter(IParameterized self, std::string const & name)
-
         void IParameterized::removeParameter(const std::string &name)
 
         """
         return _libBornAgainCore.IParameterized_removeParameter(self, name)
 
-
     def removeVector(self, base_name):
-        """
+        r"""
         removeVector(IParameterized self, std::string const & base_name)
-
         void IParameterized::removeVector(const std::string &base_name)
 
         """
         return _libBornAgainCore.IParameterized_removeVector(self, base_name)
 
-
+    @staticmethod
     def XComponentName(base_name):
-        """XComponentName(std::string const & base_name) -> std::string"""
+        r"""XComponentName(std::string const & base_name) -> std::string"""
         return _libBornAgainCore.IParameterized_XComponentName(base_name)
 
-    XComponentName = staticmethod(XComponentName)
-
+    @staticmethod
     def YComponentName(base_name):
-        """YComponentName(std::string const & base_name) -> std::string"""
+        r"""YComponentName(std::string const & base_name) -> std::string"""
         return _libBornAgainCore.IParameterized_YComponentName(base_name)
 
-    YComponentName = staticmethod(YComponentName)
-
+    @staticmethod
     def ZComponentName(base_name):
-        """ZComponentName(std::string const & base_name) -> std::string"""
+        r"""ZComponentName(std::string const & base_name) -> std::string"""
         return _libBornAgainCore.IParameterized_ZComponentName(base_name)
-
-    ZComponentName = staticmethod(ZComponentName)
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_IParameterized(self)
-        return weakref_proxy(self)
-IParameterized_swigregister = _libBornAgainCore.IParameterized_swigregister
-IParameterized_swigregister(IParameterized)
+        return weakref.proxy(self)
+
+# Register IParameterized in _libBornAgainCore:
+_libBornAgainCore.IParameterized_swigregister(IParameterized)
 
 def IParameterized_XComponentName(base_name):
-    """IParameterized_XComponentName(std::string const & base_name) -> std::string"""
+    r"""IParameterized_XComponentName(std::string const & base_name) -> std::string"""
     return _libBornAgainCore.IParameterized_XComponentName(base_name)
 
 def IParameterized_YComponentName(base_name):
-    """IParameterized_YComponentName(std::string const & base_name) -> std::string"""
+    r"""IParameterized_YComponentName(std::string const & base_name) -> std::string"""
     return _libBornAgainCore.IParameterized_YComponentName(base_name)
 
 def IParameterized_ZComponentName(base_name):
-    """IParameterized_ZComponentName(std::string const & base_name) -> std::string"""
+    r"""IParameterized_ZComponentName(std::string const & base_name) -> std::string"""
     return _libBornAgainCore.IParameterized_ZComponentName(base_name)
 
 class INode(IParameterized):
-    """
+    r"""
 
 
     Base class for tree-like structures containing parameterized objects.
@@ -2497,20 +2012,12 @@ class INode(IParameterized):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, INode, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, INode, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(INode self) -> INode
-
         INode::INode()
 
         """
@@ -2518,18 +2025,12 @@ class INode(IParameterized):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_INode(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.INode_swiginit(self, _libBornAgainCore.new_INode(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_INode
-    __del__ = lambda self: None
 
     def accept(self, visitor):
-        """
+        r"""
         accept(INode self, INodeVisitor visitor)
-
         virtual void INode::accept(INodeVisitor *visitor) const =0
 
         Calls the  INodeVisitor's visit method. 
@@ -2537,11 +2038,9 @@ class INode(IParameterized):
         """
         return _libBornAgainCore.INode_accept(self, visitor)
 
-
     def treeToString(self):
-        """
+        r"""
         treeToString(INode self) -> std::string
-
         std::string INode::treeToString() const
 
         Returns multiline string representing tree structure below the node. 
@@ -2549,21 +2048,17 @@ class INode(IParameterized):
         """
         return _libBornAgainCore.INode_treeToString(self)
 
-
     def registerChild(self, node):
-        """
+        r"""
         registerChild(INode self, INode node)
-
         void INode::registerChild(INode *node)
 
         """
         return _libBornAgainCore.INode_registerChild(self, node)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(INode self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > INode::getChildren() const
 
         Returns a vector of children (const). 
@@ -2571,32 +2066,26 @@ class INode(IParameterized):
         """
         return _libBornAgainCore.INode_getChildren(self)
 
-
     def setParent(self, newParent):
-        """
+        r"""
         setParent(INode self, INode newParent)
-
         void INode::setParent(const INode *newParent)
 
         """
         return _libBornAgainCore.INode_setParent(self, newParent)
 
-
     def parent(self, *args):
-        """
+        r"""
         parent(INode self) -> INode
         parent(INode self) -> INode
-
         INode* INode::parent()
 
         """
         return _libBornAgainCore.INode_parent(self, *args)
 
-
     def copyNumber(self, node):
-        """
+        r"""
         copyNumber(INode self, INode node) -> int
-
         int INode::copyNumber(const INode *node) const
 
         Returns copyNumber of child, which takes into account existence of children with same name. 
@@ -2604,11 +2093,9 @@ class INode(IParameterized):
         """
         return _libBornAgainCore.INode_copyNumber(self, node)
 
-
     def displayName(self):
-        """
+        r"""
         displayName(INode self) -> std::string
-
         std::string INode::displayName() const
 
         Returns display name, composed from the name of node and it's copy number. 
@@ -2616,123 +2103,103 @@ class INode(IParameterized):
         """
         return _libBornAgainCore.INode_displayName(self)
 
-
     def createParameterTree(self):
-        """
+        r"""
         createParameterTree(INode self) -> ParameterPool
-
         ParameterPool * INode::createParameterTree() const
 
         Creates new parameter pool, with all local parameters and those of its children. 
 
         """
         return _libBornAgainCore.INode_createParameterTree(self)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_INode(self)
-        return weakref_proxy(self)
-INode_swigregister = _libBornAgainCore.INode_swigregister
-INode_swigregister(INode)
+        return weakref.proxy(self)
+
+# Register INode in _libBornAgainCore:
+_libBornAgainCore.INode_swigregister(INode)
 
-class swig_dummy_type_inode_vector(_object):
-    """Proxy of C++ std::vector<(p.INode)> class."""
+class swig_dummy_type_inode_vector(object):
+    r"""Proxy of C++ std::vector< INode * > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, swig_dummy_type_inode_vector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, swig_dummy_type_inode_vector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(swig_dummy_type_inode_vector self) -> SwigPyIterator"""
+        r"""iterator(swig_dummy_type_inode_vector self) -> SwigPyIterator"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(swig_dummy_type_inode_vector self) -> bool"""
+        r"""__nonzero__(swig_dummy_type_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_inode_vector___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(swig_dummy_type_inode_vector self) -> bool"""
+        r"""__bool__(swig_dummy_type_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_inode_vector___bool__(self)
 
-
     def __len__(self):
-        """__len__(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
+        r"""__len__(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_inode_vector___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j) -> swig_dummy_type_inode_vector"""
+        r"""__getslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j) -> swig_dummy_type_inode_vector"""
         return _libBornAgainCore.swig_dummy_type_inode_vector___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)
         __setslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j, swig_dummy_type_inode_vector v)
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)"""
+        r"""__delslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i)
         __delitem__(swig_dummy_type_inode_vector self, PySliceObject * slice)
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(swig_dummy_type_inode_vector self, PySliceObject * slice) -> swig_dummy_type_inode_vector
         __getitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i) -> INode
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(swig_dummy_type_inode_vector self, PySliceObject * slice, swig_dummy_type_inode_vector v)
         __setitem__(swig_dummy_type_inode_vector self, PySliceObject * slice)
         __setitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(swig_dummy_type_inode_vector self) -> INode"""
+        r"""pop(swig_dummy_type_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_pop(self)
 
-
     def append(self, x):
-        """append(swig_dummy_type_inode_vector self, INode x)"""
+        r"""append(swig_dummy_type_inode_vector self, INode x)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_append(self, x)
 
-
     def empty(self):
-        """empty(swig_dummy_type_inode_vector self) -> bool"""
+        r"""empty(swig_dummy_type_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_empty(self)
 
-
     def size(self):
-        """size(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
+        r"""size(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(swig_dummy_type_inode_vector self, swig_dummy_type_inode_vector v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -2740,211 +2207,172 @@ class swig_dummy_type_inode_vector(_object):
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector_swap(self, v)
 
-
     def begin(self):
-        """begin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"""
+        r"""begin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_begin(self)
 
-
     def end(self):
-        """end(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"""
+        r"""end(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_end(self)
 
-
     def rbegin(self):
-        """rbegin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"""
+        r"""rbegin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_rbegin(self)
 
-
     def rend(self):
-        """rend(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"""
+        r"""rend(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_rend(self)
 
-
     def clear(self):
-        """clear(swig_dummy_type_inode_vector self)"""
+        r"""clear(swig_dummy_type_inode_vector self)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(swig_dummy_type_inode_vector self) -> std::vector< INode * >::allocator_type"""
+        r"""get_allocator(swig_dummy_type_inode_vector self) -> std::vector< INode * >::allocator_type"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(swig_dummy_type_inode_vector self)"""
+        r"""pop_back(swig_dummy_type_inode_vector self)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos) -> std::vector< INode * >::iterator
         erase(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator first, std::vector< INode * >::iterator last) -> std::vector< INode * >::iterator
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(swig_dummy_type_inode_vector self) -> swig_dummy_type_inode_vector
+        __init__(swig_dummy_type_inode_vector self, swig_dummy_type_inode_vector other) -> swig_dummy_type_inode_vector
+        __init__(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type size) -> swig_dummy_type_inode_vector
+        __init__(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type size, INode value) -> swig_dummy_type_inode_vector
         """
-        __init__(std::vector<(p.INode)> self) -> swig_dummy_type_inode_vector
-        __init__(std::vector<(p.INode)> self, swig_dummy_type_inode_vector arg2) -> swig_dummy_type_inode_vector
-        __init__(std::vector<(p.INode)> self, std::vector< INode * >::size_type size) -> swig_dummy_type_inode_vector
-        __init__(std::vector<(p.INode)> self, std::vector< INode * >::size_type size, INode value) -> swig_dummy_type_inode_vector
-        """
-        this = _libBornAgainCore.new_swig_dummy_type_inode_vector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.swig_dummy_type_inode_vector_swiginit(self, _libBornAgainCore.new_swig_dummy_type_inode_vector(*args))
 
     def push_back(self, x):
-        """push_back(swig_dummy_type_inode_vector self, INode x)"""
+        r"""push_back(swig_dummy_type_inode_vector self, INode x)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_push_back(self, x)
 
-
     def front(self):
-        """front(swig_dummy_type_inode_vector self) -> INode"""
+        r"""front(swig_dummy_type_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_front(self)
 
-
     def back(self):
-        """back(swig_dummy_type_inode_vector self) -> INode"""
+        r"""back(swig_dummy_type_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_back(self)
 
-
     def assign(self, n, x):
-        """assign(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n, INode x)"""
+        r"""assign(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n, INode x)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type new_size)
         resize(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type new_size, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos, INode x) -> std::vector< INode * >::iterator
         insert(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos, std::vector< INode * >::size_type n, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_inode_vector_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n)"""
+        r"""reserve(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n)"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
+        r"""capacity(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_inode_vector_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_swig_dummy_type_inode_vector
-    __del__ = lambda self: None
-swig_dummy_type_inode_vector_swigregister = _libBornAgainCore.swig_dummy_type_inode_vector_swigregister
-swig_dummy_type_inode_vector_swigregister(swig_dummy_type_inode_vector)
 
-class swig_dummy_type_const_inode_vector(_object):
-    """Proxy of C++ std::vector<(p.q(const).INode)> class."""
+# Register swig_dummy_type_inode_vector in _libBornAgainCore:
+_libBornAgainCore.swig_dummy_type_inode_vector_swigregister(swig_dummy_type_inode_vector)
+
+class swig_dummy_type_const_inode_vector(object):
+    r"""Proxy of C++ std::vector< INode const * > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, swig_dummy_type_const_inode_vector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, swig_dummy_type_const_inode_vector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(swig_dummy_type_const_inode_vector self) -> SwigPyIterator"""
+        r"""iterator(swig_dummy_type_const_inode_vector self) -> SwigPyIterator"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(swig_dummy_type_const_inode_vector self) -> bool"""
+        r"""__nonzero__(swig_dummy_type_const_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(swig_dummy_type_const_inode_vector self) -> bool"""
+        r"""__bool__(swig_dummy_type_const_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___bool__(self)
 
-
     def __len__(self):
-        """__len__(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
+        r"""__len__(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j) -> swig_dummy_type_const_inode_vector"""
+        r"""__getslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j) -> swig_dummy_type_const_inode_vector"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)
         __setslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j, swig_dummy_type_const_inode_vector v)
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)"""
+        r"""__delslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i)
         __delitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice)
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice) -> swig_dummy_type_const_inode_vector
         __getitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i) -> INode
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice, swig_dummy_type_const_inode_vector v)
         __setitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice)
         __setitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(swig_dummy_type_const_inode_vector self) -> INode"""
+        r"""pop(swig_dummy_type_const_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_pop(self)
 
-
     def append(self, x):
-        """append(swig_dummy_type_const_inode_vector self, INode x)"""
+        r"""append(swig_dummy_type_const_inode_vector self, INode x)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_append(self, x)
 
-
     def empty(self):
-        """empty(swig_dummy_type_const_inode_vector self) -> bool"""
+        r"""empty(swig_dummy_type_const_inode_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_empty(self)
 
-
     def size(self):
-        """size(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
+        r"""size(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(swig_dummy_type_const_inode_vector self, swig_dummy_type_const_inode_vector v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -2952,211 +2380,172 @@ class swig_dummy_type_const_inode_vector(_object):
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_swap(self, v)
 
-
     def begin(self):
-        """begin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"""
+        r"""begin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_begin(self)
 
-
     def end(self):
-        """end(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"""
+        r"""end(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_end(self)
 
-
     def rbegin(self):
-        """rbegin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"""
+        r"""rbegin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_rbegin(self)
 
-
     def rend(self):
-        """rend(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"""
+        r"""rend(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_rend(self)
 
-
     def clear(self):
-        """clear(swig_dummy_type_const_inode_vector self)"""
+        r"""clear(swig_dummy_type_const_inode_vector self)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::allocator_type"""
+        r"""get_allocator(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::allocator_type"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(swig_dummy_type_const_inode_vector self)"""
+        r"""pop_back(swig_dummy_type_const_inode_vector self)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos) -> std::vector< INode const * >::iterator
         erase(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator first, std::vector< INode const * >::iterator last) -> std::vector< INode const * >::iterator
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(swig_dummy_type_const_inode_vector self) -> swig_dummy_type_const_inode_vector
+        __init__(swig_dummy_type_const_inode_vector self, swig_dummy_type_const_inode_vector other) -> swig_dummy_type_const_inode_vector
+        __init__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type size) -> swig_dummy_type_const_inode_vector
+        __init__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type size, INode value) -> swig_dummy_type_const_inode_vector
         """
-        __init__(std::vector<(p.q(const).INode)> self) -> swig_dummy_type_const_inode_vector
-        __init__(std::vector<(p.q(const).INode)> self, swig_dummy_type_const_inode_vector arg2) -> swig_dummy_type_const_inode_vector
-        __init__(std::vector<(p.q(const).INode)> self, std::vector< INode const * >::size_type size) -> swig_dummy_type_const_inode_vector
-        __init__(std::vector<(p.q(const).INode)> self, std::vector< INode const * >::size_type size, INode value) -> swig_dummy_type_const_inode_vector
-        """
-        this = _libBornAgainCore.new_swig_dummy_type_const_inode_vector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.swig_dummy_type_const_inode_vector_swiginit(self, _libBornAgainCore.new_swig_dummy_type_const_inode_vector(*args))
 
     def push_back(self, x):
-        """push_back(swig_dummy_type_const_inode_vector self, INode x)"""
+        r"""push_back(swig_dummy_type_const_inode_vector self, INode x)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_push_back(self, x)
 
-
     def front(self):
-        """front(swig_dummy_type_const_inode_vector self) -> INode"""
+        r"""front(swig_dummy_type_const_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_front(self)
 
-
     def back(self):
-        """back(swig_dummy_type_const_inode_vector self) -> INode"""
+        r"""back(swig_dummy_type_const_inode_vector self) -> INode"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_back(self)
 
-
     def assign(self, n, x):
-        """assign(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n, INode x)"""
+        r"""assign(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n, INode x)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type new_size)
         resize(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type new_size, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos, INode x) -> std::vector< INode const * >::iterator
         insert(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos, std::vector< INode const * >::size_type n, INode x)
         """
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n)"""
+        r"""reserve(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n)"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
+        r"""capacity(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"""
         return _libBornAgainCore.swig_dummy_type_const_inode_vector_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_swig_dummy_type_const_inode_vector
-    __del__ = lambda self: None
-swig_dummy_type_const_inode_vector_swigregister = _libBornAgainCore.swig_dummy_type_const_inode_vector_swigregister
-swig_dummy_type_const_inode_vector_swigregister(swig_dummy_type_const_inode_vector)
 
-class swig_dummy_type_axisinfo_vector(_object):
-    """Proxy of C++ std::vector<(AxisInfo)> class."""
+# Register swig_dummy_type_const_inode_vector in _libBornAgainCore:
+_libBornAgainCore.swig_dummy_type_const_inode_vector_swigregister(swig_dummy_type_const_inode_vector)
+
+class swig_dummy_type_axisinfo_vector(object):
+    r"""Proxy of C++ std::vector< AxisInfo > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, swig_dummy_type_axisinfo_vector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, swig_dummy_type_axisinfo_vector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(swig_dummy_type_axisinfo_vector self) -> SwigPyIterator"""
+        r"""iterator(swig_dummy_type_axisinfo_vector self) -> SwigPyIterator"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(swig_dummy_type_axisinfo_vector self) -> bool"""
+        r"""__nonzero__(swig_dummy_type_axisinfo_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(swig_dummy_type_axisinfo_vector self) -> bool"""
+        r"""__bool__(swig_dummy_type_axisinfo_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___bool__(self)
 
-
     def __len__(self):
-        """__len__(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
+        r"""__len__(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j) -> swig_dummy_type_axisinfo_vector"""
+        r"""__getslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j) -> swig_dummy_type_axisinfo_vector"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)
         __setslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j, swig_dummy_type_axisinfo_vector v)
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)"""
+        r"""__delslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i)
         __delitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice)
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice) -> swig_dummy_type_axisinfo_vector
         __getitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i) -> AxisInfo
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice, swig_dummy_type_axisinfo_vector v)
         __setitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice)
         __setitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, AxisInfo x)
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
+        r"""pop(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_pop(self)
 
-
     def append(self, x):
-        """append(swig_dummy_type_axisinfo_vector self, AxisInfo x)"""
+        r"""append(swig_dummy_type_axisinfo_vector self, AxisInfo x)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_append(self, x)
 
-
     def empty(self):
-        """empty(swig_dummy_type_axisinfo_vector self) -> bool"""
+        r"""empty(swig_dummy_type_axisinfo_vector self) -> bool"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_empty(self)
 
-
     def size(self):
-        """size(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
+        r"""size(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(swig_dummy_type_axisinfo_vector self, swig_dummy_type_axisinfo_vector v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -3164,115 +2553,94 @@ class swig_dummy_type_axisinfo_vector(_object):
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_swap(self, v)
 
-
     def begin(self):
-        """begin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"""
+        r"""begin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_begin(self)
 
-
     def end(self):
-        """end(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"""
+        r"""end(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_end(self)
 
-
     def rbegin(self):
-        """rbegin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"""
+        r"""rbegin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_rbegin(self)
 
-
     def rend(self):
-        """rend(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"""
+        r"""rend(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_rend(self)
 
-
     def clear(self):
-        """clear(swig_dummy_type_axisinfo_vector self)"""
+        r"""clear(swig_dummy_type_axisinfo_vector self)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::allocator_type"""
+        r"""get_allocator(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::allocator_type"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(swig_dummy_type_axisinfo_vector self)"""
+        r"""pop_back(swig_dummy_type_axisinfo_vector self)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos) -> std::vector< AxisInfo >::iterator
         erase(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator first, std::vector< AxisInfo >::iterator last) -> std::vector< AxisInfo >::iterator
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(swig_dummy_type_axisinfo_vector self) -> swig_dummy_type_axisinfo_vector
+        __init__(swig_dummy_type_axisinfo_vector self, swig_dummy_type_axisinfo_vector other) -> swig_dummy_type_axisinfo_vector
+        __init__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type size) -> swig_dummy_type_axisinfo_vector
+        __init__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type size, AxisInfo value) -> swig_dummy_type_axisinfo_vector
         """
-        __init__(std::vector<(AxisInfo)> self) -> swig_dummy_type_axisinfo_vector
-        __init__(std::vector<(AxisInfo)> self, swig_dummy_type_axisinfo_vector arg2) -> swig_dummy_type_axisinfo_vector
-        __init__(std::vector<(AxisInfo)> self, std::vector< AxisInfo >::size_type size) -> swig_dummy_type_axisinfo_vector
-        __init__(std::vector<(AxisInfo)> self, std::vector< AxisInfo >::size_type size, AxisInfo value) -> swig_dummy_type_axisinfo_vector
-        """
-        this = _libBornAgainCore.new_swig_dummy_type_axisinfo_vector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.swig_dummy_type_axisinfo_vector_swiginit(self, _libBornAgainCore.new_swig_dummy_type_axisinfo_vector(*args))
 
     def push_back(self, x):
-        """push_back(swig_dummy_type_axisinfo_vector self, AxisInfo x)"""
+        r"""push_back(swig_dummy_type_axisinfo_vector self, AxisInfo x)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_push_back(self, x)
 
-
     def front(self):
-        """front(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
+        r"""front(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_front(self)
 
-
     def back(self):
-        """back(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
+        r"""back(swig_dummy_type_axisinfo_vector self) -> AxisInfo"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_back(self)
 
-
     def assign(self, n, x):
-        """assign(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n, AxisInfo x)"""
+        r"""assign(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n, AxisInfo x)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type new_size)
         resize(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type new_size, AxisInfo x)
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos, AxisInfo x) -> std::vector< AxisInfo >::iterator
         insert(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos, std::vector< AxisInfo >::size_type n, AxisInfo x)
         """
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n)"""
+        r"""reserve(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n)"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
+        r"""capacity(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"""
         return _libBornAgainCore.swig_dummy_type_axisinfo_vector_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_swig_dummy_type_axisinfo_vector
-    __del__ = lambda self: None
-swig_dummy_type_axisinfo_vector_swigregister = _libBornAgainCore.swig_dummy_type_axisinfo_vector_swigregister
-swig_dummy_type_axisinfo_vector_swigregister(swig_dummy_type_axisinfo_vector)
 
-class kvector_t(_object):
-    """
+# Register swig_dummy_type_axisinfo_vector in _libBornAgainCore:
+_libBornAgainCore.swig_dummy_type_axisinfo_vector_swigregister(swig_dummy_type_axisinfo_vector)
+
+class kvector_t(object):
+    r"""
 
 
     Forked from CLHEP/Geometry by E. Chernyaev Evgueni.Tcherniaev@cern.ch, then reworked beyond recongnition. Removed split of point and vector semantics. Transforms are relegated to a separate class  Transform3D. Three-dimensional vector template, for use with integer, double, or complex components.
@@ -3281,32 +2649,23 @@ class kvector_t(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, kvector_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, kvector_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(BasicVector3D<(double)> self) -> kvector_t
-        __init__(BasicVector3D<(double)> self, double const x1, double const y1, double const z1) -> kvector_t
-
+        r"""
+        __init__(kvector_t self) -> kvector_t
+        __init__(kvector_t self, double const x1, double const y1, double const z1) -> kvector_t
         BasicVector3D< T >::BasicVector3D(const T x1, const T y1, const T z1)
 
         Constructor from cartesian components. 
 
         """
-        this = _libBornAgainCore.new_kvector_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.kvector_t_swiginit(self, _libBornAgainCore.new_kvector_t(*args))
 
     def x(self):
-        """
+        r"""
         x(kvector_t self) -> double
-
         T BasicVector3D< T >::x() const
 
         Returns x-component in cartesian coordinate system. 
@@ -3314,11 +2673,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_x(self)
 
-
     def y(self):
-        """
+        r"""
         y(kvector_t self) -> double
-
         T BasicVector3D< T >::y() const
 
         Returns y-component in cartesian coordinate system. 
@@ -3326,11 +2683,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_y(self)
 
-
     def z(self):
-        """
+        r"""
         z(kvector_t self) -> double
-
         T BasicVector3D< T >::z() const
 
         Returns z-component in cartesian coordinate system. 
@@ -3338,11 +2693,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_z(self)
 
-
     def setX(self, a):
-        """
+        r"""
         setX(kvector_t self, double const & a)
-
         void BasicVector3D< T >::setX(const T &a)
 
         Sets x-component in cartesian coordinate system. 
@@ -3350,11 +2703,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_setX(self, a)
 
-
     def setY(self, a):
-        """
+        r"""
         setY(kvector_t self, double const & a)
-
         void BasicVector3D< T >::setY(const T &a)
 
         Sets y-component in cartesian coordinate system. 
@@ -3362,11 +2713,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_setY(self, a)
 
-
     def setZ(self, a):
-        """
+        r"""
         setZ(kvector_t self, double const & a)
-
         void BasicVector3D< T >::setZ(const T &a)
 
         Sets z-component in cartesian coordinate system. 
@@ -3374,31 +2723,25 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_setZ(self, a)
 
-
     def __iadd__(self, v):
-        """__iadd__(kvector_t self, kvector_t v) -> kvector_t"""
+        r"""__iadd__(kvector_t self, kvector_t v) -> kvector_t"""
         return _libBornAgainCore.kvector_t___iadd__(self, v)
 
-
     def __isub__(self, v):
-        """__isub__(kvector_t self, kvector_t v) -> kvector_t"""
+        r"""__isub__(kvector_t self, kvector_t v) -> kvector_t"""
         return _libBornAgainCore.kvector_t___isub__(self, v)
 
-
     def conj(self):
-        """
+        r"""
         conj(kvector_t self) -> kvector_t
-
         BasicVector3D< complex_t > BasicVector3D< complex_t >::conj() const
 
         """
         return _libBornAgainCore.kvector_t_conj(self)
 
-
     def mag2(self):
-        """
+        r"""
         mag2(kvector_t self) -> double
-
         double BasicVector3D< T >::mag2() const
 
         Returns magnitude squared of the vector. 
@@ -3406,11 +2749,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_mag2(self)
 
-
     def mag(self):
-        """
+        r"""
         mag(kvector_t self) -> double
-
         double BasicVector3D< T >::mag() const
 
         Returns magnitude of the vector. 
@@ -3418,11 +2759,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_mag(self)
 
-
     def magxy2(self):
-        """
+        r"""
         magxy2(kvector_t self) -> double
-
         double BasicVector3D< T >::magxy2() const
 
         Returns squared distance from z axis. 
@@ -3430,11 +2769,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_magxy2(self)
 
-
     def magxy(self):
-        """
+        r"""
         magxy(kvector_t self) -> double
-
         double BasicVector3D< T >::magxy() const
 
         Returns distance from z axis. 
@@ -3442,11 +2779,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_magxy(self)
 
-
     def phi(self):
-        """
+        r"""
         phi(kvector_t self) -> double
-
         double BasicVector3D< T >::phi() const
 
         Returns azimuth angle. 
@@ -3454,11 +2789,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_phi(self)
 
-
     def theta(self):
-        """
+        r"""
         theta(kvector_t self) -> double
-
         double BasicVector3D< T >::theta() const
 
         Returns polar angle. 
@@ -3466,11 +2799,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_theta(self)
 
-
     def cosTheta(self):
-        """
+        r"""
         cosTheta(kvector_t self) -> double
-
         double BasicVector3D< T >::cosTheta() const
 
         Returns cosine of polar angle. 
@@ -3478,11 +2809,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_cosTheta(self)
 
-
     def sin2Theta(self):
-        """
+        r"""
         sin2Theta(kvector_t self) -> double
-
         double BasicVector3D< T >::sin2Theta() const
 
         Returns squared sine of polar angle. 
@@ -3490,21 +2819,17 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_sin2Theta(self)
 
-
     def unit(self):
-        """
+        r"""
         unit(kvector_t self) -> kvector_t
-
         BasicVector3D< complex_t > BasicVector3D< complex_t >::unit() const
 
         """
         return _libBornAgainCore.kvector_t_unit(self)
 
-
     def complex(self):
-        """
+        r"""
         complex(kvector_t self) -> cvector_t
-
         BasicVector3D<std::complex<double> > BasicVector3D< T >::complex() const
 
         Returns this, trivially converted to complex type. 
@@ -3512,21 +2837,17 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_complex(self)
 
-
     def real(self):
-        """
+        r"""
         real(kvector_t self) -> kvector_t
-
         BasicVector3D< double > BasicVector3D< complex_t >::real() const
 
         """
         return _libBornAgainCore.kvector_t_real(self)
 
-
     def angle(self, v):
-        """
+        r"""
         angle(kvector_t self, kvector_t v) -> double
-
         double BasicVector3D< T >::angle(const BasicVector3D< T > &v) const
 
         Returns angle with respect to another vector. 
@@ -3534,11 +2855,9 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_angle(self, v)
 
-
     def project(self, v):
-        """
+        r"""
         project(kvector_t self, kvector_t v) -> kvector_t
-
         BasicVector3D<T> BasicVector3D< T >::project(const BasicVector3D< T > &v) const
 
         Returns projection of this onto other vector: (this*v)*v/|v|^2. 
@@ -3546,129 +2865,106 @@ class kvector_t(_object):
         """
         return _libBornAgainCore.kvector_t_project(self, v)
 
-
     def __add__(self, rhs):
-        """__add__(kvector_t self, kvector_t rhs) -> kvector_t"""
+        r"""__add__(kvector_t self, kvector_t rhs) -> kvector_t"""
         return _libBornAgainCore.kvector_t___add__(self, rhs)
 
-
     def __mul__(self, c):
-        """__mul__(kvector_t self, double c) -> kvector_t"""
+        r"""__mul__(kvector_t self, double c) -> kvector_t"""
         return _libBornAgainCore.kvector_t___mul__(self, c)
 
-
     def __rmul__(self, c):
-        """__rmul__(kvector_t self, double c) -> kvector_t"""
+        r"""__rmul__(kvector_t self, double c) -> kvector_t"""
         return _libBornAgainCore.kvector_t___rmul__(self, c)
 
-
     def __neg__(self):
-        """__neg__(kvector_t self) -> kvector_t"""
+        r"""__neg__(kvector_t self) -> kvector_t"""
         return _libBornAgainCore.kvector_t___neg__(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_kvector_t
-    __del__ = lambda self: None
-kvector_t_swigregister = _libBornAgainCore.kvector_t_swigregister
-kvector_t_swigregister(kvector_t)
 
-class vector_kvector_t(_object):
-    """Proxy of C++ std::vector<(BasicVector3D<(double)>)> class."""
+# Register kvector_t in _libBornAgainCore:
+_libBornAgainCore.kvector_t_swigregister(kvector_t)
+
+class vector_kvector_t(object):
+    r"""Proxy of C++ std::vector< BasicVector3D< double > > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_kvector_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_kvector_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_kvector_t self) -> SwigPyIterator"""
+        r"""iterator(vector_kvector_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_kvector_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_kvector_t self) -> bool"""
+        r"""__nonzero__(vector_kvector_t self) -> bool"""
         return _libBornAgainCore.vector_kvector_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_kvector_t self) -> bool"""
+        r"""__bool__(vector_kvector_t self) -> bool"""
         return _libBornAgainCore.vector_kvector_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
+        r"""__len__(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
         return _libBornAgainCore.vector_kvector_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j) -> vector_kvector_t"""
+        r"""__getslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j) -> vector_kvector_t"""
         return _libBornAgainCore.vector_kvector_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)
         __setslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j, vector_kvector_t v)
         """
         return _libBornAgainCore.vector_kvector_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)"""
+        r"""__delslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)"""
         return _libBornAgainCore.vector_kvector_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i)
         __delitem__(vector_kvector_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_kvector_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_kvector_t self, PySliceObject * slice) -> vector_kvector_t
         __getitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i) -> kvector_t
         """
         return _libBornAgainCore.vector_kvector_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_kvector_t self, PySliceObject * slice, vector_kvector_t v)
         __setitem__(vector_kvector_t self, PySliceObject * slice)
         __setitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, kvector_t x)
         """
         return _libBornAgainCore.vector_kvector_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_kvector_t self) -> kvector_t"""
+        r"""pop(vector_kvector_t self) -> kvector_t"""
         return _libBornAgainCore.vector_kvector_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_kvector_t self, kvector_t x)"""
+        r"""append(vector_kvector_t self, kvector_t x)"""
         return _libBornAgainCore.vector_kvector_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_kvector_t self) -> bool"""
+        r"""empty(vector_kvector_t self) -> bool"""
         return _libBornAgainCore.vector_kvector_t_empty(self)
 
-
     def size(self):
-        """size(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
+        r"""size(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
         return _libBornAgainCore.vector_kvector_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_kvector_t self, vector_kvector_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -3676,115 +2972,94 @@ class vector_kvector_t(_object):
         """
         return _libBornAgainCore.vector_kvector_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"""
+        r"""begin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"""
         return _libBornAgainCore.vector_kvector_t_begin(self)
 
-
     def end(self):
-        """end(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"""
+        r"""end(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"""
         return _libBornAgainCore.vector_kvector_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"""
+        r"""rbegin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"""
         return _libBornAgainCore.vector_kvector_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"""
+        r"""rend(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"""
         return _libBornAgainCore.vector_kvector_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_kvector_t self)"""
+        r"""clear(vector_kvector_t self)"""
         return _libBornAgainCore.vector_kvector_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::allocator_type"""
+        r"""get_allocator(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::allocator_type"""
         return _libBornAgainCore.vector_kvector_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_kvector_t self)"""
+        r"""pop_back(vector_kvector_t self)"""
         return _libBornAgainCore.vector_kvector_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos) -> std::vector< BasicVector3D< double > >::iterator
         erase(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator first, std::vector< BasicVector3D< double > >::iterator last) -> std::vector< BasicVector3D< double > >::iterator
         """
         return _libBornAgainCore.vector_kvector_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_kvector_t self) -> vector_kvector_t
+        __init__(vector_kvector_t self, vector_kvector_t other) -> vector_kvector_t
+        __init__(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type size) -> vector_kvector_t
+        __init__(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type size, kvector_t value) -> vector_kvector_t
         """
-        __init__(std::vector<(BasicVector3D<(double)>)> self) -> vector_kvector_t
-        __init__(std::vector<(BasicVector3D<(double)>)> self, vector_kvector_t arg2) -> vector_kvector_t
-        __init__(std::vector<(BasicVector3D<(double)>)> self, std::vector< BasicVector3D< double > >::size_type size) -> vector_kvector_t
-        __init__(std::vector<(BasicVector3D<(double)>)> self, std::vector< BasicVector3D< double > >::size_type size, kvector_t value) -> vector_kvector_t
-        """
-        this = _libBornAgainCore.new_vector_kvector_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_kvector_t_swiginit(self, _libBornAgainCore.new_vector_kvector_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_kvector_t self, kvector_t x)"""
+        r"""push_back(vector_kvector_t self, kvector_t x)"""
         return _libBornAgainCore.vector_kvector_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_kvector_t self) -> kvector_t"""
+        r"""front(vector_kvector_t self) -> kvector_t"""
         return _libBornAgainCore.vector_kvector_t_front(self)
 
-
     def back(self):
-        """back(vector_kvector_t self) -> kvector_t"""
+        r"""back(vector_kvector_t self) -> kvector_t"""
         return _libBornAgainCore.vector_kvector_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)"""
+        r"""assign(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)"""
         return _libBornAgainCore.vector_kvector_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type new_size)
         resize(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type new_size, kvector_t x)
         """
         return _libBornAgainCore.vector_kvector_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos, kvector_t x) -> std::vector< BasicVector3D< double > >::iterator
         insert(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)
         """
         return _libBornAgainCore.vector_kvector_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n)"""
+        r"""reserve(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n)"""
         return _libBornAgainCore.vector_kvector_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
+        r"""capacity(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"""
         return _libBornAgainCore.vector_kvector_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_kvector_t
-    __del__ = lambda self: None
-vector_kvector_t_swigregister = _libBornAgainCore.vector_kvector_t_swigregister
-vector_kvector_t_swigregister(vector_kvector_t)
 
-class cvector_t(_object):
-    """
+# Register vector_kvector_t in _libBornAgainCore:
+_libBornAgainCore.vector_kvector_t_swigregister(vector_kvector_t)
+
+class cvector_t(object):
+    r"""
 
 
     Forked from CLHEP/Geometry by E. Chernyaev Evgueni.Tcherniaev@cern.ch, then reworked beyond recongnition. Removed split of point and vector semantics. Transforms are relegated to a separate class  Transform3D. Three-dimensional vector template, for use with integer, double, or complex components.
@@ -3793,32 +3068,23 @@ class cvector_t(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, cvector_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, cvector_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(BasicVector3D<(std::complex<(double)>)> self) -> cvector_t
-        __init__(BasicVector3D<(std::complex<(double)>)> self, std::complex< double > const x1, std::complex< double > const y1, std::complex< double > const z1) -> cvector_t
-
+        r"""
+        __init__(cvector_t self) -> cvector_t
+        __init__(cvector_t self, std::complex< double > const x1, std::complex< double > const y1, std::complex< double > const z1) -> cvector_t
         BasicVector3D< T >::BasicVector3D(const T x1, const T y1, const T z1)
 
         Constructor from cartesian components. 
 
         """
-        this = _libBornAgainCore.new_cvector_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.cvector_t_swiginit(self, _libBornAgainCore.new_cvector_t(*args))
 
     def x(self):
-        """
+        r"""
         x(cvector_t self) -> std::complex< double >
-
         T BasicVector3D< T >::x() const
 
         Returns x-component in cartesian coordinate system. 
@@ -3826,11 +3092,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_x(self)
 
-
     def y(self):
-        """
+        r"""
         y(cvector_t self) -> std::complex< double >
-
         T BasicVector3D< T >::y() const
 
         Returns y-component in cartesian coordinate system. 
@@ -3838,11 +3102,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_y(self)
 
-
     def z(self):
-        """
+        r"""
         z(cvector_t self) -> std::complex< double >
-
         T BasicVector3D< T >::z() const
 
         Returns z-component in cartesian coordinate system. 
@@ -3850,11 +3112,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_z(self)
 
-
     def setX(self, a):
-        """
+        r"""
         setX(cvector_t self, std::complex< double > const & a)
-
         void BasicVector3D< T >::setX(const T &a)
 
         Sets x-component in cartesian coordinate system. 
@@ -3862,11 +3122,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_setX(self, a)
 
-
     def setY(self, a):
-        """
+        r"""
         setY(cvector_t self, std::complex< double > const & a)
-
         void BasicVector3D< T >::setY(const T &a)
 
         Sets y-component in cartesian coordinate system. 
@@ -3874,11 +3132,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_setY(self, a)
 
-
     def setZ(self, a):
-        """
+        r"""
         setZ(cvector_t self, std::complex< double > const & a)
-
         void BasicVector3D< T >::setZ(const T &a)
 
         Sets z-component in cartesian coordinate system. 
@@ -3886,31 +3142,25 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_setZ(self, a)
 
-
     def __iadd__(self, v):
-        """__iadd__(cvector_t self, cvector_t v) -> cvector_t"""
+        r"""__iadd__(cvector_t self, cvector_t v) -> cvector_t"""
         return _libBornAgainCore.cvector_t___iadd__(self, v)
 
-
     def __isub__(self, v):
-        """__isub__(cvector_t self, cvector_t v) -> cvector_t"""
+        r"""__isub__(cvector_t self, cvector_t v) -> cvector_t"""
         return _libBornAgainCore.cvector_t___isub__(self, v)
 
-
     def conj(self):
-        """
+        r"""
         conj(cvector_t self) -> cvector_t
-
         BasicVector3D< complex_t > BasicVector3D< complex_t >::conj() const
 
         """
         return _libBornAgainCore.cvector_t_conj(self)
 
-
     def mag2(self):
-        """
+        r"""
         mag2(cvector_t self) -> double
-
         double BasicVector3D< T >::mag2() const
 
         Returns magnitude squared of the vector. 
@@ -3918,11 +3168,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_mag2(self)
 
-
     def mag(self):
-        """
+        r"""
         mag(cvector_t self) -> double
-
         double BasicVector3D< T >::mag() const
 
         Returns magnitude of the vector. 
@@ -3930,11 +3178,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_mag(self)
 
-
     def magxy2(self):
-        """
+        r"""
         magxy2(cvector_t self) -> double
-
         double BasicVector3D< T >::magxy2() const
 
         Returns squared distance from z axis. 
@@ -3942,11 +3188,9 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_magxy2(self)
 
-
     def magxy(self):
-        """
+        r"""
         magxy(cvector_t self) -> double
-
         double BasicVector3D< T >::magxy() const
 
         Returns distance from z axis. 
@@ -3954,141 +3198,116 @@ class cvector_t(_object):
         """
         return _libBornAgainCore.cvector_t_magxy(self)
 
-
     def unit(self):
-        """
+        r"""
         unit(cvector_t self) -> cvector_t
-
         BasicVector3D< complex_t > BasicVector3D< complex_t >::unit() const
 
         """
         return _libBornAgainCore.cvector_t_unit(self)
 
-
     def real(self):
-        """
+        r"""
         real(cvector_t self) -> kvector_t
-
         BasicVector3D< double > BasicVector3D< complex_t >::real() const
 
         """
         return _libBornAgainCore.cvector_t_real(self)
 
-
     def project(self, v):
-        """
+        r"""
         project(cvector_t self, cvector_t v) -> cvector_t
-
         BasicVector3D<T> BasicVector3D< T >::project(const BasicVector3D< T > &v) const
 
         Returns projection of this onto other vector: (this*v)*v/|v|^2. 
 
         """
         return _libBornAgainCore.cvector_t_project(self, v)
-
     __swig_destroy__ = _libBornAgainCore.delete_cvector_t
-    __del__ = lambda self: None
-cvector_t_swigregister = _libBornAgainCore.cvector_t_swigregister
-cvector_t_swigregister(cvector_t)
 
-class vector_cvector_t(_object):
-    """Proxy of C++ std::vector<(BasicVector3D<(std::complex<(double)>)>)> class."""
+# Register cvector_t in _libBornAgainCore:
+_libBornAgainCore.cvector_t_swigregister(cvector_t)
+
+class vector_cvector_t(object):
+    r"""Proxy of C++ std::vector< BasicVector3D< std::complex< double > > > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_cvector_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_cvector_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_cvector_t self) -> SwigPyIterator"""
+        r"""iterator(vector_cvector_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_cvector_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_cvector_t self) -> bool"""
+        r"""__nonzero__(vector_cvector_t self) -> bool"""
         return _libBornAgainCore.vector_cvector_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_cvector_t self) -> bool"""
+        r"""__bool__(vector_cvector_t self) -> bool"""
         return _libBornAgainCore.vector_cvector_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
+        r"""__len__(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
         return _libBornAgainCore.vector_cvector_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t"""
+        r"""__getslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t"""
         return _libBornAgainCore.vector_cvector_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)
         __setslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v)
         """
         return _libBornAgainCore.vector_cvector_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)"""
+        r"""__delslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)"""
         return _libBornAgainCore.vector_cvector_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i)
         __delitem__(vector_cvector_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_cvector_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_cvector_t self, PySliceObject * slice) -> vector_cvector_t
         __getitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i) -> cvector_t
         """
         return _libBornAgainCore.vector_cvector_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_cvector_t self, PySliceObject * slice, vector_cvector_t v)
         __setitem__(vector_cvector_t self, PySliceObject * slice)
         __setitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, cvector_t x)
         """
         return _libBornAgainCore.vector_cvector_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_cvector_t self) -> cvector_t"""
+        r"""pop(vector_cvector_t self) -> cvector_t"""
         return _libBornAgainCore.vector_cvector_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_cvector_t self, cvector_t x)"""
+        r"""append(vector_cvector_t self, cvector_t x)"""
         return _libBornAgainCore.vector_cvector_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_cvector_t self) -> bool"""
+        r"""empty(vector_cvector_t self) -> bool"""
         return _libBornAgainCore.vector_cvector_t_empty(self)
 
-
     def size(self):
-        """size(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
+        r"""size(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
         return _libBornAgainCore.vector_cvector_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_cvector_t self, vector_cvector_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -4096,118 +3315,96 @@ class vector_cvector_t(_object):
         """
         return _libBornAgainCore.vector_cvector_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"""
+        r"""begin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"""
         return _libBornAgainCore.vector_cvector_t_begin(self)
 
-
     def end(self):
-        """end(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"""
+        r"""end(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"""
         return _libBornAgainCore.vector_cvector_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"""
+        r"""rbegin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"""
         return _libBornAgainCore.vector_cvector_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"""
+        r"""rend(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"""
         return _libBornAgainCore.vector_cvector_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_cvector_t self)"""
+        r"""clear(vector_cvector_t self)"""
         return _libBornAgainCore.vector_cvector_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::allocator_type"""
+        r"""get_allocator(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::allocator_type"""
         return _libBornAgainCore.vector_cvector_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_cvector_t self)"""
+        r"""pop_back(vector_cvector_t self)"""
         return _libBornAgainCore.vector_cvector_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos) -> std::vector< BasicVector3D< std::complex< double > > >::iterator
         erase(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator first, std::vector< BasicVector3D< std::complex< double > > >::iterator last) -> std::vector< BasicVector3D< std::complex< double > > >::iterator
         """
         return _libBornAgainCore.vector_cvector_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_cvector_t self) -> vector_cvector_t
+        __init__(vector_cvector_t self, vector_cvector_t other) -> vector_cvector_t
+        __init__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type size) -> vector_cvector_t
+        __init__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type size, cvector_t value) -> vector_cvector_t
         """
-        __init__(std::vector<(BasicVector3D<(std::complex<(double)>)>)> self) -> vector_cvector_t
-        __init__(std::vector<(BasicVector3D<(std::complex<(double)>)>)> self, vector_cvector_t arg2) -> vector_cvector_t
-        __init__(std::vector<(BasicVector3D<(std::complex<(double)>)>)> self, std::vector< BasicVector3D< std::complex< double > > >::size_type size) -> vector_cvector_t
-        __init__(std::vector<(BasicVector3D<(std::complex<(double)>)>)> self, std::vector< BasicVector3D< std::complex< double > > >::size_type size, cvector_t value) -> vector_cvector_t
-        """
-        this = _libBornAgainCore.new_vector_cvector_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_cvector_t_swiginit(self, _libBornAgainCore.new_vector_cvector_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_cvector_t self, cvector_t x)"""
+        r"""push_back(vector_cvector_t self, cvector_t x)"""
         return _libBornAgainCore.vector_cvector_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_cvector_t self) -> cvector_t"""
+        r"""front(vector_cvector_t self) -> cvector_t"""
         return _libBornAgainCore.vector_cvector_t_front(self)
 
-
     def back(self):
-        """back(vector_cvector_t self) -> cvector_t"""
+        r"""back(vector_cvector_t self) -> cvector_t"""
         return _libBornAgainCore.vector_cvector_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)"""
+        r"""assign(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)"""
         return _libBornAgainCore.vector_cvector_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type new_size)
         resize(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type new_size, cvector_t x)
         """
         return _libBornAgainCore.vector_cvector_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos, cvector_t x) -> std::vector< BasicVector3D< std::complex< double > > >::iterator
         insert(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)
         """
         return _libBornAgainCore.vector_cvector_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n)"""
+        r"""reserve(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n)"""
         return _libBornAgainCore.vector_cvector_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
+        r"""capacity(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"""
         return _libBornAgainCore.vector_cvector_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_cvector_t
-    __del__ = lambda self: None
-vector_cvector_t_swigregister = _libBornAgainCore.vector_cvector_t_swigregister
-vector_cvector_t_swigregister(vector_cvector_t)
+
+# Register vector_cvector_t in _libBornAgainCore:
+_libBornAgainCore.vector_cvector_t_swigregister(vector_cvector_t)
 
 
 def mul_I(z):
-    """
+    r"""
     mul_I(complex_t z) -> complex_t
-
     complex_t mul_I(complex_t z)
 
     Returns product I*z, where I is the imaginary unit. 
@@ -4216,9 +3413,8 @@ def mul_I(z):
     return _libBornAgainCore.mul_I(z)
 
 def exp_I(z):
-    """
+    r"""
     exp_I(complex_t z) -> complex_t
-
     complex_t exp_I(complex_t z)
 
     Returns exp(I*z), where I is the imaginary unit. 
@@ -4227,24 +3423,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):
-    """
+class WavevectorInfo(object):
+    r"""
 
 
     Holds all wavevector information relevant for calculating form factors.
@@ -4253,85 +3447,66 @@ class WavevectorInfo(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, WavevectorInfo, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, WavevectorInfo, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
+    @staticmethod
     def GetZeroQ():
-        """GetZeroQ() -> WavevectorInfo"""
+        r"""GetZeroQ() -> WavevectorInfo"""
         return _libBornAgainCore.WavevectorInfo_GetZeroQ()
 
-    GetZeroQ = staticmethod(GetZeroQ)
-
     def __init__(self, *args):
-        """
+        r"""
         __init__(WavevectorInfo self, cvector_t ki, cvector_t kf, double wavelength) -> WavevectorInfo
         __init__(WavevectorInfo self, kvector_t ki, kvector_t kf, double wavelength) -> WavevectorInfo
-
         WavevectorInfo::WavevectorInfo(kvector_t ki, kvector_t kf, double wavelength)
 
         """
-        this = _libBornAgainCore.new_WavevectorInfo(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.WavevectorInfo_swiginit(self, _libBornAgainCore.new_WavevectorInfo(*args))
 
     def transformed(self, transform):
-        """
+        r"""
         transformed(WavevectorInfo self, Transform3D const & transform) -> WavevectorInfo
-
         WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const
 
         """
         return _libBornAgainCore.WavevectorInfo_transformed(self, transform)
 
-
     def getKi(self):
-        """
+        r"""
         getKi(WavevectorInfo self) -> cvector_t
-
         cvector_t WavevectorInfo::getKi() const
 
         """
         return _libBornAgainCore.WavevectorInfo_getKi(self)
 
-
     def getKf(self):
-        """
+        r"""
         getKf(WavevectorInfo self) -> cvector_t
-
         cvector_t WavevectorInfo::getKf() const
 
         """
         return _libBornAgainCore.WavevectorInfo_getKf(self)
 
-
     def getQ(self):
-        """
+        r"""
         getQ(WavevectorInfo self) -> cvector_t
-
         cvector_t WavevectorInfo::getQ() const
 
         """
         return _libBornAgainCore.WavevectorInfo_getQ(self)
 
-
     def getWavelength(self):
-        """
+        r"""
         getWavelength(WavevectorInfo self) -> double
-
         double WavevectorInfo::getWavelength() const
 
         """
         return _libBornAgainCore.WavevectorInfo_getWavelength(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_WavevectorInfo
-    __del__ = lambda self: None
-WavevectorInfo_swigregister = _libBornAgainCore.WavevectorInfo_swigregister
-WavevectorInfo_swigregister(WavevectorInfo)
+
+# Register WavevectorInfo in _libBornAgainCore:
+_libBornAgainCore.WavevectorInfo_swigregister(WavevectorInfo)
 nanometer = cvar.nanometer
 angstrom = cvar.angstrom
 micrometer = cvar.micrometer
@@ -4352,11 +3527,11 @@ tesla = cvar.tesla
 gauss = cvar.gauss
 
 def WavevectorInfo_GetZeroQ():
-    """WavevectorInfo_GetZeroQ() -> WavevectorInfo"""
+    r"""WavevectorInfo_GetZeroQ() -> WavevectorInfo"""
     return _libBornAgainCore.WavevectorInfo_GetZeroQ()
 
 class Beam(INode):
-    """
+    r"""
 
 
     Beam defined by wavelength, direction and intensity.
@@ -4365,36 +3540,22 @@ class Beam(INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Beam, name, value)
-    __swig_getmethods__ = {}
-    for _s in [INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Beam, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Beam self) -> Beam
         __init__(Beam self, Beam other) -> Beam
-
         Beam::Beam(const Beam &other)
 
         """
-        this = _libBornAgainCore.new_Beam(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Beam_swiginit(self, _libBornAgainCore.new_Beam(*args))
     __swig_destroy__ = _libBornAgainCore.delete_Beam
-    __del__ = lambda self: None
 
     def getCentralK(self):
-        """
+        r"""
         getCentralK(Beam self) -> kvector_t
-
         kvector_t Beam::getCentralK() const
 
         Returns the wavevector. 
@@ -4402,11 +3563,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_getCentralK(self)
 
-
     def setCentralK(self, wavelength, alpha_i, phi_i):
-        """
+        r"""
         setCentralK(Beam self, double wavelength, double alpha_i, double phi_i)
-
         void Beam::setCentralK(double wavelength, double alpha_i, double phi_i)
 
         Sets the wavevector in terms of wavelength and incoming angles. 
@@ -4414,11 +3573,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_setCentralK(self, wavelength, alpha_i, phi_i)
 
-
     def getIntensity(self):
-        """
+        r"""
         getIntensity(Beam self) -> double
-
         double Beam::getIntensity() const
 
         Returns the beam intensity in neutrons/sec. 
@@ -4426,11 +3583,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_getIntensity(self)
 
-
     def setIntensity(self, intensity):
-        """
+        r"""
         setIntensity(Beam self, double intensity)
-
         void Beam::setIntensity(double intensity)
 
         Sets the beam intensity in neutrons/sec. 
@@ -4438,11 +3593,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_setIntensity(self, intensity)
 
-
     def footprintFactor(self):
-        """
+        r"""
         footprintFactor(Beam self) -> IFootprintFactor
-
         const IFootprintFactor * Beam::footprintFactor() const
 
         Returns footprint factor. 
@@ -4450,11 +3603,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_footprintFactor(self)
 
-
     def setFootprintFactor(self, shape_factor):
-        """
+        r"""
         setFootprintFactor(Beam self, IFootprintFactor shape_factor)
-
         void Beam::setFootprintFactor(const IFootprintFactor &shape_factor)
 
         Sets footprint factor to the beam. 
@@ -4462,11 +3613,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_setFootprintFactor(self, shape_factor)
 
-
     def setWidthRatio(self, width_ratio):
-        """
+        r"""
         setWidthRatio(Beam self, double width_ratio)
-
         void Beam::setWidthRatio(double width_ratio)
 
         Sets beam to sample width ratio in footprint factor. 
@@ -4474,11 +3623,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_setWidthRatio(self, width_ratio)
 
-
     def setPolarization(self, bloch_vector):
-        """
+        r"""
         setPolarization(Beam self, kvector_t bloch_vector)
-
         void Beam::setPolarization(const kvector_t bloch_vector)
 
         Sets the polarization density matrix according to the given Bloch vector. 
@@ -4486,51 +3633,41 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_setPolarization(self, bloch_vector)
 
-
     def getBlochVector(self):
-        """
+        r"""
         getBlochVector(Beam self) -> kvector_t
-
         kvector_t Beam::getBlochVector() const
 
         """
         return _libBornAgainCore.Beam_getBlochVector(self)
 
-
     def getWavelength(self):
-        """
+        r"""
         getWavelength(Beam self) -> double
-
         double Beam::getWavelength() const
 
         """
         return _libBornAgainCore.Beam_getWavelength(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(Beam self) -> double
-
         double Beam::getAlpha() const
 
         """
         return _libBornAgainCore.Beam_getAlpha(self)
 
-
     def getPhi(self):
-        """
+        r"""
         getPhi(Beam self) -> double
-
         double Beam::getPhi() const
 
         """
         return _libBornAgainCore.Beam_getPhi(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(Beam self, INodeVisitor visitor)
-
         void Beam::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -4538,11 +3675,9 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_accept(self, visitor)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Beam self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Beam::getChildren() const override
 
         Returns a vector of children (const). 
@@ -4550,77 +3685,58 @@ class Beam(INode):
         """
         return _libBornAgainCore.Beam_getChildren(self)
 
-Beam_swigregister = _libBornAgainCore.Beam_swigregister
-Beam_swigregister(Beam)
+# Register Beam in _libBornAgainCore:
+_libBornAgainCore.Beam_swigregister(Beam)
 
-class Bin1D(_object):
-    """Proxy of C++ Bin1D class."""
+class Bin1D(object):
+    r"""Proxy of C++ Bin1D class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Bin1D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Bin1D self) -> Bin1D
         __init__(Bin1D self, double lower, double upper) -> Bin1D
-
         Bin1D::Bin1D(double lower, double upper)
 
         """
-        this = _libBornAgainCore.new_Bin1D(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_set
-    __swig_getmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_get
-    if _newclass:
-        m_lower = _swig_property(_libBornAgainCore.Bin1D_m_lower_get, _libBornAgainCore.Bin1D_m_lower_set)
-    __swig_setmethods__["m_upper"] = _libBornAgainCore.Bin1D_m_upper_set
-    __swig_getmethods__["m_upper"] = _libBornAgainCore.Bin1D_m_upper_get
-    if _newclass:
-        m_upper = _swig_property(_libBornAgainCore.Bin1D_m_upper_get, _libBornAgainCore.Bin1D_m_upper_set)
+        _libBornAgainCore.Bin1D_swiginit(self, _libBornAgainCore.new_Bin1D(*args))
+    m_lower = property(_libBornAgainCore.Bin1D_m_lower_get, _libBornAgainCore.Bin1D_m_lower_set, doc=r"""m_lower : double""")
+    m_upper = property(_libBornAgainCore.Bin1D_m_upper_get, _libBornAgainCore.Bin1D_m_upper_set, doc=r"""m_upper : double""")
 
     def getMidPoint(self):
-        """
+        r"""
         getMidPoint(Bin1D self) -> double
-
         double Bin1D::getMidPoint() const
 
         """
         return _libBornAgainCore.Bin1D_getMidPoint(self)
 
-
     def getBinSize(self):
-        """
+        r"""
         getBinSize(Bin1D self) -> double
-
         double Bin1D::getBinSize() const
 
         """
         return _libBornAgainCore.Bin1D_getBinSize(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_Bin1D
-    __del__ = lambda self: None
-Bin1D_swigregister = _libBornAgainCore.Bin1D_swigregister
-Bin1D_swigregister(Bin1D)
+
+# Register Bin1D in _libBornAgainCore:
+_libBornAgainCore.Bin1D_swigregister(Bin1D)
 
 
 def BinContains(bin, value):
-    """
+    r"""
     BinContains(Bin1D bin, double value) -> bool
-
     bool BinContains(const Bin1D &bin, double value)
 
     Checks if value is contained in bin: value in [m_lower, m_upper) 
 
     """
     return _libBornAgainCore.BinContains(bin, value)
-class Bin1DKVector(_object):
-    """
+class Bin1DKVector(object):
+    r"""
 
 
     An one-dimensional range of kvector_t's.
@@ -4629,63 +3745,45 @@ class Bin1DKVector(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1DKVector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Bin1DKVector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Bin1DKVector self) -> Bin1DKVector
         __init__(Bin1DKVector self, kvector_t lower, kvector_t upper) -> Bin1DKVector
         __init__(Bin1DKVector self, double wavelength, Bin1D alpha_bin, Bin1D phi_bin) -> Bin1DKVector
-
         Bin1DKVector::Bin1DKVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin)
 
         creation on  Bin1DKVector from alpha and phi bins 
 
         """
-        this = _libBornAgainCore.new_Bin1DKVector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Bin1DKVector_swiginit(self, _libBornAgainCore.new_Bin1DKVector(*args))
 
     def getMidPoint(self):
-        """
+        r"""
         getMidPoint(Bin1DKVector self) -> kvector_t
-
         kvector_t Bin1DKVector::getMidPoint() const
 
         """
         return _libBornAgainCore.Bin1DKVector_getMidPoint(self)
 
-
     def getDelta(self):
-        """
+        r"""
         getDelta(Bin1DKVector self) -> kvector_t
-
         kvector_t Bin1DKVector::getDelta() const
 
         """
         return _libBornAgainCore.Bin1DKVector_getDelta(self)
-
-    __swig_setmethods__["m_q_lower"] = _libBornAgainCore.Bin1DKVector_m_q_lower_set
-    __swig_getmethods__["m_q_lower"] = _libBornAgainCore.Bin1DKVector_m_q_lower_get
-    if _newclass:
-        m_q_lower = _swig_property(_libBornAgainCore.Bin1DKVector_m_q_lower_get, _libBornAgainCore.Bin1DKVector_m_q_lower_set)
-    __swig_setmethods__["m_q_upper"] = _libBornAgainCore.Bin1DKVector_m_q_upper_set
-    __swig_getmethods__["m_q_upper"] = _libBornAgainCore.Bin1DKVector_m_q_upper_get
-    if _newclass:
-        m_q_upper = _swig_property(_libBornAgainCore.Bin1DKVector_m_q_upper_get, _libBornAgainCore.Bin1DKVector_m_q_upper_set)
+    m_q_lower = property(_libBornAgainCore.Bin1DKVector_m_q_lower_get, _libBornAgainCore.Bin1DKVector_m_q_lower_set, doc=r"""m_q_lower : kvector_t""")
+    m_q_upper = property(_libBornAgainCore.Bin1DKVector_m_q_upper_get, _libBornAgainCore.Bin1DKVector_m_q_upper_set, doc=r"""m_q_upper : kvector_t""")
     __swig_destroy__ = _libBornAgainCore.delete_Bin1DKVector
-    __del__ = lambda self: None
-Bin1DKVector_swigregister = _libBornAgainCore.Bin1DKVector_swigregister
-Bin1DKVector_swigregister(Bin1DKVector)
 
-class Bin1DCVector(_object):
-    """
+# Register Bin1DKVector in _libBornAgainCore:
+_libBornAgainCore.Bin1DKVector_swigregister(Bin1DKVector)
+
+class Bin1DCVector(object):
+    r"""
 
 
     An one-dimensional range of cvector_t's.
@@ -4694,63 +3792,45 @@ class Bin1DCVector(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1DCVector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Bin1DCVector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Bin1DCVector self) -> Bin1DCVector
         __init__(Bin1DCVector self, cvector_t lower, cvector_t upper) -> Bin1DCVector
         __init__(Bin1DCVector self, double wavelength, Bin1D alpha_bin, Bin1D phi_bin) -> Bin1DCVector
-
         Bin1DCVector::Bin1DCVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin)
 
         creation on  Bin1DCVector from alpha and phi bins 
 
         """
-        this = _libBornAgainCore.new_Bin1DCVector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Bin1DCVector_swiginit(self, _libBornAgainCore.new_Bin1DCVector(*args))
 
     def getMidPoint(self):
-        """
+        r"""
         getMidPoint(Bin1DCVector self) -> cvector_t
-
         cvector_t Bin1DCVector::getMidPoint() const
 
         """
         return _libBornAgainCore.Bin1DCVector_getMidPoint(self)
 
-
     def getDelta(self):
-        """
+        r"""
         getDelta(Bin1DCVector self) -> cvector_t
-
         cvector_t Bin1DCVector::getDelta() const
 
         """
         return _libBornAgainCore.Bin1DCVector_getDelta(self)
-
-    __swig_setmethods__["m_q_lower"] = _libBornAgainCore.Bin1DCVector_m_q_lower_set
-    __swig_getmethods__["m_q_lower"] = _libBornAgainCore.Bin1DCVector_m_q_lower_get
-    if _newclass:
-        m_q_lower = _swig_property(_libBornAgainCore.Bin1DCVector_m_q_lower_get, _libBornAgainCore.Bin1DCVector_m_q_lower_set)
-    __swig_setmethods__["m_q_upper"] = _libBornAgainCore.Bin1DCVector_m_q_upper_set
-    __swig_getmethods__["m_q_upper"] = _libBornAgainCore.Bin1DCVector_m_q_upper_get
-    if _newclass:
-        m_q_upper = _swig_property(_libBornAgainCore.Bin1DCVector_m_q_upper_get, _libBornAgainCore.Bin1DCVector_m_q_upper_set)
+    m_q_lower = property(_libBornAgainCore.Bin1DCVector_m_q_lower_get, _libBornAgainCore.Bin1DCVector_m_q_lower_set, doc=r"""m_q_lower : cvector_t""")
+    m_q_upper = property(_libBornAgainCore.Bin1DCVector_m_q_upper_get, _libBornAgainCore.Bin1DCVector_m_q_upper_set, doc=r"""m_q_upper : cvector_t""")
     __swig_destroy__ = _libBornAgainCore.delete_Bin1DCVector
-    __del__ = lambda self: None
-Bin1DCVector_swigregister = _libBornAgainCore.Bin1DCVector_swigregister
-Bin1DCVector_swigregister(Bin1DCVector)
 
-class IAxis(_object):
-    """
+# Register Bin1DCVector in _libBornAgainCore:
+_libBornAgainCore.Bin1DCVector_swigregister(Bin1DCVector)
+
+class IAxis(object):
+    r"""
 
 
     Interface for one-dimensional axes.
@@ -4759,33 +3839,26 @@ class IAxis(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IAxis, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IAxis, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IAxis self) -> IAxis
-
         virtual IAxis* IAxis::clone() const =0
 
         clone function 
 
         """
         return _libBornAgainCore.IAxis_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IAxis
-    __del__ = lambda self: None
 
     def size(self):
-        """
+        r"""
         size(IAxis self) -> size_t
-
         virtual size_t IAxis::size() const =0
 
         retrieve the number of bins 
@@ -4793,11 +3866,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_size(self)
 
-
     def getName(self):
-        """
+        r"""
         getName(IAxis self) -> std::string
-
         std::string IAxis::getName() const
 
         retrieve the label of the axis 
@@ -4805,11 +3876,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_getName(self)
 
-
     def setName(self, name):
-        """
+        r"""
         setName(IAxis self, std::string name)
-
         void IAxis::setName(std::string name)
 
         Sets the axis label. 
@@ -4817,11 +3886,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_setName(self, name)
 
-
     def getBin(self, index):
-        """
+        r"""
         getBin(IAxis self, size_t index) -> Bin1D
-
         virtual Bin1D IAxis::getBin(size_t index) const =0
 
         retrieve a 1d bin for the given index 
@@ -4829,11 +3896,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_getBin(self, index)
 
-
     def getMin(self):
-        """
+        r"""
         getMin(IAxis self) -> double
-
         virtual double IAxis::getMin() const =0
 
         Returns value of first point of axis. 
@@ -4841,11 +3906,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_getMin(self)
 
-
     def getMax(self):
-        """
+        r"""
         getMax(IAxis self) -> double
-
         virtual double IAxis::getMax() const =0
 
         Returns value of last point of axis. 
@@ -4853,21 +3916,17 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_getMax(self)
 
-
     def getBinCenter(self, index):
-        """
+        r"""
         getBinCenter(IAxis self, size_t index) -> double
-
         virtual double IAxis::getBinCenter(size_t index) const =0
 
         """
         return _libBornAgainCore.IAxis_getBinCenter(self, index)
 
-
     def findClosestIndex(self, value):
-        """
+        r"""
         findClosestIndex(IAxis self, double value) -> size_t
-
         virtual size_t IAxis::findClosestIndex(double value) const =0
 
         find bin index which is best match for given value 
@@ -4875,41 +3934,33 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_findClosestIndex(self, value)
 
-
     def __eq__(self, right):
-        """__eq__(IAxis self, IAxis right) -> bool"""
+        r"""__eq__(IAxis self, IAxis right) -> bool"""
         return _libBornAgainCore.IAxis___eq__(self, right)
 
-
     def __ne__(self, right):
-        """__ne__(IAxis self, IAxis right) -> bool"""
+        r"""__ne__(IAxis self, IAxis right) -> bool"""
         return _libBornAgainCore.IAxis___ne__(self, right)
 
-
     def getBinCenters(self):
-        """
+        r"""
         getBinCenters(IAxis self) -> vdouble1d_t
-
         std::vector< double > IAxis::getBinCenters() const
 
         """
         return _libBornAgainCore.IAxis_getBinCenters(self)
 
-
     def getBinBoundaries(self):
-        """
+        r"""
         getBinBoundaries(IAxis self) -> vdouble1d_t
-
         std::vector< double > IAxis::getBinBoundaries() const
 
         """
         return _libBornAgainCore.IAxis_getBinBoundaries(self)
 
-
     def createClippedAxis(self, left, right):
-        """
+        r"""
         createClippedAxis(IAxis self, double left, double right) -> IAxis
-
         IAxis * IAxis::createClippedAxis(double left, double right) const
 
         Creates a new clipped axis. 
@@ -4917,11 +3968,9 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_createClippedAxis(self, left, right)
 
-
     def contains(self, value):
-        """
+        r"""
         contains(IAxis self, double value) -> bool
-
         bool IAxis::contains(double value) const
 
         Returns true if axis contains given point. 
@@ -4929,14 +3978,13 @@ class IAxis(_object):
         """
         return _libBornAgainCore.IAxis_contains(self, value)
 
-IAxis_swigregister = _libBornAgainCore.IAxis_swigregister
-IAxis_swigregister(IAxis)
+# Register IAxis in _libBornAgainCore:
+_libBornAgainCore.IAxis_swigregister(IAxis)
 
 
 def HaveSameNameAndShape(left, right):
-    """
+    r"""
     HaveSameNameAndShape(IAxis left, IAxis right) -> bool
-
     bool HaveSameNameAndShape(const IAxis &left, const IAxis &right)
 
     global helper function for comparison of axes 
@@ -4944,7 +3992,7 @@ def HaveSameNameAndShape(left, right):
     """
     return _libBornAgainCore.HaveSameNameAndShape(left, right)
 class VariableBinAxis(IAxis):
-    """
+    r"""
 
 
     Axis with variable bin size.
@@ -4953,20 +4001,12 @@ class VariableBinAxis(IAxis):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IAxis]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VariableBinAxis, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IAxis]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VariableBinAxis, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, name, nbins, bin_boundaries):
-        """
+        r"""
         __init__(VariableBinAxis self, std::string const & name, size_t nbins, vdouble1d_t bin_boundaries) -> VariableBinAxis
-
         VariableBinAxis::VariableBinAxis(const std::string &name, size_t nbins, const std::vector< double > &bin_boundaries)
 
         VariableBinAxis constructor.
@@ -4984,18 +4024,12 @@ class VariableBinAxis(IAxis):
         Array of size nbins+1 containing low-edges for each bin and upper edge of last bin. 
 
         """
-        this = _libBornAgainCore.new_VariableBinAxis(name, nbins, bin_boundaries)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VariableBinAxis_swiginit(self, _libBornAgainCore.new_VariableBinAxis(name, nbins, bin_boundaries))
     __swig_destroy__ = _libBornAgainCore.delete_VariableBinAxis
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(VariableBinAxis self) -> VariableBinAxis
-
         VariableBinAxis * VariableBinAxis::clone() const
 
         clone function 
@@ -5003,11 +4037,9 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_clone(self)
 
-
     def size(self):
-        """
+        r"""
         size(VariableBinAxis self) -> size_t
-
         size_t VariableBinAxis::size() const
 
         retrieve the number of bins 
@@ -5015,11 +4047,9 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_size(self)
 
-
     def getBin(self, index):
-        """
+        r"""
         getBin(VariableBinAxis self, size_t index) -> Bin1D
-
         Bin1D VariableBinAxis::getBin(size_t index) const
 
         retrieve a 1d bin for the given index 
@@ -5027,11 +4057,9 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_getBin(self, index)
 
-
     def getMin(self):
-        """
+        r"""
         getMin(VariableBinAxis self) -> double
-
         double VariableBinAxis::getMin() const
 
         Returns value of first point of axis. 
@@ -5039,11 +4067,9 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_getMin(self)
 
-
     def getMax(self):
-        """
+        r"""
         getMax(VariableBinAxis self) -> double
-
         double VariableBinAxis::getMax() const
 
         Returns value of last point of axis. 
@@ -5051,21 +4077,17 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_getMax(self)
 
-
     def getBinCenter(self, index):
-        """
+        r"""
         getBinCenter(VariableBinAxis self, size_t index) -> double
-
         double VariableBinAxis::getBinCenter(size_t index) const
 
         """
         return _libBornAgainCore.VariableBinAxis_getBinCenter(self, index)
 
-
     def findClosestIndex(self, value):
-        """
+        r"""
         findClosestIndex(VariableBinAxis self, double value) -> size_t
-
         size_t VariableBinAxis::findClosestIndex(double value) const
 
         find bin index which is best match for given value 
@@ -5073,31 +4095,25 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_findClosestIndex(self, value)
 
-
     def getBinCenters(self):
-        """
+        r"""
         getBinCenters(VariableBinAxis self) -> vdouble1d_t
-
         std::vector< double > VariableBinAxis::getBinCenters() const
 
         """
         return _libBornAgainCore.VariableBinAxis_getBinCenters(self)
 
-
     def getBinBoundaries(self):
-        """
+        r"""
         getBinBoundaries(VariableBinAxis self) -> vdouble1d_t
-
         std::vector<double> VariableBinAxis::getBinBoundaries() const
 
         """
         return _libBornAgainCore.VariableBinAxis_getBinBoundaries(self)
 
-
     def createClippedAxis(self, left, right):
-        """
+        r"""
         createClippedAxis(VariableBinAxis self, double left, double right) -> VariableBinAxis
-
         VariableBinAxis * VariableBinAxis::createClippedAxis(double left, double right) const
 
         Creates a new clipped axis. 
@@ -5105,16 +4121,15 @@ class VariableBinAxis(IAxis):
         """
         return _libBornAgainCore.VariableBinAxis_createClippedAxis(self, left, right)
 
-
     def __getitem__(self, i):
-        """__getitem__(VariableBinAxis self, unsigned int i) -> double"""
+        r"""__getitem__(VariableBinAxis self, unsigned int i) -> double"""
         return _libBornAgainCore.VariableBinAxis___getitem__(self, i)
 
-VariableBinAxis_swigregister = _libBornAgainCore.VariableBinAxis_swigregister
-VariableBinAxis_swigregister(VariableBinAxis)
+# Register VariableBinAxis in _libBornAgainCore:
+_libBornAgainCore.VariableBinAxis_swigregister(VariableBinAxis)
 
 class ConstKBinAxis(VariableBinAxis):
-    """
+    r"""
 
 
     Axis with fixed bin size in sin(angle) space.
@@ -5123,20 +4138,12 @@ class ConstKBinAxis(VariableBinAxis):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [VariableBinAxis]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstKBinAxis, name, value)
-    __swig_getmethods__ = {}
-    for _s in [VariableBinAxis]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstKBinAxis, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, name, nbins, start, end):
-        """
+        r"""
         __init__(ConstKBinAxis self, std::string const & name, size_t nbins, double start, double end) -> ConstKBinAxis
-
         ConstKBinAxis::ConstKBinAxis(const std::string &name, size_t nbins, double start, double end)
 
         ConstKBinAxis constructor.
@@ -5157,18 +4164,12 @@ class ConstKBinAxis(VariableBinAxis):
         upper edge of last bin 
 
         """
-        this = _libBornAgainCore.new_ConstKBinAxis(name, nbins, start, end)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ConstKBinAxis_swiginit(self, _libBornAgainCore.new_ConstKBinAxis(name, nbins, start, end))
     __swig_destroy__ = _libBornAgainCore.delete_ConstKBinAxis
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ConstKBinAxis self) -> ConstKBinAxis
-
         ConstKBinAxis * ConstKBinAxis::clone() const final
 
         clone function 
@@ -5176,11 +4177,9 @@ class ConstKBinAxis(VariableBinAxis):
         """
         return _libBornAgainCore.ConstKBinAxis_clone(self)
 
-
     def createClippedAxis(self, left, right):
-        """
+        r"""
         createClippedAxis(ConstKBinAxis self, double left, double right) -> ConstKBinAxis
-
         ConstKBinAxis * ConstKBinAxis::createClippedAxis(double left, double right) const final
 
         Creates a new clipped axis. 
@@ -5188,11 +4187,11 @@ class ConstKBinAxis(VariableBinAxis):
         """
         return _libBornAgainCore.ConstKBinAxis_createClippedAxis(self, left, right)
 
-ConstKBinAxis_swigregister = _libBornAgainCore.ConstKBinAxis_swigregister
-ConstKBinAxis_swigregister(ConstKBinAxis)
+# Register ConstKBinAxis in _libBornAgainCore:
+_libBornAgainCore.ConstKBinAxis_swigregister(ConstKBinAxis)
 
 class CustomBinAxis(VariableBinAxis):
-    """
+    r"""
 
 
     Axis with fixed bin size in sin(angle) space used for numerical comparison with IsGisaxs. The main feature of the axis is that it produces zero bin sizes.
@@ -5201,20 +4200,12 @@ class CustomBinAxis(VariableBinAxis):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [VariableBinAxis]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CustomBinAxis, name, value)
-    __swig_getmethods__ = {}
-    for _s in [VariableBinAxis]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CustomBinAxis, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, name, nbins, start, end):
-        """
+        r"""
         __init__(CustomBinAxis self, std::string const & name, size_t nbins, double start, double end) -> CustomBinAxis
-
         CustomBinAxis::CustomBinAxis(const std::string &name, size_t nbins, double start, double end)
 
         CustomBinAxis constructor.
@@ -5235,18 +4226,12 @@ class CustomBinAxis(VariableBinAxis):
         center of last bin (IsGisaxs convention) 
 
         """
-        this = _libBornAgainCore.new_CustomBinAxis(name, nbins, start, end)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.CustomBinAxis_swiginit(self, _libBornAgainCore.new_CustomBinAxis(name, nbins, start, end))
     __swig_destroy__ = _libBornAgainCore.delete_CustomBinAxis
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(CustomBinAxis self) -> CustomBinAxis
-
         CustomBinAxis * CustomBinAxis::clone() const
 
         clone function 
@@ -5254,11 +4239,9 @@ class CustomBinAxis(VariableBinAxis):
         """
         return _libBornAgainCore.CustomBinAxis_clone(self)
 
-
     def getBin(self, index):
-        """
+        r"""
         getBin(CustomBinAxis self, size_t index) -> Bin1D
-
         Bin1D CustomBinAxis::getBin(size_t index) const
 
         retrieve a 1d bin for the given index 
@@ -5266,21 +4249,17 @@ class CustomBinAxis(VariableBinAxis):
         """
         return _libBornAgainCore.CustomBinAxis_getBin(self, index)
 
-
     def getBinCenters(self):
-        """
+        r"""
         getBinCenters(CustomBinAxis self) -> vdouble1d_t
-
         std::vector< double > CustomBinAxis::getBinCenters() const
 
         """
         return _libBornAgainCore.CustomBinAxis_getBinCenters(self)
 
-
     def createClippedAxis(self, left, right):
-        """
+        r"""
         createClippedAxis(CustomBinAxis self, double left, double right) -> CustomBinAxis
-
         CustomBinAxis * CustomBinAxis::createClippedAxis(double left, double right) const
 
         Creates a new clipped axis. 
@@ -5288,11 +4267,11 @@ class CustomBinAxis(VariableBinAxis):
         """
         return _libBornAgainCore.CustomBinAxis_createClippedAxis(self, left, right)
 
-CustomBinAxis_swigregister = _libBornAgainCore.CustomBinAxis_swigregister
-CustomBinAxis_swigregister(CustomBinAxis)
+# Register CustomBinAxis in _libBornAgainCore:
+_libBornAgainCore.CustomBinAxis_swigregister(CustomBinAxis)
 
 class IShape2D(ICloneable, INamed):
-    """
+    r"""
 
 
     Basic class for all shapes in 2D.
@@ -5301,48 +4280,37 @@ class IShape2D(ICloneable, INamed):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INamed]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IShape2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INamed]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IShape2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IShape2D self) -> IShape2D
-
         virtual IShape2D* IShape2D::clone() const =0
 
         """
         return _libBornAgainCore.IShape2D_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(IShape2D self, double x, double y) -> bool
         contains(IShape2D self, Bin1D binx, Bin1D biny) -> bool
-
         virtual bool IShape2D::contains(const Bin1D &binx, const Bin1D &biny) const =0
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
 
         """
         return _libBornAgainCore.IShape2D_contains(self, *args)
-
     __swig_destroy__ = _libBornAgainCore.delete_IShape2D
-    __del__ = lambda self: None
-IShape2D_swigregister = _libBornAgainCore.IShape2D_swigregister
-IShape2D_swigregister(IShape2D)
+
+# Register IShape2D in _libBornAgainCore:
+_libBornAgainCore.IShape2D_swigregister(IShape2D)
 
 class ISample(ICloneable, INode):
-    """
+    r"""
 
 
     Pure virtual base class for sample components and properties related to scattering.
@@ -5351,20 +4319,12 @@ class ISample(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ISample, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ISample, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(ISample self) -> ISample
-
         ISample* ISample::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -5372,11 +4332,9 @@ class ISample(ICloneable, INode):
         """
         return _libBornAgainCore.ISample_clone(self)
 
-
     def material(self):
-        """
+        r"""
         material(ISample self) -> Material
-
         virtual const Material* ISample::material() const
 
         Returns nullptr, unless overwritten to return a specific material. 
@@ -5384,11 +4342,9 @@ class ISample(ICloneable, INode):
         """
         return _libBornAgainCore.ISample_material(self)
 
-
     def containedMaterials(self):
-        """
+        r"""
         containedMaterials(ISample self) -> std::vector< Material const *,std::allocator< Material const * > >
-
         std::vector< const Material * > ISample::containedMaterials() const
 
         Returns set of unique materials contained in this  ISample. 
@@ -5396,13 +4352,11 @@ class ISample(ICloneable, INode):
         """
         return _libBornAgainCore.ISample_containedMaterials(self)
 
-
     def __init__(self):
-        """
+        r"""
         __init__(ISample self) -> ISample
 
 
-
         Pure virtual base class for sample components and properties related to scattering.
 
         C++ includes: ISample.h
@@ -5412,22 +4366,18 @@ class ISample(ICloneable, INode):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_ISample(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ISample_swiginit(self, _libBornAgainCore.new_ISample(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_ISample
-    __del__ = lambda self: None
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_ISample(self)
-        return weakref_proxy(self)
-ISample_swigregister = _libBornAgainCore.ISample_swigregister
-ISample_swigregister(ISample)
+        return weakref.proxy(self)
+
+# Register ISample in _libBornAgainCore:
+_libBornAgainCore.ISample_swigregister(ISample)
 
 class IChiSquaredModule(ICloneable):
-    """
+    r"""
 
 
     Interface residual calculations.
@@ -5436,25 +4386,16 @@ class IChiSquaredModule(ICloneable):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IChiSquaredModule, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IChiSquaredModule, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IChiSquaredModule
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IChiSquaredModule self) -> IChiSquaredModule
-
         virtual IChiSquaredModule* IChiSquaredModule::clone() const =0
 
         clone method 
@@ -5462,11 +4403,9 @@ class IChiSquaredModule(ICloneable):
         """
         return _libBornAgainCore.IChiSquaredModule_clone(self)
 
-
     def varianceFunction(self):
-        """
+        r"""
         varianceFunction(IChiSquaredModule self) -> IVarianceFunction
-
         const IVarianceFunction * IChiSquaredModule::varianceFunction() const
 
         Returns squared function. 
@@ -5474,11 +4413,9 @@ class IChiSquaredModule(ICloneable):
         """
         return _libBornAgainCore.IChiSquaredModule_varianceFunction(self)
 
-
     def setVarianceFunction(self, variance_function):
-        """
+        r"""
         setVarianceFunction(IChiSquaredModule self, IVarianceFunction variance_function)
-
         void IChiSquaredModule::setVarianceFunction(const IVarianceFunction &variance_function)
 
         Sets squared function. 
@@ -5486,11 +4423,9 @@ class IChiSquaredModule(ICloneable):
         """
         return _libBornAgainCore.IChiSquaredModule_setVarianceFunction(self, variance_function)
 
-
     def getIntensityFunction(self):
-        """
+        r"""
         getIntensityFunction(IChiSquaredModule self) -> IIntensityFunction
-
         const IIntensityFunction * IChiSquaredModule::getIntensityFunction() const
 
         Returns data rescaler. 
@@ -5498,11 +4433,9 @@ class IChiSquaredModule(ICloneable):
         """
         return _libBornAgainCore.IChiSquaredModule_getIntensityFunction(self)
 
-
     def setIntensityFunction(self, intensity_function):
-        """
+        r"""
         setIntensityFunction(IChiSquaredModule self, IIntensityFunction intensity_function)
-
         void IChiSquaredModule::setIntensityFunction(const IIntensityFunction &intensity_function)
 
         Sets data rescaler. 
@@ -5510,21 +4443,19 @@ class IChiSquaredModule(ICloneable):
         """
         return _libBornAgainCore.IChiSquaredModule_setIntensityFunction(self, intensity_function)
 
-
     def residual(self, a, b, weight):
-        """
+        r"""
         residual(IChiSquaredModule self, double a, double b, double weight) -> double
-
         virtual double IChiSquaredModule::residual(double a, double b, double weight)=0
 
         """
         return _libBornAgainCore.IChiSquaredModule_residual(self, a, b, weight)
 
-IChiSquaredModule_swigregister = _libBornAgainCore.IChiSquaredModule_swigregister
-IChiSquaredModule_swigregister(IChiSquaredModule)
+# Register IChiSquaredModule in _libBornAgainCore:
+_libBornAgainCore.IChiSquaredModule_swigregister(IChiSquaredModule)
 
-class IObserver(_object):
-    """
+class IObserver(object):
+    r"""
 
 
     Observer interface from Observer pattern.
@@ -5533,21 +4464,16 @@ class IObserver(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IObserver, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IObserver, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IObserver
-    __del__ = lambda self: None
 
     def notify(self, subject):
-        """
+        r"""
         notify(IObserver self, IObservable subject)
-
         virtual void IObserver::notify(IObservable *subject)=0
 
         method which is used by observable subject to notify change in status 
@@ -5555,11 +4481,11 @@ class IObserver(_object):
         """
         return _libBornAgainCore.IObserver_notify(self, subject)
 
-IObserver_swigregister = _libBornAgainCore.IObserver_swigregister
-IObserver_swigregister(IObserver)
+# Register IObserver in _libBornAgainCore:
+_libBornAgainCore.IObserver_swigregister(IObserver)
 
-class IObservable(_object):
-    """
+class IObservable(object):
+    r"""
 
 
     Observable interface from Observer pattern
@@ -5568,18 +4494,13 @@ class IObservable(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IObservable, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IObservable, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IObservable
-    __del__ = lambda self: None
 
     def attachObserver(self, obj):
-        """
+        r"""
         attachObserver(IObservable self, IObservable::observer_t obj)
-
         void IObservable::attachObserver(observer_t obj)
 
         attach observer to the list of observers 
@@ -5587,11 +4508,9 @@ class IObservable(_object):
         """
         return _libBornAgainCore.IObservable_attachObserver(self, obj)
 
-
     def notifyObservers(self):
-        """
+        r"""
         notifyObservers(IObservable self)
-
         void IObservable::notifyObservers()
 
         notify observers about change in status 
@@ -5599,28 +4518,23 @@ class IObservable(_object):
         """
         return _libBornAgainCore.IObservable_notifyObservers(self)
 
-
     def __init__(self):
-        """
+        r"""
         __init__(IObservable self) -> IObservable
 
 
-
         Observable interface from Observer pattern
 
         C++ includes: IObserver.h
 
         """
-        this = _libBornAgainCore.new_IObservable()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-IObservable_swigregister = _libBornAgainCore.IObservable_swigregister
-IObservable_swigregister(IObservable)
+        _libBornAgainCore.IObservable_swiginit(self, _libBornAgainCore.new_IObservable())
 
-class IIntensityFunction(_object):
-    """
+# Register IObservable in _libBornAgainCore:
+_libBornAgainCore.IObservable_swigregister(IObservable)
+
+class IIntensityFunction(object):
+    r"""
 
 
     Interface for applying arbitrary function to the measured intensity.
@@ -5629,41 +4543,34 @@ class IIntensityFunction(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IIntensityFunction, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IIntensityFunction, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IIntensityFunction
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IIntensityFunction self) -> IIntensityFunction
-
         virtual IIntensityFunction* IIntensityFunction::clone() const =0
 
         """
         return _libBornAgainCore.IIntensityFunction_clone(self)
 
-
     def evaluate(self, value):
-        """
+        r"""
         evaluate(IIntensityFunction self, double value) -> double
-
         virtual double IIntensityFunction::evaluate(double value) const =0
 
         """
         return _libBornAgainCore.IIntensityFunction_evaluate(self, value)
 
-IIntensityFunction_swigregister = _libBornAgainCore.IIntensityFunction_swigregister
-IIntensityFunction_swigregister(IIntensityFunction)
+# Register IIntensityFunction in _libBornAgainCore:
+_libBornAgainCore.IIntensityFunction_swigregister(IIntensityFunction)
 
 class IntensityFunctionLog(IIntensityFunction):
-    """
+    r"""
 
 
     Algorithm for applying log function to the measured intensity.
@@ -5672,59 +4579,43 @@ class IntensityFunctionLog(IIntensityFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IIntensityFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityFunctionLog, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IIntensityFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityFunctionLog, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IntensityFunctionLog self) -> IntensityFunctionLog
-
         IntensityFunctionLog * IntensityFunctionLog::clone() const
 
         """
         return _libBornAgainCore.IntensityFunctionLog_clone(self)
 
-
     def evaluate(self, value):
-        """
+        r"""
         evaluate(IntensityFunctionLog self, double value) -> double
-
         double IntensityFunctionLog::evaluate(double value) const
 
         """
         return _libBornAgainCore.IntensityFunctionLog_evaluate(self, value)
 
-
     def __init__(self):
-        """
+        r"""
         __init__(IntensityFunctionLog self) -> IntensityFunctionLog
 
 
-
         Algorithm for applying log function to the measured intensity.
 
         C++ includes: IIntensityFunction.h
 
         """
-        this = _libBornAgainCore.new_IntensityFunctionLog()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityFunctionLog_swiginit(self, _libBornAgainCore.new_IntensityFunctionLog())
     __swig_destroy__ = _libBornAgainCore.delete_IntensityFunctionLog
-    __del__ = lambda self: None
-IntensityFunctionLog_swigregister = _libBornAgainCore.IntensityFunctionLog_swigregister
-IntensityFunctionLog_swigregister(IntensityFunctionLog)
+
+# Register IntensityFunctionLog in _libBornAgainCore:
+_libBornAgainCore.IntensityFunctionLog_swigregister(IntensityFunctionLog)
 
 class IntensityFunctionSqrt(IIntensityFunction):
-    """
+    r"""
 
 
     Algorithm for applying sqrt function to the measured intensity.
@@ -5733,59 +4624,43 @@ class IntensityFunctionSqrt(IIntensityFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IIntensityFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityFunctionSqrt, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IIntensityFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityFunctionSqrt, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IntensityFunctionSqrt self) -> IntensityFunctionSqrt
-
         IntensityFunctionSqrt * IntensityFunctionSqrt::clone() const
 
         """
         return _libBornAgainCore.IntensityFunctionSqrt_clone(self)
 
-
     def evaluate(self, value):
-        """
+        r"""
         evaluate(IntensityFunctionSqrt self, double value) -> double
-
         double IntensityFunctionSqrt::evaluate(double value) const
 
         """
         return _libBornAgainCore.IntensityFunctionSqrt_evaluate(self, value)
 
-
     def __init__(self):
-        """
+        r"""
         __init__(IntensityFunctionSqrt self) -> IntensityFunctionSqrt
 
 
-
         Algorithm for applying sqrt function to the measured intensity.
 
         C++ includes: IIntensityFunction.h
 
         """
-        this = _libBornAgainCore.new_IntensityFunctionSqrt()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityFunctionSqrt_swiginit(self, _libBornAgainCore.new_IntensityFunctionSqrt())
     __swig_destroy__ = _libBornAgainCore.delete_IntensityFunctionSqrt
-    __del__ = lambda self: None
-IntensityFunctionSqrt_swigregister = _libBornAgainCore.IntensityFunctionSqrt_swigregister
-IntensityFunctionSqrt_swigregister(IntensityFunctionSqrt)
+
+# Register IntensityFunctionSqrt in _libBornAgainCore:
+_libBornAgainCore.IntensityFunctionSqrt_swigregister(IntensityFunctionSqrt)
 
 class IIntensityNormalizer(ICloneable, INode):
-    """
+    r"""
 
 
     Interface to  OutputData normalizers.
@@ -5794,65 +4669,50 @@ class IIntensityNormalizer(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IIntensityNormalizer, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IIntensityNormalizer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IIntensityNormalizer
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IIntensityNormalizer self) -> IIntensityNormalizer
-
         virtual IIntensityNormalizer* IIntensityNormalizer::clone() const =0
 
         """
         return _libBornAgainCore.IIntensityNormalizer_clone(self)
 
-
     def createNormalizedData(self, data):
-        """
+        r"""
         createNormalizedData(IIntensityNormalizer self, IntensityData data) -> IntensityData
-
         virtual OutputData<double>* IIntensityNormalizer::createNormalizedData(const OutputData< double > &data) const =0
 
         """
         return _libBornAgainCore.IIntensityNormalizer_createNormalizedData(self, data)
 
-
     def apply(self, data):
-        """
+        r"""
         apply(IIntensityNormalizer self, IntensityData data)
-
         virtual void IIntensityNormalizer::apply(OutputData< double > &data) const =0
 
         """
         return _libBornAgainCore.IIntensityNormalizer_apply(self, data)
 
-
     def setMaximumIntensity(self, arg2):
-        """
+        r"""
         setMaximumIntensity(IIntensityNormalizer self, double arg2)
-
         virtual void IIntensityNormalizer::setMaximumIntensity(double)=0
 
         """
         return _libBornAgainCore.IIntensityNormalizer_setMaximumIntensity(self, arg2)
 
-IIntensityNormalizer_swigregister = _libBornAgainCore.IIntensityNormalizer_swigregister
-IIntensityNormalizer_swigregister(IIntensityNormalizer)
+# Register IIntensityNormalizer in _libBornAgainCore:
+_libBornAgainCore.IIntensityNormalizer_swigregister(IIntensityNormalizer)
 
 class IntensityNormalizer(IIntensityNormalizer):
-    """
+    r"""
 
 
     Standard  OutputData normalizer, with configurable max_intensity.
@@ -5861,47 +4721,29 @@ class IntensityNormalizer(IIntensityNormalizer):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IIntensityNormalizer]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityNormalizer, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IIntensityNormalizer]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityNormalizer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, scale=1.0, shift=0.0):
-        """
+        r"""
         __init__(IntensityNormalizer self, double scale=1.0, double shift=0.0) -> IntensityNormalizer
-        __init__(IntensityNormalizer self, double scale=1.0) -> IntensityNormalizer
-        __init__(IntensityNormalizer self) -> IntensityNormalizer
-
         IntensityNormalizer::IntensityNormalizer(double scale=1.0, double shift=0.0)
 
         """
-        this = _libBornAgainCore.new_IntensityNormalizer(scale, shift)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityNormalizer_swiginit(self, _libBornAgainCore.new_IntensityNormalizer(scale, shift))
     __swig_destroy__ = _libBornAgainCore.delete_IntensityNormalizer
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IntensityNormalizer self) -> IntensityNormalizer
-
         IntensityNormalizer * IntensityNormalizer::clone() const
 
         """
         return _libBornAgainCore.IntensityNormalizer_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IntensityNormalizer self, INodeVisitor visitor)
-
         void IntensityNormalizer::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -5909,41 +4751,35 @@ class IntensityNormalizer(IIntensityNormalizer):
         """
         return _libBornAgainCore.IntensityNormalizer_accept(self, visitor)
 
-
     def createNormalizedData(self, data):
-        """
+        r"""
         createNormalizedData(IntensityNormalizer self, IntensityData data) -> IntensityData
-
         OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const
 
         """
         return _libBornAgainCore.IntensityNormalizer_createNormalizedData(self, data)
 
-
     def apply(self, data):
-        """
+        r"""
         apply(IntensityNormalizer self, IntensityData data)
-
         void IntensityNormalizer::apply(OutputData< double > &data) const final
 
         """
         return _libBornAgainCore.IntensityNormalizer_apply(self, data)
 
-
     def setMaximumIntensity(self, max_intensity):
-        """
+        r"""
         setMaximumIntensity(IntensityNormalizer self, double max_intensity)
-
         virtual void IntensityNormalizer::setMaximumIntensity(double max_intensity)
 
         """
         return _libBornAgainCore.IntensityNormalizer_setMaximumIntensity(self, max_intensity)
 
-IntensityNormalizer_swigregister = _libBornAgainCore.IntensityNormalizer_swigregister
-IntensityNormalizer_swigregister(IntensityNormalizer)
+# Register IntensityNormalizer in _libBornAgainCore:
+_libBornAgainCore.IntensityNormalizer_swigregister(IntensityNormalizer)
 
 class IntensityScaleAndShiftNormalizer(IntensityNormalizer):
-    """
+    r"""
 
 
     Simplified  OutputData normalizer, with max_intensity=1.
@@ -5952,37 +4788,21 @@ class IntensityScaleAndShiftNormalizer(IntensityNormalizer):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IntensityNormalizer]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityScaleAndShiftNormalizer, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IntensityNormalizer]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityScaleAndShiftNormalizer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, scale=1.0, shift=0.0):
-        """
+        r"""
         __init__(IntensityScaleAndShiftNormalizer self, double scale=1.0, double shift=0.0) -> IntensityScaleAndShiftNormalizer
-        __init__(IntensityScaleAndShiftNormalizer self, double scale=1.0) -> IntensityScaleAndShiftNormalizer
-        __init__(IntensityScaleAndShiftNormalizer self) -> IntensityScaleAndShiftNormalizer
-
         IntensityScaleAndShiftNormalizer::IntensityScaleAndShiftNormalizer(double scale=1.0, double shift=0.0)
 
         """
-        this = _libBornAgainCore.new_IntensityScaleAndShiftNormalizer(scale, shift)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityScaleAndShiftNormalizer_swiginit(self, _libBornAgainCore.new_IntensityScaleAndShiftNormalizer(scale, shift))
     __swig_destroy__ = _libBornAgainCore.delete_IntensityScaleAndShiftNormalizer
-    __del__ = lambda self: None
 
     def accept(self, visitor):
-        """
+        r"""
         accept(IntensityScaleAndShiftNormalizer self, INodeVisitor visitor)
-
         void IntensityScaleAndShiftNormalizer::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -5990,31 +4810,27 @@ class IntensityScaleAndShiftNormalizer(IntensityNormalizer):
         """
         return _libBornAgainCore.IntensityScaleAndShiftNormalizer_accept(self, visitor)
 
-
     def setMaximumIntensity(self, arg2):
-        """
+        r"""
         setMaximumIntensity(IntensityScaleAndShiftNormalizer self, double arg2)
-
         void IntensityScaleAndShiftNormalizer::setMaximumIntensity(double) final
 
         """
         return _libBornAgainCore.IntensityScaleAndShiftNormalizer_setMaximumIntensity(self, arg2)
 
-
     def clone(self):
-        """
+        r"""
         clone(IntensityScaleAndShiftNormalizer self) -> IntensityScaleAndShiftNormalizer
-
         IntensityScaleAndShiftNormalizer* IntensityScaleAndShiftNormalizer::clone() const final
 
         """
         return _libBornAgainCore.IntensityScaleAndShiftNormalizer_clone(self)
 
-IntensityScaleAndShiftNormalizer_swigregister = _libBornAgainCore.IntensityScaleAndShiftNormalizer_swigregister
-IntensityScaleAndShiftNormalizer_swigregister(IntensityScaleAndShiftNormalizer)
+# Register IntensityScaleAndShiftNormalizer in _libBornAgainCore:
+_libBornAgainCore.IntensityScaleAndShiftNormalizer_swigregister(IntensityScaleAndShiftNormalizer)
 
-class IVarianceFunction(_object):
-    """
+class IVarianceFunction(object):
+    r"""
 
 
     Variance function interface.
@@ -6023,41 +4839,34 @@ class IVarianceFunction(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IVarianceFunction, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IVarianceFunction, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IVarianceFunction
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IVarianceFunction self) -> IVarianceFunction
-
         virtual IVarianceFunction* IVarianceFunction::clone() const =0
 
         """
         return _libBornAgainCore.IVarianceFunction_clone(self)
 
-
     def variance(self, real_value, simulated_value):
-        """
+        r"""
         variance(IVarianceFunction self, double real_value, double simulated_value) -> double
-
         virtual double IVarianceFunction::variance(double real_value, double simulated_value) const =0
 
         """
         return _libBornAgainCore.IVarianceFunction_variance(self, real_value, simulated_value)
 
-IVarianceFunction_swigregister = _libBornAgainCore.IVarianceFunction_swigregister
-IVarianceFunction_swigregister(IVarianceFunction)
+# Register IVarianceFunction in _libBornAgainCore:
+_libBornAgainCore.IVarianceFunction_swigregister(IVarianceFunction)
 
 class VarianceConstantFunction(IVarianceFunction):
-    """
+    r"""
 
 
     Returns 1.0 as variance value
@@ -6066,59 +4875,43 @@ class VarianceConstantFunction(IVarianceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IVarianceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VarianceConstantFunction, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IVarianceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VarianceConstantFunction, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(VarianceConstantFunction self) -> VarianceConstantFunction
-
         VarianceConstantFunction * VarianceConstantFunction::clone() const override
 
         """
         return _libBornAgainCore.VarianceConstantFunction_clone(self)
 
-
     def variance(self, arg2, arg3):
-        """
+        r"""
         variance(VarianceConstantFunction self, double arg2, double arg3) -> double
-
         double VarianceConstantFunction::variance(double, double) const override
 
         """
         return _libBornAgainCore.VarianceConstantFunction_variance(self, arg2, arg3)
 
-
     def __init__(self):
-        """
+        r"""
         __init__(VarianceConstantFunction self) -> VarianceConstantFunction
 
 
-
         Returns 1.0 as variance value
 
         C++ includes: VarianceFunctions.h
 
         """
-        this = _libBornAgainCore.new_VarianceConstantFunction()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VarianceConstantFunction_swiginit(self, _libBornAgainCore.new_VarianceConstantFunction())
     __swig_destroy__ = _libBornAgainCore.delete_VarianceConstantFunction
-    __del__ = lambda self: None
-VarianceConstantFunction_swigregister = _libBornAgainCore.VarianceConstantFunction_swigregister
-VarianceConstantFunction_swigregister(VarianceConstantFunction)
+
+# Register VarianceConstantFunction in _libBornAgainCore:
+_libBornAgainCore.VarianceConstantFunction_swigregister(VarianceConstantFunction)
 
 class VarianceSimFunction(IVarianceFunction):
-    """
+    r"""
 
 
     Returns max(sim, epsilon)
@@ -6127,56 +4920,39 @@ class VarianceSimFunction(IVarianceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IVarianceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VarianceSimFunction, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IVarianceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VarianceSimFunction, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, epsilon=1.0):
-        """
+        r"""
         __init__(VarianceSimFunction self, double epsilon=1.0) -> VarianceSimFunction
-        __init__(VarianceSimFunction self) -> VarianceSimFunction
-
         VarianceSimFunction::VarianceSimFunction(double epsilon=1.0)
 
         """
-        this = _libBornAgainCore.new_VarianceSimFunction(epsilon)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VarianceSimFunction_swiginit(self, _libBornAgainCore.new_VarianceSimFunction(epsilon))
 
     def clone(self):
-        """
+        r"""
         clone(VarianceSimFunction self) -> VarianceSimFunction
-
         VarianceSimFunction * VarianceSimFunction::clone() const override
 
         """
         return _libBornAgainCore.VarianceSimFunction_clone(self)
 
-
     def variance(self, exp, sim):
-        """
+        r"""
         variance(VarianceSimFunction self, double exp, double sim) -> double
-
         double VarianceSimFunction::variance(double exp, double sim) const override
 
         """
         return _libBornAgainCore.VarianceSimFunction_variance(self, exp, sim)
-
     __swig_destroy__ = _libBornAgainCore.delete_VarianceSimFunction
-    __del__ = lambda self: None
-VarianceSimFunction_swigregister = _libBornAgainCore.VarianceSimFunction_swigregister
-VarianceSimFunction_swigregister(VarianceSimFunction)
+
+# Register VarianceSimFunction in _libBornAgainCore:
+_libBornAgainCore.VarianceSimFunction_swigregister(VarianceSimFunction)
 
 class ChiSquaredModule(IChiSquaredModule):
-    """
+    r"""
 
 
     Calculation of chi2 between two data sets.
@@ -6185,36 +4961,22 @@ class ChiSquaredModule(IChiSquaredModule):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IChiSquaredModule]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ChiSquaredModule, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IChiSquaredModule]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ChiSquaredModule, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(ChiSquaredModule self) -> ChiSquaredModule
         __init__(ChiSquaredModule self, ChiSquaredModule other) -> ChiSquaredModule
-
         ChiSquaredModule::ChiSquaredModule(const ChiSquaredModule &other)
 
         """
-        this = _libBornAgainCore.new_ChiSquaredModule(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ChiSquaredModule_swiginit(self, _libBornAgainCore.new_ChiSquaredModule(*args))
     __swig_destroy__ = _libBornAgainCore.delete_ChiSquaredModule
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ChiSquaredModule self) -> ChiSquaredModule
-
         virtual ChiSquaredModule* ChiSquaredModule::clone() const
 
         clone method 
@@ -6222,62 +4984,49 @@ class ChiSquaredModule(IChiSquaredModule):
         """
         return _libBornAgainCore.ChiSquaredModule_clone(self)
 
-
     def residual(self, a, b, weight):
-        """
+        r"""
         residual(ChiSquaredModule self, double a, double b, double weight) -> double
-
         double ChiSquaredModule::residual(double a, double b, double weight)
 
         """
         return _libBornAgainCore.ChiSquaredModule_residual(self, a, b, weight)
 
-ChiSquaredModule_swigregister = _libBornAgainCore.ChiSquaredModule_swigregister
-ChiSquaredModule_swigregister(ChiSquaredModule)
+# Register ChiSquaredModule in _libBornAgainCore:
+_libBornAgainCore.ChiSquaredModule_swigregister(ChiSquaredModule)
 
-class FitOptions(_object):
-    """Proxy of C++ FitOptions class."""
+class FitOptions(object):
+    r"""Proxy of C++ FitOptions class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FitOptions, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, FitOptions, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """__init__(FitOptions self) -> FitOptions"""
-        this = _libBornAgainCore.new_FitOptions()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        r"""__init__(FitOptions self) -> FitOptions"""
+        _libBornAgainCore.FitOptions_swiginit(self, _libBornAgainCore.new_FitOptions())
 
     def derivEpsilon(self):
-        """derivEpsilon(FitOptions self) -> double"""
+        r"""derivEpsilon(FitOptions self) -> double"""
         return _libBornAgainCore.FitOptions_derivEpsilon(self)
 
-
     def setDerivEpsilon(self, deriv_epsilon):
-        """setDerivEpsilon(FitOptions self, double deriv_epsilon)"""
+        r"""setDerivEpsilon(FitOptions self, double deriv_epsilon)"""
         return _libBornAgainCore.FitOptions_setDerivEpsilon(self, deriv_epsilon)
 
-
     def stepFactor(self):
-        """stepFactor(FitOptions self) -> double"""
+        r"""stepFactor(FitOptions self) -> double"""
         return _libBornAgainCore.FitOptions_stepFactor(self)
 
-
     def setStepFactor(self, step_factor):
-        """setStepFactor(FitOptions self, double step_factor)"""
+        r"""setStepFactor(FitOptions self, double step_factor)"""
         return _libBornAgainCore.FitOptions_setStepFactor(self, step_factor)
-
     __swig_destroy__ = _libBornAgainCore.delete_FitOptions
-    __del__ = lambda self: None
-FitOptions_swigregister = _libBornAgainCore.FitOptions_swigregister
-FitOptions_swigregister(FitOptions)
 
-class PyBuilderCallback(_object):
-    """
+# Register FitOptions in _libBornAgainCore:
+_libBornAgainCore.FitOptions_swigregister(FitOptions)
+
+class PyBuilderCallback(object):
+    r"""
 
 
     Builds simulation object using a Python callable. Base class to wrap Python callable and pass it to C++. Used in swig interface file, intended to be overloaded from Python.
@@ -6286,16 +5035,12 @@ class PyBuilderCallback(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PyBuilderCallback, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PyBuilderCallback, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(PyBuilderCallback self) -> PyBuilderCallback
-
         PyBuilderCallback::PyBuilderCallback()
 
         """
@@ -6303,32 +5048,26 @@ class PyBuilderCallback(_object):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_PyBuilderCallback(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PyBuilderCallback_swiginit(self, _libBornAgainCore.new_PyBuilderCallback(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_PyBuilderCallback
-    __del__ = lambda self: None
 
     def build_simulation(self, arg0):
-        """
+        r"""
         build_simulation(PyBuilderCallback self, Parameters arg0) -> Simulation
-
         Simulation * PyBuilderCallback::build_simulation(Fit::Parameters)
 
         """
         return _libBornAgainCore.PyBuilderCallback_build_simulation(self, arg0)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_PyBuilderCallback(self)
-        return weakref_proxy(self)
-PyBuilderCallback_swigregister = _libBornAgainCore.PyBuilderCallback_swigregister
-PyBuilderCallback_swigregister(PyBuilderCallback)
+        return weakref.proxy(self)
 
-class PyObserverCallback(_object):
-    """
+# Register PyBuilderCallback in _libBornAgainCore:
+_libBornAgainCore.PyBuilderCallback_swigregister(PyBuilderCallback)
+
+class PyObserverCallback(object):
+    r"""
 
 
     Observer for  FitObjective based on Python callable. Base class to wrap Python callable and pass it to C++. Used in swig interface file, intended to be overloaded from Python.
@@ -6337,16 +5076,12 @@ class PyObserverCallback(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PyObserverCallback, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PyObserverCallback, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(PyObserverCallback self) -> PyObserverCallback
-
         PyObserverCallback::PyObserverCallback()
 
         """
@@ -6354,32 +5089,26 @@ class PyObserverCallback(_object):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_PyObserverCallback(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PyObserverCallback_swiginit(self, _libBornAgainCore.new_PyObserverCallback(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_PyObserverCallback
-    __del__ = lambda self: None
 
     def update(self, arg0):
-        """
+        r"""
         update(PyObserverCallback self, FitObjective arg0)
-
         void PyObserverCallback::update(const FitObjective &)
 
         """
         return _libBornAgainCore.PyObserverCallback_update(self, arg0)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_PyObserverCallback(self)
-        return weakref_proxy(self)
-PyObserverCallback_swigregister = _libBornAgainCore.PyObserverCallback_swigregister
-PyObserverCallback_swigregister(PyObserverCallback)
+        return weakref.proxy(self)
 
-class FitObjective(_object):
-    """
+# Register PyObserverCallback in _libBornAgainCore:
+_libBornAgainCore.PyObserverCallback_swigregister(PyObserverCallback)
+
+class FitObjective(object):
+    r"""
 
 
     Holds vector of   SimDataPairs (experimental data and simulation results) for use in fitting.
@@ -6388,16 +5117,12 @@ class FitObjective(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FitObjective, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, FitObjective, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(FitObjective self) -> FitObjective
-
         FitObjective::FitObjective()
 
         """
@@ -6405,49 +5130,36 @@ class FitObjective(_object):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_FitObjective(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FitObjective_swiginit(self, _libBornAgainCore.new_FitObjective(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_FitObjective
-    __del__ = lambda self: None
 
     def evaluate_cpp(self, params):
-        """
+        r"""
         evaluate_cpp(FitObjective self, Parameters params) -> double
-
         double FitObjective::evaluate(const Fit::Parameters &params)
 
         """
         return _libBornAgainCore.FitObjective_evaluate_cpp(self, params)
 
-
     def evaluate_residuals_cpp(self, params):
-        """
+        r"""
         evaluate_residuals_cpp(FitObjective self, Parameters params) -> vdouble1d_t
-
         std::vector< double > FitObjective::evaluate_residuals(const Fit::Parameters &params)
 
         """
         return _libBornAgainCore.FitObjective_evaluate_residuals_cpp(self, params)
 
-
     def numberOfFitElements(self):
-        """
+        r"""
         numberOfFitElements(FitObjective self) -> size_t
-
         size_t FitObjective::numberOfFitElements() const
 
         """
         return _libBornAgainCore.FitObjective_numberOfFitElements(self)
 
-
     def simulationResult(self, i_item=0):
-        """
+        r"""
         simulationResult(FitObjective self, size_t i_item=0) -> SimulationResult
-        simulationResult(FitObjective self) -> SimulationResult
-
         SimulationResult FitObjective::simulationResult(size_t i_item=0) const
 
         Returns simulation result in the form of  SimulationResult. 
@@ -6455,12 +5167,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_simulationResult(self, i_item)
 
-
     def experimentalData(self, i_item=0):
-        """
+        r"""
         experimentalData(FitObjective self, size_t i_item=0) -> SimulationResult
-        experimentalData(FitObjective self) -> SimulationResult
-
         SimulationResult FitObjective::experimentalData(size_t i_item=0) const
 
         Returns experimental data in the form of  SimulationResult. 
@@ -6468,12 +5177,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_experimentalData(self, i_item)
 
-
     def uncertaintyData_cpp(self, i_item=0):
-        """
+        r"""
         uncertaintyData_cpp(FitObjective self, size_t i_item=0) -> SimulationResult
-        uncertaintyData_cpp(FitObjective self) -> SimulationResult
-
         SimulationResult FitObjective::uncertaintyData(size_t i_item=0) const
 
         Returns experimental data uncertainties in the form of  SimulationResult. 
@@ -6481,12 +5187,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_uncertaintyData_cpp(self, i_item)
 
-
     def relativeDifference(self, i_item=0):
-        """
+        r"""
         relativeDifference(FitObjective self, size_t i_item=0) -> SimulationResult
-        relativeDifference(FitObjective self) -> SimulationResult
-
         SimulationResult FitObjective::relativeDifference(size_t i_item=0) const
 
         Returns relative difference between simulation and experimental data in the form of  SimulationResult. 
@@ -6494,12 +5197,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_relativeDifference(self, i_item)
 
-
     def absoluteDifference(self, i_item=0):
-        """
+        r"""
         absoluteDifference(FitObjective self, size_t i_item=0) -> SimulationResult
-        absoluteDifference(FitObjective self) -> SimulationResult
-
         SimulationResult FitObjective::absoluteDifference(size_t i_item=0) const
 
         Returns absolute value of difference between simulation and experimental data in the form of  SimulationResult. 
@@ -6507,11 +5207,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_absoluteDifference(self, i_item)
 
-
     def experimental_array(self):
-        """
+        r"""
         experimental_array(FitObjective self) -> vdouble1d_t
-
         std::vector< double > FitObjective::experimental_array() const
 
         Returns one dimensional array representing merged experimental data. The area outside of the region of interest is not included, masked data is nullified. 
@@ -6519,11 +5217,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_experimental_array(self)
 
-
     def simulation_array(self):
-        """
+        r"""
         simulation_array(FitObjective self) -> vdouble1d_t
-
         std::vector< double > FitObjective::simulation_array() const
 
         Returns one dimensional array representing merged simulated intensities data. The area outside of the region of interest is not included, masked data is nullified. 
@@ -6531,11 +5227,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_simulation_array(self)
 
-
     def uncertainties_cpp(self):
-        """
+        r"""
         uncertainties_cpp(FitObjective self) -> vdouble1d_t
-
         std::vector< double > FitObjective::uncertainties() const
 
         Returns one-dimensional array representing merged data uncertainties. The area outside of the region of interest is not included, masked data is nullified. 
@@ -6543,11 +5237,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_uncertainties_cpp(self)
 
-
     def weights_array(self):
-        """
+        r"""
         weights_array(FitObjective self) -> vdouble1d_t
-
         std::vector< double > FitObjective::weights_array() const
 
         Returns one-dimensional array representing merged user weights. The area outside of the region of interest is not included, masked data is nullified. 
@@ -6555,11 +5247,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_weights_array(self)
 
-
     def initPrint(self, every_nth):
-        """
+        r"""
         initPrint(FitObjective self, int every_nth)
-
         void FitObjective::initPrint(int every_nth)
 
         Initializes printing to standard output during the fitting.
@@ -6573,41 +5263,33 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_initPrint(self, every_nth)
 
-
     def initPlot_cpp(self, every_nth, callback):
-        """
+        r"""
         initPlot_cpp(FitObjective self, int every_nth, PyObserverCallback callback)
-
         void FitObjective::initPlot(int every_nth, fit_observer_t observer)
 
         """
         return _libBornAgainCore.FitObjective_initPlot_cpp(self, every_nth, callback)
 
-
     def iterationInfo(self):
-        """
+        r"""
         iterationInfo(FitObjective self) -> IterationInfo
-
         IterationInfo FitObjective::iterationInfo() const
 
         """
         return _libBornAgainCore.FitObjective_iterationInfo(self)
 
-
     def minimizerResult(self):
-        """
+        r"""
         minimizerResult(FitObjective self) -> Fit::MinimizerResult
-
         Fit::MinimizerResult FitObjective::minimizerResult() const
 
         """
         return _libBornAgainCore.FitObjective_minimizerResult(self)
 
-
     def finalize_cpp(self, result):
-        """
+        r"""
         finalize_cpp(FitObjective self, Fit::MinimizerResult const & result)
-
         void FitObjective::finalize(const Fit::MinimizerResult &result)
 
         Should be explicitely called on last iteration to notify all observers. 
@@ -6615,52 +5297,42 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_finalize_cpp(self, result)
 
-
     def fitObjectCount(self):
-        """
+        r"""
         fitObjectCount(FitObjective self) -> unsigned int
-
         unsigned FitObjective::fitObjectCount() const
 
         """
         return _libBornAgainCore.FitObjective_fitObjectCount(self)
 
-
     def run_simulations(self, params):
-        """
+        r"""
         run_simulations(FitObjective self, Parameters params)
-
         void FitObjective::run_simulations(const Fit::Parameters &params)
 
         """
         return _libBornAgainCore.FitObjective_run_simulations(self, params)
 
-
     def setChiSquaredModule(self, module):
-        """
+        r"""
         setChiSquaredModule(FitObjective self, IChiSquaredModule module)
-
         void FitObjective::setChiSquaredModule(const IChiSquaredModule &module)
 
         """
         return _libBornAgainCore.FitObjective_setChiSquaredModule(self, module)
 
-
     def setObjectiveMetric(self, *args):
-        """
+        r"""
         setObjectiveMetric(FitObjective self, std::string const & metric)
         setObjectiveMetric(FitObjective self, std::string const & metric, std::string const & norm)
-
         void FitObjective::setObjectiveMetric(std::unique_ptr< ObjectiveMetric > metric)
 
         """
         return _libBornAgainCore.FitObjective_setObjectiveMetric(self, *args)
 
-
     def containsUncertainties_cpp(self, i_item):
-        """
+        r"""
         containsUncertainties_cpp(FitObjective self, size_t i_item) -> bool
-
         bool FitObjective::containsUncertainties(size_t i_item) const
 
         Returns true if the specified DataPair element contains uncertainties. 
@@ -6668,11 +5340,9 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_containsUncertainties_cpp(self, i_item)
 
-
     def allPairsHaveUncertainties_cpp(self):
-        """
+        r"""
         allPairsHaveUncertainties_cpp(FitObjective self) -> bool
-
         bool FitObjective::allPairsHaveUncertainties() const
 
         Returns true if all the data pairs in  FitObjective instance contain uncertainties. 
@@ -6680,24 +5350,17 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_allPairsHaveUncertainties_cpp(self)
 
-
+    @staticmethod
     def availableMetricOptions():
-        """availableMetricOptions() -> std::string"""
+        r"""availableMetricOptions() -> std::string"""
         return _libBornAgainCore.FitObjective_availableMetricOptions()
 
-    availableMetricOptions = staticmethod(availableMetricOptions)
-
     def addSimulationAndData_cpp(self, *args):
-        """
+        r"""
         addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, double weight=1.0)
-        addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data)
         addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t uncertainties, double weight=1.0)
-        addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t uncertainties)
         addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, double weight=1.0)
-        addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data)
         addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t uncertainties, double weight=1.0)
-        addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t uncertainties)
-
         void FitObjective::addSimulationAndData(PyBuilderCallback &callback, const T &data, const T &uncertainties, double weight=1.0)
 
         Constructs simulation/data pair for later fit.
@@ -6720,7 +5383,6 @@ class FitObjective(_object):
         """
         return _libBornAgainCore.FitObjective_addSimulationAndData_cpp(self, *args)
 
-
     def addSimulationAndData(self, callback, data, *args, **kwargs):
         """
         Sets simulation and experimental data to the fit objective.
@@ -6811,46 +5473,43 @@ class FitObjective(_object):
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_FitObjective(self)
-        return weakref_proxy(self)
-FitObjective_swigregister = _libBornAgainCore.FitObjective_swigregister
-FitObjective_swigregister(FitObjective)
+        return weakref.proxy(self)
+
+# Register FitObjective in _libBornAgainCore:
+_libBornAgainCore.FitObjective_swigregister(FitObjective)
 
 def FitObjective_availableMetricOptions():
-    """FitObjective_availableMetricOptions() -> std::string"""
+    r"""FitObjective_availableMetricOptions() -> std::string"""
     return _libBornAgainCore.FitObjective_availableMetricOptions()
 
 
 def StandardNormal(x):
-    """
+    r"""
     StandardNormal(double x) -> double
-
     double MathFunctions::StandardNormal(double x)
 
     """
     return _libBornAgainCore.StandardNormal(x)
 
 def Gaussian(x, average, std_dev):
-    """
+    r"""
     Gaussian(double x, double average, double std_dev) -> double
-
     double MathFunctions::Gaussian(double x, double average, double std_dev)
 
     """
     return _libBornAgainCore.Gaussian(x, average, std_dev)
 
 def IntegratedGaussian(x, average, std_dev):
-    """
+    r"""
     IntegratedGaussian(double x, double average, double std_dev) -> double
-
     double MathFunctions::IntegratedGaussian(double x, double average, double std_dev)
 
     """
     return _libBornAgainCore.IntegratedGaussian(x, average, std_dev)
 
 def cot(x):
-    """
+    r"""
     cot(double x) -> double
-
     double MathFunctions::cot(double x)
 
     cotangent function:  $cot(x)\\equiv1/tan(x)$
@@ -6859,9 +5518,8 @@ def cot(x):
     return _libBornAgainCore.cot(x)
 
 def Si(x):
-    """
+    r"""
     Si(double x) -> double
-
     double MathFunctions::Si(double x)
 
     Sine integral function:  $Si(x)\\equiv\\int_0^x du \\sin(u)/u$. 
@@ -6870,10 +5528,9 @@ def Si(x):
     return _libBornAgainCore.Si(x)
 
 def sinc(*args):
-    """
+    r"""
     sinc(double x) -> double
     sinc(complex_t const z) -> complex_t
-
     complex_t MathFunctions::sinc(const complex_t z)
 
     Complex sinc function:  $sinc(x)\\equiv\\sin(x)/x$. 
@@ -6882,9 +5539,8 @@ def sinc(*args):
     return _libBornAgainCore.sinc(*args)
 
 def tanhc(z):
-    """
+    r"""
     tanhc(complex_t const z) -> complex_t
-
     complex_t MathFunctions::tanhc(const complex_t z)
 
     Complex tanhc function:  $tanhc(x)\\equiv\\tanh(x)/x$. 
@@ -6893,9 +5549,8 @@ def tanhc(z):
     return _libBornAgainCore.tanhc(z)
 
 def Laue(x, N):
-    """
+    r"""
     Laue(double const x, size_t N) -> double
-
     double MathFunctions::Laue(const double x, size_t N)
 
     Real Laue function:  $Laue(x,N)\\equiv\\sin(Nx)/sin(x)$. 
@@ -6904,9 +5559,8 @@ def Laue(x, N):
     return _libBornAgainCore.Laue(x, N)
 
 def erf(arg):
-    """
+    r"""
     erf(double arg) -> double
-
     double MathFunctions::erf(double arg)
 
     Error function of real-valued argument. 
@@ -6915,9 +5569,8 @@ def erf(arg):
     return _libBornAgainCore.erf(arg)
 
 def Bessel_I0(x):
-    """
+    r"""
     Bessel_I0(double x) -> double
-
     double MathFunctions::Bessel_I0(double x)
 
     Modified Bessel function of the first kind and order 0. 
@@ -6926,10 +5579,9 @@ def Bessel_I0(x):
     return _libBornAgainCore.Bessel_I0(x)
 
 def Bessel_J0(*args):
-    """
+    r"""
     Bessel_J0(double x) -> double
     Bessel_J0(complex_t const z) -> complex_t
-
     complex_t MathFunctions::Bessel_J0(const complex_t z)
 
     Complex Bessel function of the first kind and order 0. 
@@ -6938,10 +5590,9 @@ def Bessel_J0(*args):
     return _libBornAgainCore.Bessel_J0(*args)
 
 def Bessel_J1(*args):
-    """
+    r"""
     Bessel_J1(double x) -> double
     Bessel_J1(complex_t const z) -> complex_t
-
     complex_t MathFunctions::Bessel_J1(const complex_t z)
 
     Complex Bessel function of the first kind and order 1. 
@@ -6950,10 +5601,9 @@ def Bessel_J1(*args):
     return _libBornAgainCore.Bessel_J1(*args)
 
 def Bessel_J1c(*args):
-    """
+    r"""
     Bessel_J1c(double x) -> double
     Bessel_J1c(complex_t const z) -> complex_t
-
     complex_t MathFunctions::Bessel_J1c(const complex_t z)
 
     Complex Bessel function Bessel_J1(x)/x. 
@@ -6961,13 +5611,14 @@ def Bessel_J1c(*args):
     """
     return _libBornAgainCore.Bessel_J1c(*args)
 FORWARD_FFT = _libBornAgainCore.FORWARD_FFT
+
 BACKWARD_FFT = _libBornAgainCore.BACKWARD_FFT
 
+
 def FastFourierTransform(*args):
-    """
+    r"""
     FastFourierTransform(vector_complex_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t
     FastFourierTransform(vdouble1d_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t
-
     std::vector< complex_t > MathFunctions::FastFourierTransform(const std::vector< double > &data, EFFTDirection tcase)
 
     simple (and unoptimized) wrapper function for the discrete fast Fourier transformation library (fftw3); transforms real to complex 
@@ -6976,9 +5627,8 @@ def FastFourierTransform(*args):
     return _libBornAgainCore.FastFourierTransform(*args)
 
 def ConvolveFFT(signal, resfunc):
-    """
+    r"""
     ConvolveFFT(vdouble1d_t signal, vdouble1d_t resfunc) -> vector_complex_t
-
     std::vector< complex_t > MathFunctions::ConvolveFFT(const std::vector< double > &signal, const std::vector< double > &resfunc)
 
     convolution of two real vectors of equal size 
@@ -6987,42 +5637,38 @@ def ConvolveFFT(signal, resfunc):
     return _libBornAgainCore.ConvolveFFT(signal, resfunc)
 
 def GenerateUniformRandom():
-    """
+    r"""
     GenerateUniformRandom() -> double
-
     double MathFunctions::GenerateUniformRandom()
 
     """
     return _libBornAgainCore.GenerateUniformRandom()
 
 def GenerateStandardNormalRandom():
-    """
+    r"""
     GenerateStandardNormalRandom() -> double
-
     double MathFunctions::GenerateStandardNormalRandom()
 
     """
     return _libBornAgainCore.GenerateStandardNormalRandom()
 
 def GenerateNormalRandom(average, std_dev):
-    """
+    r"""
     GenerateNormalRandom(double average, double std_dev) -> double
-
     double MathFunctions::GenerateNormalRandom(double average, double std_dev)
 
     """
     return _libBornAgainCore.GenerateNormalRandom(average, std_dev)
 
 def GeneratePoissonRandom(average):
-    """
+    r"""
     GeneratePoissonRandom(double average) -> double
-
     double MathFunctions::GeneratePoissonRandom(double average)
 
     """
     return _libBornAgainCore.GeneratePoissonRandom(average)
 class IMultiLayerBuilder(IParameterized):
-    """
+    r"""
 
 
     Interface to the class capable to build samples to simulate.
@@ -7031,20 +5677,12 @@ class IMultiLayerBuilder(IParameterized):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IMultiLayerBuilder, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IMultiLayerBuilder, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(IMultiLayerBuilder self) -> IMultiLayerBuilder
-
         IMultiLayerBuilder::IMultiLayerBuilder()
 
         """
@@ -7052,67 +5690,51 @@ class IMultiLayerBuilder(IParameterized):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_IMultiLayerBuilder(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IMultiLayerBuilder_swiginit(self, _libBornAgainCore.new_IMultiLayerBuilder(_self, ))
 
     def buildSample(self):
-        """
+        r"""
         buildSample(IMultiLayerBuilder self) -> MultiLayer
-
         virtual MultiLayer* IMultiLayerBuilder::buildSample() const =0
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_buildSample(self)
 
-
     def createSample(self, index=0):
-        """
+        r"""
         createSample(IMultiLayerBuilder self, size_t index=0) -> MultiLayer
-        createSample(IMultiLayerBuilder self) -> MultiLayer
-
         virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0)
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_createSample(self, index)
 
-
     def size(self):
-        """
+        r"""
         size(IMultiLayerBuilder self) -> size_t
-
         virtual size_t IMultiLayerBuilder::size()
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_size(self)
 
-
     def registerParameter(self, name, parpointer):
-        """
+        r"""
         registerParameter(IMultiLayerBuilder self, std::string const & name, int64_t parpointer) -> RealParameter
-
         RealParameter & IParameterized::registerParameter(const std::string &name, double *parpointer)
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_registerParameter(self, name, parpointer)
 
-
     def setParameterValue(self, name, value):
-        """
+        r"""
         setParameterValue(IMultiLayerBuilder self, std::string const & name, double value)
-
         void IParameterized::setParameterValue(const std::string &name, double value)
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_setParameterValue(self, name, value)
 
-
     def parametersToString(self):
-        """
+        r"""
         parametersToString(IMultiLayerBuilder self) -> std::string
-
         std::string IParameterized::parametersToString() const
 
         Returns multiline string representing available parameters. 
@@ -7120,11 +5742,9 @@ class IMultiLayerBuilder(IParameterized):
         """
         return _libBornAgainCore.IMultiLayerBuilder_parametersToString(self)
 
-
     def createParameterTree(self):
-        """
+        r"""
         createParameterTree(IMultiLayerBuilder self) -> ParameterPool
-
         ParameterPool * IParameterized::createParameterTree() const
 
         Creates new parameter pool, with all local parameters and those of its children. 
@@ -7132,11 +5752,9 @@ class IMultiLayerBuilder(IParameterized):
         """
         return _libBornAgainCore.IMultiLayerBuilder_createParameterTree(self)
 
-
     def parameterPool(self):
-        """
+        r"""
         parameterPool(IMultiLayerBuilder self) -> ParameterPool
-
         ParameterPool* IParameterized::parameterPool() const
 
         Returns pointer to the parameter pool. 
@@ -7144,29 +5762,26 @@ class IMultiLayerBuilder(IParameterized):
         """
         return _libBornAgainCore.IMultiLayerBuilder_parameterPool(self)
 
-
     def onChange(self):
-        """
+        r"""
         onChange(IMultiLayerBuilder self)
-
         virtual void IParameterized::onChange()
 
         Action to be taken in inherited class when a parameter has changed. 
 
         """
         return _libBornAgainCore.IMultiLayerBuilder_onChange(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IMultiLayerBuilder
-    __del__ = lambda self: None
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_IMultiLayerBuilder(self)
-        return weakref_proxy(self)
-IMultiLayerBuilder_swigregister = _libBornAgainCore.IMultiLayerBuilder_swigregister
-IMultiLayerBuilder_swigregister(IMultiLayerBuilder)
+        return weakref.proxy(self)
 
-class INodeVisitor(_object):
-    """
+# Register IMultiLayerBuilder in _libBornAgainCore:
+_libBornAgainCore.IMultiLayerBuilder_swigregister(IMultiLayerBuilder)
+
+class INodeVisitor(object):
+    r"""
 
 
     From visitor pattern to achieve double dispatch.
@@ -7177,29 +5792,20 @@ class INodeVisitor(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, INodeVisitor, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, INodeVisitor, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(INodeVisitor self) -> INodeVisitor
-
         INodeVisitor::INodeVisitor()
 
         """
-        this = _libBornAgainCore.new_INodeVisitor()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.INodeVisitor_swiginit(self, _libBornAgainCore.new_INodeVisitor())
     __swig_destroy__ = _libBornAgainCore.delete_INodeVisitor
-    __del__ = lambda self: None
 
     def visit(self, *args):
-        """
+        r"""
         visit(INodeVisitor self, BasicLattice arg2)
         visit(INodeVisitor self, Beam arg2)
         visit(INodeVisitor self, ConstantBackground arg2)
@@ -7320,17 +5926,14 @@ class INodeVisitor(_object):
         visit(INodeVisitor self, SpecularSimulation arg2)
         visit(INodeVisitor self, SphericalDetector arg2)
         visit(INodeVisitor self, SquareLattice arg2)
-
         virtual void INodeVisitor::visit(const SquareLattice *)
 
         """
         return _libBornAgainCore.INodeVisitor_visit(self, *args)
 
-
     def depth(self):
-        """
+        r"""
         depth(INodeVisitor self) -> int
-
         int INodeVisitor::depth() const
 
         Returns depth of the visitor in the composite hierarchy. 
@@ -7338,11 +5941,9 @@ class INodeVisitor(_object):
         """
         return _libBornAgainCore.INodeVisitor_depth(self)
 
-
     def setDepth(self, depth):
-        """
+        r"""
         setDepth(INodeVisitor self, int depth)
-
         void INodeVisitor::setDepth(int depth)
 
         Sets depth of the visitor in the composite hierarchy. 
@@ -7350,29 +5951,27 @@ class INodeVisitor(_object):
         """
         return _libBornAgainCore.INodeVisitor_setDepth(self, depth)
 
-INodeVisitor_swigregister = _libBornAgainCore.INodeVisitor_swigregister
-INodeVisitor_swigregister(INodeVisitor)
+# Register INodeVisitor in _libBornAgainCore:
+_libBornAgainCore.INodeVisitor_swigregister(INodeVisitor)
 
 
 def VisitNodesPreorder(node, visitor):
-    """
+    r"""
     VisitNodesPreorder(INode node, INodeVisitor visitor)
-
     BA_CORE_API_ void VisitNodesPreorder(const INode &node, INodeVisitor &visitor)
 
     """
     return _libBornAgainCore.VisitNodesPreorder(node, visitor)
 
 def VisitNodesPostorder(node, visitor):
-    """
+    r"""
     VisitNodesPostorder(INode node, INodeVisitor visitor)
-
     BA_CORE_API_ void VisitNodesPostorder(const INode &node, INodeVisitor &visitor)
 
     """
     return _libBornAgainCore.VisitNodesPostorder(node, visitor)
 class IClusteredParticles(ISample):
-    """
+    r"""
 
 
     An ordered assembly of particles. Currently, the only child class is  Crystal.
@@ -7381,23 +5980,15 @@ class IClusteredParticles(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IClusteredParticles, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IClusteredParticles, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IClusteredParticles self) -> IClusteredParticles
-
         IClusteredParticles* IClusteredParticles::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -7405,11 +5996,9 @@ class IClusteredParticles(ISample):
         """
         return _libBornAgainCore.IClusteredParticles_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IClusteredParticles self, INodeVisitor visitor)
-
         void IClusteredParticles::accept(INodeVisitor *visitor) const override=0
 
         Calls the  INodeVisitor's visit method. 
@@ -7417,11 +6006,9 @@ class IClusteredParticles(ISample):
         """
         return _libBornAgainCore.IClusteredParticles_accept(self, visitor)
 
-
     def createTotalFormFactor(self, arg2, arg3, arg4):
-        """
+        r"""
         createTotalFormFactor(IClusteredParticles self, IFormFactor arg2, IRotation arg3, kvector_t arg4) -> IFormFactor
-
         virtual IFormFactor* IClusteredParticles::createTotalFormFactor(const IFormFactor &, const IRotation *, const kvector_t &) const =0
 
         Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the  IClusteredParticles object itself 
@@ -7429,25 +6016,22 @@ class IClusteredParticles(ISample):
         """
         return _libBornAgainCore.IClusteredParticles_createTotalFormFactor(self, arg2, arg3, arg4)
 
-
     def homogeneousRegions(self):
-        """
+        r"""
         homogeneousRegions(IClusteredParticles self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >
-
         virtual std::vector<HomogeneousRegion> IClusteredParticles::homogeneousRegions() const =0
 
         Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume 
 
         """
         return _libBornAgainCore.IClusteredParticles_homogeneousRegions(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IClusteredParticles
-    __del__ = lambda self: None
-IClusteredParticles_swigregister = _libBornAgainCore.IClusteredParticles_swigregister
-IClusteredParticles_swigregister(IClusteredParticles)
+
+# Register IClusteredParticles in _libBornAgainCore:
+_libBornAgainCore.IClusteredParticles_swigregister(IClusteredParticles)
 
 class Crystal(IClusteredParticles):
-    """
+    r"""
 
 
     A crystal structure with a  ParticleComposition as a basis. Used in  MesoCrystal, where it is given an outer shape.
@@ -7456,35 +6040,21 @@ class Crystal(IClusteredParticles):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IClusteredParticles]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Crystal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IClusteredParticles]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Crystal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, lattice_basis, lattice):
-        """
+        r"""
         __init__(Crystal self, IParticle lattice_basis, Lattice lattice) -> Crystal
-
         Crystal::Crystal(const IParticle &lattice_basis, const Lattice &lattice)
 
         """
-        this = _libBornAgainCore.new_Crystal(lattice_basis, lattice)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Crystal_swiginit(self, _libBornAgainCore.new_Crystal(lattice_basis, lattice))
     __swig_destroy__ = _libBornAgainCore.delete_Crystal
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(Crystal self) -> Crystal
-
         Crystal * Crystal::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -7492,11 +6062,9 @@ class Crystal(IClusteredParticles):
         """
         return _libBornAgainCore.Crystal_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(Crystal self, INodeVisitor visitor)
-
         void Crystal::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -7504,11 +6072,9 @@ class Crystal(IClusteredParticles):
         """
         return _libBornAgainCore.Crystal_accept(self, visitor)
 
-
     def createTotalFormFactor(self, meso_crystal_form_factor, p_rotation, translation):
-        """
+        r"""
         createTotalFormFactor(Crystal self, IFormFactor meso_crystal_form_factor, IRotation p_rotation, kvector_t translation) -> IFormFactor
-
         IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const override final
 
         Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the  IClusteredParticles object itself 
@@ -7516,11 +6082,9 @@ class Crystal(IClusteredParticles):
         """
         return _libBornAgainCore.Crystal_createTotalFormFactor(self, meso_crystal_form_factor, p_rotation, translation)
 
-
     def homogeneousRegions(self):
-        """
+        r"""
         homogeneousRegions(Crystal self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >
-
         std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const override final
 
         Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume 
@@ -7528,32 +6092,25 @@ class Crystal(IClusteredParticles):
         """
         return _libBornAgainCore.Crystal_homogeneousRegions(self)
 
-
     def transformedLattice(self, p_rotation=None):
-        """
+        r"""
         transformedLattice(Crystal self, IRotation p_rotation=None) -> Lattice
-        transformedLattice(Crystal self) -> Lattice
-
         Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const
 
         """
         return _libBornAgainCore.Crystal_transformedLattice(self, p_rotation)
 
-
     def setPositionVariance(self, position_variance):
-        """
+        r"""
         setPositionVariance(Crystal self, double position_variance)
-
         void Crystal::setPositionVariance(double position_variance)
 
         """
         return _libBornAgainCore.Crystal_setPositionVariance(self, position_variance)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Crystal self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Crystal::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -7561,11 +6118,11 @@ class Crystal(IClusteredParticles):
         """
         return _libBornAgainCore.Crystal_getChildren(self)
 
-Crystal_swigregister = _libBornAgainCore.Crystal_swigregister
-Crystal_swigregister(Crystal)
+# Register Crystal in _libBornAgainCore:
+_libBornAgainCore.Crystal_swigregister(Crystal)
 
 class IDistribution1D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for one-dimensional distributions.
@@ -7574,35 +6131,24 @@ class IDistribution1D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IDistribution1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IDistribution1D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IDistribution1D
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IDistribution1D self) -> IDistribution1D
-
         virtual IDistribution1D* IDistribution1D::clone() const =0
 
         """
         return _libBornAgainCore.IDistribution1D_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(IDistribution1D self, double x) -> double
-
         virtual double IDistribution1D::probabilityDensity(double x) const =0
 
         Returns the distribution-specific probability density for value x. 
@@ -7610,11 +6156,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(IDistribution1D self) -> double
-
         virtual double IDistribution1D::getMean() const =0
 
         Returns the distribution-specific mean. 
@@ -7622,13 +6166,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_getMean(self)
 
-
     def equidistantSamples(self, *args):
-        """
-        equidistantSamples(IDistribution1D self, size_t nbr_samples, double sigma_factor=0., RealLimits limits) -> ParameterSampleVector
-        equidistantSamples(IDistribution1D self, size_t nbr_samples, double sigma_factor=0.) -> ParameterSampleVector
-        equidistantSamples(IDistribution1D self, size_t nbr_samples) -> ParameterSampleVector
-
+        r"""
+        equidistantSamples(IDistribution1D self, size_t nbr_samples, double sigma_factor=0., RealLimits limits=RealLimits()) -> ParameterSampleVector
         std::vector< ParameterSample > IDistribution1D::equidistantSamples(size_t nbr_samples, double sigma_factor=0., const RealLimits &limits=RealLimits()) const
 
         Returns equidistant samples, using intrinsic parameters, weighted with  probabilityDensity(). 
@@ -7636,11 +6176,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_equidistantSamples(self, *args)
 
-
     def equidistantSamplesInRange(self, nbr_samples, xmin, xmax):
-        """
+        r"""
         equidistantSamplesInRange(IDistribution1D self, size_t nbr_samples, double xmin, double xmax) -> ParameterSampleVector
-
         std::vector< ParameterSample > IDistribution1D::equidistantSamplesInRange(size_t nbr_samples, double xmin, double xmax) const
 
         Returns equidistant samples from xmin to xmax, weighted with  probabilityDensity(). 
@@ -7648,12 +6186,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_equidistantSamplesInRange(self, nbr_samples, xmin, xmax)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(IDistribution1D self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(IDistribution1D self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(IDistribution1D self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         virtual std::vector<double> IDistribution1D::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const =0
 
         Returns equidistant interpolation points, with range computed in distribution-specific way from mean and width parameter, taking into account limits and sigma_factor. 
@@ -7661,11 +6196,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_equidistantPoints(self, *args)
 
-
     def equidistantPointsInRange(self, nbr_samples, xmin, xmax):
-        """
+        r"""
         equidistantPointsInRange(IDistribution1D self, size_t nbr_samples, double xmin, double xmax) -> vdouble1d_t
-
         std::vector< double > IDistribution1D::equidistantPointsInRange(size_t nbr_samples, double xmin, double xmax) const
 
         Returns equidistant interpolation points from xmin to xmax. 
@@ -7673,11 +6206,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_equidistantPointsInRange(self, nbr_samples, xmin, xmax)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(IDistribution1D self) -> bool
-
         virtual bool IDistribution1D::isDelta() const =0
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -7685,11 +6216,9 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_isDelta(self)
 
-
     def setUnits(self, units):
-        """
+        r"""
         setUnits(IDistribution1D self, std::string const & units)
-
         void IDistribution1D::setUnits(const std::string &units)
 
         Sets distribution units. 
@@ -7697,11 +6226,11 @@ class IDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IDistribution1D_setUnits(self, units)
 
-IDistribution1D_swigregister = _libBornAgainCore.IDistribution1D_swigregister
-IDistribution1D_swigregister(IDistribution1D)
+# Register IDistribution1D in _libBornAgainCore:
+_libBornAgainCore.IDistribution1D_swigregister(IDistribution1D)
 
 class DistributionGate(IDistribution1D):
-    """
+    r"""
 
 
     Uniform distribution function with half width hwhm.
@@ -7710,46 +6239,30 @@ class DistributionGate(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionGate, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionGate, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionGate self) -> DistributionGate
         __init__(DistributionGate self, double min, double max) -> DistributionGate
-
         DistributionGate::DistributionGate(double min, double max)
 
         """
-        this = _libBornAgainCore.new_DistributionGate(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionGate_swiginit(self, _libBornAgainCore.new_DistributionGate(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionGate
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionGate self) -> DistributionGate
-
         DistributionGate* DistributionGate::clone() const final
 
         """
         return _libBornAgainCore.DistributionGate_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionGate self, double x) -> double
-
         double DistributionGate::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -7757,11 +6270,9 @@ class DistributionGate(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGate_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionGate self) -> double
-
         double DistributionGate::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -7769,32 +6280,25 @@ class DistributionGate(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGate_getMean(self)
 
-
     def getMin(self):
-        """
+        r"""
         getMin(DistributionGate self) -> double
-
         double DistributionGate::getMin() const
 
         """
         return _libBornAgainCore.DistributionGate_getMin(self)
 
-
     def getMax(self):
-        """
+        r"""
         getMax(DistributionGate self) -> double
-
         double DistributionGate::getMax() const
 
         """
         return _libBornAgainCore.DistributionGate_getMax(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionGate self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionGate self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionGate self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionGate::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         Returns list of sample values. 
@@ -7802,11 +6306,9 @@ class DistributionGate(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGate_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionGate self) -> bool
-
         bool DistributionGate::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -7814,11 +6316,9 @@ class DistributionGate(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGate_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionGate self, INodeVisitor visitor)
-
         void DistributionGate::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -7826,11 +6326,11 @@ class DistributionGate(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGate_accept(self, visitor)
 
-DistributionGate_swigregister = _libBornAgainCore.DistributionGate_swigregister
-DistributionGate_swigregister(DistributionGate)
+# Register DistributionGate in _libBornAgainCore:
+_libBornAgainCore.DistributionGate_swigregister(DistributionGate)
 
 class DistributionLorentz(IDistribution1D):
-    """
+    r"""
 
 
     Lorentz distribution with half width hwhm.
@@ -7839,46 +6339,30 @@ class DistributionLorentz(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionLorentz, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionLorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionLorentz self) -> DistributionLorentz
         __init__(DistributionLorentz self, double mean, double hwhm) -> DistributionLorentz
-
         DistributionLorentz::DistributionLorentz(double mean, double hwhm)
 
         """
-        this = _libBornAgainCore.new_DistributionLorentz(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionLorentz_swiginit(self, _libBornAgainCore.new_DistributionLorentz(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionLorentz
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionLorentz self) -> DistributionLorentz
-
         DistributionLorentz* DistributionLorentz::clone() const final
 
         """
         return _libBornAgainCore.DistributionLorentz_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionLorentz self, double x) -> double
-
         double DistributionLorentz::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -7886,11 +6370,9 @@ class DistributionLorentz(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLorentz_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionLorentz self) -> double
-
         double DistributionLorentz::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -7898,22 +6380,17 @@ class DistributionLorentz(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLorentz_getMean(self)
 
-
     def getHWHM(self):
-        """
+        r"""
         getHWHM(DistributionLorentz self) -> double
-
         double DistributionLorentz::getHWHM() const
 
         """
         return _libBornAgainCore.DistributionLorentz_getHWHM(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionLorentz self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionLorentz self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionLorentz self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionLorentz::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         generate list of sample values 
@@ -7921,11 +6398,9 @@ class DistributionLorentz(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLorentz_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionLorentz self) -> bool
-
         bool DistributionLorentz::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -7933,11 +6408,9 @@ class DistributionLorentz(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLorentz_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionLorentz self, INodeVisitor visitor)
-
         void DistributionLorentz::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -7945,11 +6418,11 @@ class DistributionLorentz(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLorentz_accept(self, visitor)
 
-DistributionLorentz_swigregister = _libBornAgainCore.DistributionLorentz_swigregister
-DistributionLorentz_swigregister(DistributionLorentz)
+# Register DistributionLorentz in _libBornAgainCore:
+_libBornAgainCore.DistributionLorentz_swigregister(DistributionLorentz)
 
 class DistributionGaussian(IDistribution1D):
-    """
+    r"""
 
 
     Gaussian distribution with standard deviation std_dev.
@@ -7958,46 +6431,30 @@ class DistributionGaussian(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionGaussian, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionGaussian, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionGaussian self) -> DistributionGaussian
         __init__(DistributionGaussian self, double mean, double std_dev) -> DistributionGaussian
-
         DistributionGaussian::DistributionGaussian(double mean, double std_dev)
 
         """
-        this = _libBornAgainCore.new_DistributionGaussian(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionGaussian_swiginit(self, _libBornAgainCore.new_DistributionGaussian(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionGaussian
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionGaussian self) -> DistributionGaussian
-
         DistributionGaussian* DistributionGaussian::clone() const final
 
         """
         return _libBornAgainCore.DistributionGaussian_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionGaussian self, double x) -> double
-
         double DistributionGaussian::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -8005,11 +6462,9 @@ class DistributionGaussian(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGaussian_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionGaussian self) -> double
-
         double DistributionGaussian::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -8017,22 +6472,17 @@ class DistributionGaussian(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGaussian_getMean(self)
 
-
     def getStdDev(self):
-        """
+        r"""
         getStdDev(DistributionGaussian self) -> double
-
         double DistributionGaussian::getStdDev() const
 
         """
         return _libBornAgainCore.DistributionGaussian_getStdDev(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionGaussian self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionGaussian self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionGaussian self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionGaussian::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         generate list of sample values 
@@ -8040,11 +6490,9 @@ class DistributionGaussian(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGaussian_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionGaussian self) -> bool
-
         bool DistributionGaussian::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -8052,11 +6500,9 @@ class DistributionGaussian(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGaussian_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionGaussian self, INodeVisitor visitor)
-
         void DistributionGaussian::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8064,11 +6510,11 @@ class DistributionGaussian(IDistribution1D):
         """
         return _libBornAgainCore.DistributionGaussian_accept(self, visitor)
 
-DistributionGaussian_swigregister = _libBornAgainCore.DistributionGaussian_swigregister
-DistributionGaussian_swigregister(DistributionGaussian)
+# Register DistributionGaussian in _libBornAgainCore:
+_libBornAgainCore.DistributionGaussian_swigregister(DistributionGaussian)
 
 class DistributionLogNormal(IDistribution1D):
-    """
+    r"""
 
 
     Log-normal distribution.
@@ -8077,46 +6523,30 @@ class DistributionLogNormal(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionLogNormal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionLogNormal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionLogNormal self, double scale_param) -> DistributionLogNormal
         __init__(DistributionLogNormal self, double median, double scale_param) -> DistributionLogNormal
-
         DistributionLogNormal::DistributionLogNormal(double median, double scale_param)
 
         """
-        this = _libBornAgainCore.new_DistributionLogNormal(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionLogNormal_swiginit(self, _libBornAgainCore.new_DistributionLogNormal(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionLogNormal
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionLogNormal self) -> DistributionLogNormal
-
         DistributionLogNormal* DistributionLogNormal::clone() const final
 
         """
         return _libBornAgainCore.DistributionLogNormal_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionLogNormal self, double x) -> double
-
         double DistributionLogNormal::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -8124,11 +6554,9 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionLogNormal self) -> double
-
         double DistributionLogNormal::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -8136,32 +6564,25 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_getMean(self)
 
-
     def getMedian(self):
-        """
+        r"""
         getMedian(DistributionLogNormal self) -> double
-
         double DistributionLogNormal::getMedian() const
 
         """
         return _libBornAgainCore.DistributionLogNormal_getMedian(self)
 
-
     def getScalePar(self):
-        """
+        r"""
         getScalePar(DistributionLogNormal self) -> double
-
         double DistributionLogNormal::getScalePar() const
 
         """
         return _libBornAgainCore.DistributionLogNormal_getScalePar(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionLogNormal self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionLogNormal self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionLogNormal self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionLogNormal::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         generate list of sample values 
@@ -8169,11 +6590,9 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionLogNormal self) -> bool
-
         bool DistributionLogNormal::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -8181,11 +6600,9 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionLogNormal self, INodeVisitor visitor)
-
         void DistributionLogNormal::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8193,11 +6610,9 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_accept(self, visitor)
 
-
     def setUnits(self, units):
-        """
+        r"""
         setUnits(DistributionLogNormal self, std::string const & units)
-
         void DistributionLogNormal::setUnits(const std::string &units)
 
         Sets distribution units. 
@@ -8205,11 +6620,11 @@ class DistributionLogNormal(IDistribution1D):
         """
         return _libBornAgainCore.DistributionLogNormal_setUnits(self, units)
 
-DistributionLogNormal_swigregister = _libBornAgainCore.DistributionLogNormal_swigregister
-DistributionLogNormal_swigregister(DistributionLogNormal)
+# Register DistributionLogNormal in _libBornAgainCore:
+_libBornAgainCore.DistributionLogNormal_swigregister(DistributionLogNormal)
 
 class DistributionCosine(IDistribution1D):
-    """
+    r"""
 
 
     Cosine distribution.
@@ -8218,46 +6633,30 @@ class DistributionCosine(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionCosine, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionCosine, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionCosine self) -> DistributionCosine
         __init__(DistributionCosine self, double mean, double sigma) -> DistributionCosine
-
         DistributionCosine::DistributionCosine(double mean, double sigma)
 
         """
-        this = _libBornAgainCore.new_DistributionCosine(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionCosine_swiginit(self, _libBornAgainCore.new_DistributionCosine(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionCosine
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionCosine self) -> DistributionCosine
-
         DistributionCosine* DistributionCosine::clone() const final
 
         """
         return _libBornAgainCore.DistributionCosine_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionCosine self, double x) -> double
-
         double DistributionCosine::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -8265,11 +6664,9 @@ class DistributionCosine(IDistribution1D):
         """
         return _libBornAgainCore.DistributionCosine_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionCosine self) -> double
-
         double DistributionCosine::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -8277,22 +6674,17 @@ class DistributionCosine(IDistribution1D):
         """
         return _libBornAgainCore.DistributionCosine_getMean(self)
 
-
     def getSigma(self):
-        """
+        r"""
         getSigma(DistributionCosine self) -> double
-
         double DistributionCosine::getSigma() const
 
         """
         return _libBornAgainCore.DistributionCosine_getSigma(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionCosine self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionCosine self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionCosine self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionCosine::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         generate list of sample values 
@@ -8300,11 +6692,9 @@ class DistributionCosine(IDistribution1D):
         """
         return _libBornAgainCore.DistributionCosine_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionCosine self) -> bool
-
         bool DistributionCosine::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -8312,11 +6702,9 @@ class DistributionCosine(IDistribution1D):
         """
         return _libBornAgainCore.DistributionCosine_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionCosine self, INodeVisitor visitor)
-
         void DistributionCosine::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8324,11 +6712,11 @@ class DistributionCosine(IDistribution1D):
         """
         return _libBornAgainCore.DistributionCosine_accept(self, visitor)
 
-DistributionCosine_swigregister = _libBornAgainCore.DistributionCosine_swigregister
-DistributionCosine_swigregister(DistributionCosine)
+# Register DistributionCosine in _libBornAgainCore:
+_libBornAgainCore.DistributionCosine_swigregister(DistributionCosine)
 
 class DistributionTrapezoid(IDistribution1D):
-    """
+    r"""
 
 
     Trapezoidal distribution.
@@ -8337,46 +6725,30 @@ class DistributionTrapezoid(IDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DistributionTrapezoid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DistributionTrapezoid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DistributionTrapezoid self) -> DistributionTrapezoid
         __init__(DistributionTrapezoid self, double center, double left_width, double middle_width, double right_width) -> DistributionTrapezoid
-
         DistributionTrapezoid::DistributionTrapezoid(double center, double left_width, double middle_width, double right_width)
 
         """
-        this = _libBornAgainCore.new_DistributionTrapezoid(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DistributionTrapezoid_swiginit(self, _libBornAgainCore.new_DistributionTrapezoid(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DistributionTrapezoid
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DistributionTrapezoid self) -> DistributionTrapezoid
-
         DistributionTrapezoid* DistributionTrapezoid::clone() const final
 
         """
         return _libBornAgainCore.DistributionTrapezoid_clone(self)
 
-
     def probabilityDensity(self, x):
-        """
+        r"""
         probabilityDensity(DistributionTrapezoid self, double x) -> double
-
         double DistributionTrapezoid::probabilityDensity(double x) const final
 
         Returns the distribution-specific probability density for value x. 
@@ -8384,11 +6756,9 @@ class DistributionTrapezoid(IDistribution1D):
         """
         return _libBornAgainCore.DistributionTrapezoid_probabilityDensity(self, x)
 
-
     def getMean(self):
-        """
+        r"""
         getMean(DistributionTrapezoid self) -> double
-
         double DistributionTrapezoid::getMean() const final
 
         Returns the distribution-specific mean. 
@@ -8396,42 +6766,33 @@ class DistributionTrapezoid(IDistribution1D):
         """
         return _libBornAgainCore.DistributionTrapezoid_getMean(self)
 
-
     def getLeftWidth(self):
-        """
+        r"""
         getLeftWidth(DistributionTrapezoid self) -> double
-
         double DistributionTrapezoid::getLeftWidth() const
 
         """
         return _libBornAgainCore.DistributionTrapezoid_getLeftWidth(self)
 
-
     def getMiddleWidth(self):
-        """
+        r"""
         getMiddleWidth(DistributionTrapezoid self) -> double
-
         double DistributionTrapezoid::getMiddleWidth() const
 
         """
         return _libBornAgainCore.DistributionTrapezoid_getMiddleWidth(self)
 
-
     def getRightWidth(self):
-        """
+        r"""
         getRightWidth(DistributionTrapezoid self) -> double
-
         double DistributionTrapezoid::getRightWidth() const
 
         """
         return _libBornAgainCore.DistributionTrapezoid_getRightWidth(self)
 
-
     def equidistantPoints(self, *args):
-        """
-        equidistantPoints(DistributionTrapezoid self, size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t
-        equidistantPoints(DistributionTrapezoid self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t
-
+        r"""
+        equidistantPoints(DistributionTrapezoid self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t
         std::vector< double > DistributionTrapezoid::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
 
         generate list of sample values 
@@ -8439,11 +6800,9 @@ class DistributionTrapezoid(IDistribution1D):
         """
         return _libBornAgainCore.DistributionTrapezoid_equidistantPoints(self, *args)
 
-
     def isDelta(self):
-        """
+        r"""
         isDelta(DistributionTrapezoid self) -> bool
-
         bool DistributionTrapezoid::isDelta() const final
 
         Returns true if the distribution is in the limit case of a Dirac delta distribution. 
@@ -8451,11 +6810,9 @@ class DistributionTrapezoid(IDistribution1D):
         """
         return _libBornAgainCore.DistributionTrapezoid_isDelta(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DistributionTrapezoid self, INodeVisitor visitor)
-
         void DistributionTrapezoid::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8463,11 +6820,11 @@ class DistributionTrapezoid(IDistribution1D):
         """
         return _libBornAgainCore.DistributionTrapezoid_accept(self, visitor)
 
-DistributionTrapezoid_swigregister = _libBornAgainCore.DistributionTrapezoid_swigregister
-DistributionTrapezoid_swigregister(DistributionTrapezoid)
+# Register DistributionTrapezoid in _libBornAgainCore:
+_libBornAgainCore.DistributionTrapezoid_swigregister(DistributionTrapezoid)
 
-class DetectorMask(_object):
-    """
+class DetectorMask(object):
+    r"""
 
 
     Collection of detector masks.
@@ -8476,30 +6833,21 @@ class DetectorMask(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DetectorMask, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, DetectorMask, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DetectorMask self) -> DetectorMask
         __init__(DetectorMask self, DetectorMask other) -> DetectorMask
-
         DetectorMask::DetectorMask(const DetectorMask &other)
 
         """
-        this = _libBornAgainCore.new_DetectorMask(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DetectorMask_swiginit(self, _libBornAgainCore.new_DetectorMask(*args))
 
     def addMask(self, shape, mask_value):
-        """
+        r"""
         addMask(DetectorMask self, IShape2D shape, bool mask_value)
-
         void DetectorMask::addMask(const IShape2D &shape, bool mask_value)
 
         Add mask to the stack of detector masks. The value "true" means that the area will be excluded from the analysis.
@@ -8516,52 +6864,42 @@ class DetectorMask(_object):
         """
         return _libBornAgainCore.DetectorMask_addMask(self, shape, mask_value)
 
-
     def initMaskData(self, *args):
-        """
+        r"""
         initMaskData(DetectorMask self, IDetector2D detector)
         initMaskData(DetectorMask self, IntensityData data)
-
         void DetectorMask::initMaskData(const OutputData< double > &data)
 
         """
         return _libBornAgainCore.DetectorMask_initMaskData(self, *args)
 
-
     def isMasked(self, index):
-        """
+        r"""
         isMasked(DetectorMask self, size_t index) -> bool
-
         bool DetectorMask::isMasked(size_t index) const
 
         """
         return _libBornAgainCore.DetectorMask_isMasked(self, index)
 
-
     def getMaskData(self):
-        """
+        r"""
         getMaskData(DetectorMask self) -> OutputData< bool > const *
-
         const OutputData<bool>* DetectorMask::getMaskData() const
 
         """
         return _libBornAgainCore.DetectorMask_getMaskData(self)
 
-
     def createHistogram(self):
-        """
+        r"""
         createHistogram(DetectorMask self) -> Histogram2D
-
         Histogram2D * DetectorMask::createHistogram() const
 
         """
         return _libBornAgainCore.DetectorMask_createHistogram(self)
 
-
     def removeMasks(self):
-        """
+        r"""
         removeMasks(DetectorMask self)
-
         void DetectorMask::removeMasks()
 
         remove all masks and return object to initial state 
@@ -8569,11 +6907,9 @@ class DetectorMask(_object):
         """
         return _libBornAgainCore.DetectorMask_removeMasks(self)
 
-
     def hasMasks(self):
-        """
+        r"""
         hasMasks(DetectorMask self) -> bool
-
         bool DetectorMask::hasMasks() const
 
         returns true if has masks 
@@ -8581,43 +6917,36 @@ class DetectorMask(_object):
         """
         return _libBornAgainCore.DetectorMask_hasMasks(self)
 
-
     def numberOfMaskedChannels(self):
-        """
+        r"""
         numberOfMaskedChannels(DetectorMask self) -> int
-
         int DetectorMask::numberOfMaskedChannels() const
 
         """
         return _libBornAgainCore.DetectorMask_numberOfMaskedChannels(self)
 
-
     def numberOfMasks(self):
-        """
+        r"""
         numberOfMasks(DetectorMask self) -> size_t
-
         size_t DetectorMask::numberOfMasks() const
 
         """
         return _libBornAgainCore.DetectorMask_numberOfMasks(self)
 
-
     def getMaskShape(self, mask_index, mask_value):
-        """
+        r"""
         getMaskShape(DetectorMask self, size_t mask_index, bool & mask_value) -> IShape2D
-
         const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const
 
         """
         return _libBornAgainCore.DetectorMask_getMaskShape(self, mask_index, mask_value)
-
     __swig_destroy__ = _libBornAgainCore.delete_DetectorMask
-    __del__ = lambda self: None
-DetectorMask_swigregister = _libBornAgainCore.DetectorMask_swigregister
-DetectorMask_swigregister(DetectorMask)
+
+# Register DetectorMask in _libBornAgainCore:
+_libBornAgainCore.DetectorMask_swigregister(DetectorMask)
 
 class Ellipse(IShape2D):
-    """
+    r"""
 
 
     Ellipse shape.
@@ -8626,21 +6955,12 @@ class Ellipse(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Ellipse, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Ellipse, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, xcenter, ycenter, xradius, yradius, theta=0.0):
-        """
+        r"""
         __init__(Ellipse self, double xcenter, double ycenter, double xradius, double yradius, double theta=0.0) -> Ellipse
-        __init__(Ellipse self, double xcenter, double ycenter, double xradius, double yradius) -> Ellipse
-
         Ellipse::Ellipse(double xcenter, double ycenter, double xradius, double yradius, double theta=0.0)
 
         Parameters:
@@ -8662,27 +6982,20 @@ class Ellipse(IShape2D):
         Angle of  Ellipse rotation in radians 
 
         """
-        this = _libBornAgainCore.new_Ellipse(xcenter, ycenter, xradius, yradius, theta)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Ellipse_swiginit(self, _libBornAgainCore.new_Ellipse(xcenter, ycenter, xradius, yradius, theta))
 
     def clone(self):
-        """
+        r"""
         clone(Ellipse self) -> Ellipse
-
         Ellipse* Ellipse::clone() const
 
         """
         return _libBornAgainCore.Ellipse_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(Ellipse self, double x, double y) -> bool
         contains(Ellipse self, Bin1D binx, Bin1D biny) -> bool
-
         bool Ellipse::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of ellipse; more precisely, if mid point of two bins satisfy this condition. 
@@ -8690,63 +7003,52 @@ class Ellipse(IShape2D):
         """
         return _libBornAgainCore.Ellipse_contains(self, *args)
 
-
     def getCenterX(self):
-        """
+        r"""
         getCenterX(Ellipse self) -> double
-
         double Ellipse::getCenterX() const
 
         """
         return _libBornAgainCore.Ellipse_getCenterX(self)
 
-
     def getCenterY(self):
-        """
+        r"""
         getCenterY(Ellipse self) -> double
-
         double Ellipse::getCenterY() const
 
         """
         return _libBornAgainCore.Ellipse_getCenterY(self)
 
-
     def getRadiusX(self):
-        """
+        r"""
         getRadiusX(Ellipse self) -> double
-
         double Ellipse::getRadiusX() const
 
         """
         return _libBornAgainCore.Ellipse_getRadiusX(self)
 
-
     def getRadiusY(self):
-        """
+        r"""
         getRadiusY(Ellipse self) -> double
-
         double Ellipse::getRadiusY() const
 
         """
         return _libBornAgainCore.Ellipse_getRadiusY(self)
 
-
     def getTheta(self):
-        """
+        r"""
         getTheta(Ellipse self) -> double
-
         double Ellipse::getTheta() const
 
         """
         return _libBornAgainCore.Ellipse_getTheta(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_Ellipse
-    __del__ = lambda self: None
-Ellipse_swigregister = _libBornAgainCore.Ellipse_swigregister
-Ellipse_swigregister(Ellipse)
+
+# Register Ellipse in _libBornAgainCore:
+_libBornAgainCore.Ellipse_swigregister(Ellipse)
 
 class IFTDecayFunction1D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for a one-dimensional decay function, with evaluate(q) returning the Fourier transform, normalized to  $\\int dq\\; {\\rm evaluate}(q) = 1$.
@@ -8755,55 +7057,42 @@ class IFTDecayFunction1D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFTDecayFunction1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFTDecayFunction1D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IFTDecayFunction1D self) -> IFTDecayFunction1D
-
         virtual IFTDecayFunction1D* IFTDecayFunction1D::clone() const =0
 
         """
         return _libBornAgainCore.IFTDecayFunction1D_clone(self)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(IFTDecayFunction1D self, double q) -> double
-
         virtual double IFTDecayFunction1D::evaluate(double q) const =0
 
         """
         return _libBornAgainCore.IFTDecayFunction1D_evaluate(self, q)
 
-
     def decayLength(self):
-        """
+        r"""
         decayLength(IFTDecayFunction1D self) -> double
-
         double IFTDecayFunction1D::decayLength() const
 
         """
         return _libBornAgainCore.IFTDecayFunction1D_decayLength(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IFTDecayFunction1D
-    __del__ = lambda self: None
-IFTDecayFunction1D_swigregister = _libBornAgainCore.IFTDecayFunction1D_swigregister
-IFTDecayFunction1D_swigregister(IFTDecayFunction1D)
+
+# Register IFTDecayFunction1D in _libBornAgainCore:
+_libBornAgainCore.IFTDecayFunction1D_swigregister(IFTDecayFunction1D)
 
 class FTDecayFunction1DCauchy(IFTDecayFunction1D):
-    """
+    r"""
 
 
     One-dimensional Cauchy decay function in reciprocal space; corresponds to exp(-|x|/decay_length) in real space.
@@ -8812,43 +7101,28 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction1DCauchy, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction1DCauchy, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length):
-        """
+        r"""
         __init__(FTDecayFunction1DCauchy self, double decay_length) -> FTDecayFunction1DCauchy
-
         FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction1DCauchy(decay_length)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction1DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DCauchy(decay_length))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction1DCauchy self) -> FTDecayFunction1DCauchy
-
         FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction1DCauchy_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction1DCauchy self, INodeVisitor visitor)
-
         void FTDecayFunction1DCauchy::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8856,23 +7130,20 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
         """
         return _libBornAgainCore.FTDecayFunction1DCauchy_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDecayFunction1DCauchy self, double q) -> double
-
         double FTDecayFunction1DCauchy::evaluate(double q) const final
 
         """
         return _libBornAgainCore.FTDecayFunction1DCauchy_evaluate(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DCauchy
-    __del__ = lambda self: None
-FTDecayFunction1DCauchy_swigregister = _libBornAgainCore.FTDecayFunction1DCauchy_swigregister
-FTDecayFunction1DCauchy_swigregister(FTDecayFunction1DCauchy)
+
+# Register FTDecayFunction1DCauchy in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction1DCauchy_swigregister(FTDecayFunction1DCauchy)
 
 class FTDecayFunction1DGauss(IFTDecayFunction1D):
-    """
+    r"""
 
 
     One-dimensional Gauss decay function in reciprocal space; corresponds to exp[-x^2/(2*decay_length^2)] in real space.
@@ -8881,43 +7152,28 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction1DGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction1DGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length):
-        """
+        r"""
         __init__(FTDecayFunction1DGauss self, double decay_length) -> FTDecayFunction1DGauss
-
         FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction1DGauss(decay_length)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction1DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DGauss(decay_length))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction1DGauss self) -> FTDecayFunction1DGauss
-
         FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction1DGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction1DGauss self, INodeVisitor visitor)
-
         void FTDecayFunction1DGauss::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8925,23 +7181,20 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
         """
         return _libBornAgainCore.FTDecayFunction1DGauss_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDecayFunction1DGauss self, double q) -> double
-
         double FTDecayFunction1DGauss::evaluate(double q) const final
 
         """
         return _libBornAgainCore.FTDecayFunction1DGauss_evaluate(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DGauss
-    __del__ = lambda self: None
-FTDecayFunction1DGauss_swigregister = _libBornAgainCore.FTDecayFunction1DGauss_swigregister
-FTDecayFunction1DGauss_swigregister(FTDecayFunction1DGauss)
+
+# Register FTDecayFunction1DGauss in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction1DGauss_swigregister(FTDecayFunction1DGauss)
 
 class FTDecayFunction1DTriangle(IFTDecayFunction1D):
-    """
+    r"""
 
 
     One-dimensional triangle decay function in reciprocal space; corresponds to 1-|x|/decay_length if |x|<decay_length (and 0 otherwise) in real space.
@@ -8950,43 +7203,28 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction1DTriangle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction1DTriangle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length):
-        """
+        r"""
         __init__(FTDecayFunction1DTriangle self, double decay_length) -> FTDecayFunction1DTriangle
-
         FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction1DTriangle(decay_length)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction1DTriangle_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DTriangle(decay_length))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction1DTriangle self) -> FTDecayFunction1DTriangle
-
         FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction1DTriangle_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction1DTriangle self, INodeVisitor visitor)
-
         void FTDecayFunction1DTriangle::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -8994,23 +7232,20 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
         """
         return _libBornAgainCore.FTDecayFunction1DTriangle_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDecayFunction1DTriangle self, double q) -> double
-
         double FTDecayFunction1DTriangle::evaluate(double q) const final
 
         """
         return _libBornAgainCore.FTDecayFunction1DTriangle_evaluate(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DTriangle
-    __del__ = lambda self: None
-FTDecayFunction1DTriangle_swigregister = _libBornAgainCore.FTDecayFunction1DTriangle_swigregister
-FTDecayFunction1DTriangle_swigregister(FTDecayFunction1DTriangle)
+
+# Register FTDecayFunction1DTriangle in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction1DTriangle_swigregister(FTDecayFunction1DTriangle)
 
 class FTDecayFunction1DVoigt(IFTDecayFunction1D):
-    """
+    r"""
 
 
     One-dimensional pseudo-Voigt decay function in reciprocal space; corresponds to eta*Gauss + (1-eta)*Cauchy.
@@ -9019,20 +7254,12 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction1DVoigt, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction1DVoigt, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length, eta):
-        """
+        r"""
         __init__(FTDecayFunction1DVoigt self, double decay_length, double eta) -> FTDecayFunction1DVoigt
-
         FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double decay_length, double eta)
 
         Constructor of pseudo-Voigt decay function.
@@ -9047,26 +7274,19 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
         parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0) 
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction1DVoigt(decay_length, eta)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction1DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DVoigt(decay_length, eta))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction1DVoigt self) -> FTDecayFunction1DVoigt
-
         FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction1DVoigt_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction1DVoigt self, INodeVisitor visitor)
-
         void FTDecayFunction1DVoigt::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -9074,33 +7294,28 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
         """
         return _libBornAgainCore.FTDecayFunction1DVoigt_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDecayFunction1DVoigt self, double q) -> double
-
         double FTDecayFunction1DVoigt::evaluate(double q) const final
 
         """
         return _libBornAgainCore.FTDecayFunction1DVoigt_evaluate(self, q)
 
-
     def eEta(self):
-        """
+        r"""
         eEta(FTDecayFunction1DVoigt self) -> double
-
         double FTDecayFunction1DVoigt::eEta() const
 
         """
         return _libBornAgainCore.FTDecayFunction1DVoigt_eEta(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DVoigt
-    __del__ = lambda self: None
-FTDecayFunction1DVoigt_swigregister = _libBornAgainCore.FTDecayFunction1DVoigt_swigregister
-FTDecayFunction1DVoigt_swigregister(FTDecayFunction1DVoigt)
+
+# Register FTDecayFunction1DVoigt in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction1DVoigt_swigregister(FTDecayFunction1DVoigt)
 
 class IFTDecayFunction2D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for two-dimensional decay function in reciprocal space.
@@ -9109,33 +7324,23 @@ class IFTDecayFunction2D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFTDecayFunction2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFTDecayFunction2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IFTDecayFunction2D self) -> IFTDecayFunction2D
-
         virtual IFTDecayFunction2D* IFTDecayFunction2D::clone() const =0
 
         """
         return _libBornAgainCore.IFTDecayFunction2D_clone(self)
 
-
     def setGamma(self, gamma):
-        """
+        r"""
         setGamma(IFTDecayFunction2D self, double gamma)
-
         void IFTDecayFunction2D::setGamma(double gamma)
 
         set angle between first lattice vector and X-axis of distribution (both in direct space) 
@@ -9143,11 +7348,9 @@ class IFTDecayFunction2D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDecayFunction2D_setGamma(self, gamma)
 
-
     def gamma(self):
-        """
+        r"""
         gamma(IFTDecayFunction2D self) -> double
-
         double IFTDecayFunction2D::gamma() const
 
         get angle between first lattice vector and X-axis of distribution (both in direct space) 
@@ -9155,11 +7358,9 @@ class IFTDecayFunction2D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDecayFunction2D_gamma(self)
 
-
     def decayLengthX(self):
-        """
+        r"""
         decayLengthX(IFTDecayFunction2D self) -> double
-
         double IFTDecayFunction2D::decayLengthX() const
 
         get decay length in distribution's X-direction 
@@ -9167,11 +7368,9 @@ class IFTDecayFunction2D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDecayFunction2D_decayLengthX(self)
 
-
     def decayLengthY(self):
-        """
+        r"""
         decayLengthY(IFTDecayFunction2D self) -> double
-
         double IFTDecayFunction2D::decayLengthY() const
 
         get decay length in distribution's Y-direction 
@@ -9179,11 +7378,9 @@ class IFTDecayFunction2D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDecayFunction2D_decayLengthY(self)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(IFTDecayFunction2D self, double qx, double qy) -> double
-
         virtual double IFTDecayFunction2D::evaluate(double qx, double qy) const =0
 
         evaluate Fourier transformed decay function for q in X,Y coordinates 
@@ -9191,11 +7388,9 @@ class IFTDecayFunction2D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDecayFunction2D_evaluate(self, qx, qy)
 
-
     def boundingReciprocalLatticeCoordinates(self, qX, qY, a, b, alpha):
-        """
+        r"""
         boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pair_double_t
-
         std::pair< double, double > IFTDecayFunction2D::boundingReciprocalLatticeCoordinates(double qX, double qY, double a, double b, double alpha) const
 
         transform back to a*, b* basis:
@@ -9204,14 +7399,13 @@ class IFTDecayFunction2D(ICloneable, INode):
 
         """
         return _libBornAgainCore.IFTDecayFunction2D_boundingReciprocalLatticeCoordinates(self, qX, qY, a, b, alpha)
-
     __swig_destroy__ = _libBornAgainCore.delete_IFTDecayFunction2D
-    __del__ = lambda self: None
-IFTDecayFunction2D_swigregister = _libBornAgainCore.IFTDecayFunction2D_swigregister
-IFTDecayFunction2D_swigregister(IFTDecayFunction2D)
+
+# Register IFTDecayFunction2D in _libBornAgainCore:
+_libBornAgainCore.IFTDecayFunction2D_swigregister(IFTDecayFunction2D)
 
 class FTDecayFunction2DCauchy(IFTDecayFunction2D):
-    """
+    r"""
 
 
     Two-dimensional Cauchy decay function in reciprocal space; corresponds to exp(-r) in real space, with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -9220,44 +7414,28 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction2DCauchy, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction2DCauchy, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length_x, decay_length_y, gamma=0):
-        """
+        r"""
         __init__(FTDecayFunction2DCauchy self, double decay_length_x, double decay_length_y, double gamma=0) -> FTDecayFunction2DCauchy
-        __init__(FTDecayFunction2DCauchy self, double decay_length_x, double decay_length_y) -> FTDecayFunction2DCauchy
-
         FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction2DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction2DCauchy self) -> FTDecayFunction2DCauchy
-
         FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction2DCauchy_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction2DCauchy self, INodeVisitor visitor)
-
         void FTDecayFunction2DCauchy::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -9265,25 +7443,22 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
         """
         return _libBornAgainCore.FTDecayFunction2DCauchy_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDecayFunction2DCauchy self, double qx, double qy) -> double
-
         double FTDecayFunction2DCauchy::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed decay function for q in X,Y coordinates 
 
         """
         return _libBornAgainCore.FTDecayFunction2DCauchy_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DCauchy
-    __del__ = lambda self: None
-FTDecayFunction2DCauchy_swigregister = _libBornAgainCore.FTDecayFunction2DCauchy_swigregister
-FTDecayFunction2DCauchy_swigregister(FTDecayFunction2DCauchy)
+
+# Register FTDecayFunction2DCauchy in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction2DCauchy_swigregister(FTDecayFunction2DCauchy)
 
 class FTDecayFunction2DGauss(IFTDecayFunction2D):
-    """
+    r"""
 
 
     Two-dimensional Gauss decay function in reciprocal space; corresponds to exp(-r^2/2) in real space, with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -9292,44 +7467,28 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction2DGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction2DGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length_x, decay_length_y, gamma=0):
-        """
+        r"""
         __init__(FTDecayFunction2DGauss self, double decay_length_x, double decay_length_y, double gamma=0) -> FTDecayFunction2DGauss
-        __init__(FTDecayFunction2DGauss self, double decay_length_x, double decay_length_y) -> FTDecayFunction2DGauss
-
         FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction2DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction2DGauss self) -> FTDecayFunction2DGauss
-
         FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction2DGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction2DGauss self, INodeVisitor visitor)
-
         void FTDecayFunction2DGauss::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -9337,25 +7496,22 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
         """
         return _libBornAgainCore.FTDecayFunction2DGauss_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDecayFunction2DGauss self, double qx, double qy) -> double
-
         double FTDecayFunction2DGauss::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed decay function for q in X,Y coordinates 
 
         """
         return _libBornAgainCore.FTDecayFunction2DGauss_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DGauss
-    __del__ = lambda self: None
-FTDecayFunction2DGauss_swigregister = _libBornAgainCore.FTDecayFunction2DGauss_swigregister
-FTDecayFunction2DGauss_swigregister(FTDecayFunction2DGauss)
+
+# Register FTDecayFunction2DGauss in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction2DGauss_swigregister(FTDecayFunction2DGauss)
 
 class FTDecayFunction2DVoigt(IFTDecayFunction2D):
-    """
+    r"""
 
 
     Two-dimensional pseudo-Voigt decay function in reciprocal space; corresponds to eta*Gauss + (1-eta)*Cauchy.
@@ -9364,21 +7520,12 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDecayFunction2DVoigt, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDecayFunction2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDecayFunction2DVoigt, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, decay_length_x, decay_length_y, eta, gamma=0):
-        """
+        r"""
         __init__(FTDecayFunction2DVoigt self, double decay_length_x, double decay_length_y, double eta, double gamma=0) -> FTDecayFunction2DVoigt
-        __init__(FTDecayFunction2DVoigt self, double decay_length_x, double decay_length_y, double eta) -> FTDecayFunction2DVoigt
-
         FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)
 
         Constructor of two-dimensional pseudo-Voigt decay function in reciprocal space.
@@ -9399,26 +7546,19 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
         distribution orientation with respect to the first lattice vector in radians 
 
         """
-        this = _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, eta, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDecayFunction2DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, eta, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDecayFunction2DVoigt self) -> FTDecayFunction2DVoigt
-
         FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
 
         """
         return _libBornAgainCore.FTDecayFunction2DVoigt_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDecayFunction2DVoigt self, INodeVisitor visitor)
-
         void FTDecayFunction2DVoigt::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -9426,11 +7566,9 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
         """
         return _libBornAgainCore.FTDecayFunction2DVoigt_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDecayFunction2DVoigt self, double qx, double qy) -> double
-
         double FTDecayFunction2DVoigt::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed decay function for q in X,Y coordinates 
@@ -9438,23 +7576,20 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
         """
         return _libBornAgainCore.FTDecayFunction2DVoigt_evaluate(self, qx, qy)
 
-
     def eta(self):
-        """
+        r"""
         eta(FTDecayFunction2DVoigt self) -> double
-
         double FTDecayFunction2DVoigt::eta() const
 
         """
         return _libBornAgainCore.FTDecayFunction2DVoigt_eta(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DVoigt
-    __del__ = lambda self: None
-FTDecayFunction2DVoigt_swigregister = _libBornAgainCore.FTDecayFunction2DVoigt_swigregister
-FTDecayFunction2DVoigt_swigregister(FTDecayFunction2DVoigt)
+
+# Register FTDecayFunction2DVoigt in _libBornAgainCore:
+_libBornAgainCore.FTDecayFunction2DVoigt_swigregister(FTDecayFunction2DVoigt)
 
 class IFTDistribution1D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for a one-dimensional distribution, with normalization adjusted so that the Fourier transform evaluate(q) is a decay function that starts at evaluate(0)=1.
@@ -9463,35 +7598,24 @@ class IFTDistribution1D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFTDistribution1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFTDistribution1D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IFTDistribution1D
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IFTDistribution1D self) -> IFTDistribution1D
-
         virtual IFTDistribution1D* IFTDistribution1D::clone() const =0
 
         """
         return _libBornAgainCore.IFTDistribution1D_clone(self)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(IFTDistribution1D self, double q) -> double
-
         virtual double IFTDistribution1D::evaluate(double q) const =0
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9499,31 +7623,25 @@ class IFTDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDistribution1D_evaluate(self, q)
 
-
     def setOmega(self, omega):
-        """
+        r"""
         setOmega(IFTDistribution1D self, double omega)
-
         void IFTDistribution1D::setOmega(double omega)
 
         """
         return _libBornAgainCore.IFTDistribution1D_setOmega(self, omega)
 
-
     def omega(self):
-        """
+        r"""
         omega(IFTDistribution1D self) -> double
-
         double IFTDistribution1D::omega() const
 
         """
         return _libBornAgainCore.IFTDistribution1D_omega(self)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(IFTDistribution1D self) -> double
-
         virtual double IFTDistribution1D::qSecondDerivative() const =0
 
         Returns the negative of the second order derivative in q space around q=0. 
@@ -9531,11 +7649,11 @@ class IFTDistribution1D(ICloneable, INode):
         """
         return _libBornAgainCore.IFTDistribution1D_qSecondDerivative(self)
 
-IFTDistribution1D_swigregister = _libBornAgainCore.IFTDistribution1D_swigregister
-IFTDistribution1D_swigregister(IFTDistribution1D)
+# Register IFTDistribution1D in _libBornAgainCore:
+_libBornAgainCore.IFTDistribution1D_swigregister(IFTDistribution1D)
 
 class FTDistribution1DCauchy(IFTDistribution1D):
-    """
+    r"""
 
 
     Exponential  IFTDistribution1D exp(-|omega*x|); its Fourier transform evaluate(q) is a Cauchy-Lorentzian starting at evaluate(0)=1.
@@ -9544,43 +7662,28 @@ class FTDistribution1DCauchy(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DCauchy, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DCauchy, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega):
-        """
+        r"""
         __init__(FTDistribution1DCauchy self, double omega) -> FTDistribution1DCauchy
-
         FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DCauchy(omega)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution1DCauchy(omega))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DCauchy self) -> FTDistribution1DCauchy
-
         FTDistribution1DCauchy * FTDistribution1DCauchy::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DCauchy_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DCauchy self, INodeVisitor visitor)
-
         void FTDistribution1DCauchy::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -9588,11 +7691,9 @@ class FTDistribution1DCauchy(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DCauchy_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DCauchy self, double q) -> double
-
         double FTDistribution1DCauchy::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9600,25 +7701,22 @@ class FTDistribution1DCauchy(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DCauchy_evaluate(self, q)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DCauchy self) -> double
-
         double FTDistribution1DCauchy::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DCauchy_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DCauchy
-    __del__ = lambda self: None
-FTDistribution1DCauchy_swigregister = _libBornAgainCore.FTDistribution1DCauchy_swigregister
-FTDistribution1DCauchy_swigregister(FTDistribution1DCauchy)
+
+# Register FTDistribution1DCauchy in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DCauchy_swigregister(FTDistribution1DCauchy)
 
 class FTDistribution1DGauss(IFTDistribution1D):
-    """
+    r"""
 
 
     Gaussian  IFTDistribution1D; its Fourier transform evaluate(q) is a Gaussian starting at evaluate(0)=1.
@@ -9627,43 +7725,28 @@ class FTDistribution1DGauss(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega):
-        """
+        r"""
         __init__(FTDistribution1DGauss self, double omega) -> FTDistribution1DGauss
-
         FTDistribution1DGauss::FTDistribution1DGauss(double omega)
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DGauss(omega)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution1DGauss(omega))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DGauss self) -> FTDistribution1DGauss
-
         FTDistribution1DGauss * FTDistribution1DGauss::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DGauss self, INodeVisitor visitor)
-
         void FTDistribution1DGauss::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -9671,11 +7754,9 @@ class FTDistribution1DGauss(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DGauss_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DGauss self, double q) -> double
-
         double FTDistribution1DGauss::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9683,25 +7764,22 @@ class FTDistribution1DGauss(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DGauss_evaluate(self, q)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DGauss self) -> double
-
         double FTDistribution1DGauss::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DGauss_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DGauss
-    __del__ = lambda self: None
-FTDistribution1DGauss_swigregister = _libBornAgainCore.FTDistribution1DGauss_swigregister
-FTDistribution1DGauss_swigregister(FTDistribution1DGauss)
+
+# Register FTDistribution1DGauss in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DGauss_swigregister(FTDistribution1DGauss)
 
 class FTDistribution1DGate(IFTDistribution1D):
-    """
+    r"""
 
 
     Square gate  IFTDistribution1D; its Fourier transform evaluate(q) is a sinc function starting at evaluate(0)=1.
@@ -9710,43 +7788,28 @@ class FTDistribution1DGate(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DGate, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DGate, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega):
-        """
+        r"""
         __init__(FTDistribution1DGate self, double omega) -> FTDistribution1DGate
-
         FTDistribution1DGate::FTDistribution1DGate(double omega)
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DGate(omega)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DGate_swiginit(self, _libBornAgainCore.new_FTDistribution1DGate(omega))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DGate self) -> FTDistribution1DGate
-
         FTDistribution1DGate * FTDistribution1DGate::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DGate_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DGate self, INodeVisitor visitor)
-
         void FTDistribution1DGate::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -9754,11 +7817,9 @@ class FTDistribution1DGate(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DGate_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DGate self, double q) -> double
-
         double FTDistribution1DGate::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9766,25 +7827,22 @@ class FTDistribution1DGate(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DGate_evaluate(self, q)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DGate self) -> double
-
         double FTDistribution1DGate::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DGate_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DGate
-    __del__ = lambda self: None
-FTDistribution1DGate_swigregister = _libBornAgainCore.FTDistribution1DGate_swigregister
-FTDistribution1DGate_swigregister(FTDistribution1DGate)
+
+# Register FTDistribution1DGate in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DGate_swigregister(FTDistribution1DGate)
 
 class FTDistribution1DTriangle(IFTDistribution1D):
-    """
+    r"""
 
 
     Triangle IFTDistribution1D [1-|x|/omega if |x|<omega, and 0 otherwise]; its Fourier transform evaluate(q) is a squared sinc function starting at evaluate(0)=1.
@@ -9793,43 +7851,28 @@ class FTDistribution1DTriangle(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DTriangle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DTriangle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega):
-        """
+        r"""
         __init__(FTDistribution1DTriangle self, double omega) -> FTDistribution1DTriangle
-
         FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DTriangle(omega)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DTriangle_swiginit(self, _libBornAgainCore.new_FTDistribution1DTriangle(omega))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DTriangle self) -> FTDistribution1DTriangle
-
         FTDistribution1DTriangle * FTDistribution1DTriangle::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DTriangle_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DTriangle self, INodeVisitor visitor)
-
         void FTDistribution1DTriangle::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -9837,11 +7880,9 @@ class FTDistribution1DTriangle(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DTriangle_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DTriangle self, double q) -> double
-
         double FTDistribution1DTriangle::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9849,25 +7890,22 @@ class FTDistribution1DTriangle(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DTriangle_evaluate(self, q)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DTriangle self) -> double
-
         double FTDistribution1DTriangle::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DTriangle_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DTriangle
-    __del__ = lambda self: None
-FTDistribution1DTriangle_swigregister = _libBornAgainCore.FTDistribution1DTriangle_swigregister
-FTDistribution1DTriangle_swigregister(FTDistribution1DTriangle)
+
+# Register FTDistribution1DTriangle in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DTriangle_swigregister(FTDistribution1DTriangle)
 
 class FTDistribution1DCosine(IFTDistribution1D):
-    """
+    r"""
 
 
     IFTDistribution1D consisting of one cosine wave [1+cos(pi*x/omega) if |x|<omega, and 0 otherwise]; its Fourier transform evaluate(q) starts at evaluate(0)=1.
@@ -9876,43 +7914,28 @@ class FTDistribution1DCosine(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DCosine, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DCosine, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega):
-        """
+        r"""
         __init__(FTDistribution1DCosine self, double omega) -> FTDistribution1DCosine
-
         FTDistribution1DCosine::FTDistribution1DCosine(double omega)
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DCosine(omega)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DCosine_swiginit(self, _libBornAgainCore.new_FTDistribution1DCosine(omega))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DCosine self) -> FTDistribution1DCosine
-
         FTDistribution1DCosine * FTDistribution1DCosine::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DCosine_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DCosine self, INodeVisitor visitor)
-
         void FTDistribution1DCosine::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -9920,11 +7943,9 @@ class FTDistribution1DCosine(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DCosine_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DCosine self, double q) -> double
-
         double FTDistribution1DCosine::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -9932,25 +7953,22 @@ class FTDistribution1DCosine(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DCosine_evaluate(self, q)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DCosine self) -> double
-
         double FTDistribution1DCosine::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DCosine_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DCosine
-    __del__ = lambda self: None
-FTDistribution1DCosine_swigregister = _libBornAgainCore.FTDistribution1DCosine_swigregister
-FTDistribution1DCosine_swigregister(FTDistribution1DCosine)
+
+# Register FTDistribution1DCosine in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DCosine_swigregister(FTDistribution1DCosine)
 
 class FTDistribution1DVoigt(IFTDistribution1D):
-    """
+    r"""
 
 
     IFTDistribution1D that provides a Fourier transform evaluate(q) in form of a pseudo-Voigt decay function eta*Gauss + (1-eta)*Cauchy, with both components starting at 1 for q=0.
@@ -9959,20 +7977,12 @@ class FTDistribution1DVoigt(IFTDistribution1D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution1DVoigt, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution1D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution1DVoigt, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega, eta):
-        """
+        r"""
         __init__(FTDistribution1DVoigt self, double omega, double eta) -> FTDistribution1DVoigt
-
         FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)
 
         Constructor of one-dimensional pseudo-Voigt probability distribution.
@@ -9987,26 +7997,19 @@ class FTDistribution1DVoigt(IFTDistribution1D):
         parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0) 
 
         """
-        this = _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution1DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution1DVoigt self) -> FTDistribution1DVoigt
-
         FTDistribution1DVoigt * FTDistribution1DVoigt::clone() const override final
 
         """
         return _libBornAgainCore.FTDistribution1DVoigt_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution1DVoigt self, INodeVisitor visitor)
-
         void FTDistribution1DVoigt::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -10014,11 +8017,9 @@ class FTDistribution1DVoigt(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DVoigt_accept(self, visitor)
 
-
     def evaluate(self, q):
-        """
+        r"""
         evaluate(FTDistribution1DVoigt self, double q) -> double
-
         double FTDistribution1DVoigt::evaluate(double q) const override final
 
         Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. 
@@ -10026,35 +8027,30 @@ class FTDistribution1DVoigt(IFTDistribution1D):
         """
         return _libBornAgainCore.FTDistribution1DVoigt_evaluate(self, q)
 
-
     def eta(self):
-        """
+        r"""
         eta(FTDistribution1DVoigt self) -> double
-
         double FTDistribution1DVoigt::eta() const
 
         """
         return _libBornAgainCore.FTDistribution1DVoigt_eta(self)
 
-
     def qSecondDerivative(self):
-        """
+        r"""
         qSecondDerivative(FTDistribution1DVoigt self) -> double
-
         double FTDistribution1DVoigt::qSecondDerivative() const override final
 
         Returns the negative of the second order derivative in q space around q=0. 
 
         """
         return _libBornAgainCore.FTDistribution1DVoigt_qSecondDerivative(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DVoigt
-    __del__ = lambda self: None
-FTDistribution1DVoigt_swigregister = _libBornAgainCore.FTDistribution1DVoigt_swigregister
-FTDistribution1DVoigt_swigregister(FTDistribution1DVoigt)
+
+# Register FTDistribution1DVoigt in _libBornAgainCore:
+_libBornAgainCore.FTDistribution1DVoigt_swigregister(FTDistribution1DVoigt)
 
 class IFTDistribution2D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for two-dimensional distributions in Fourier space.
@@ -10063,97 +8059,76 @@ class IFTDistribution2D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFTDistribution2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFTDistribution2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IFTDistribution2D self) -> IFTDistribution2D
-
         IFTDistribution2D* IFTDistribution2D::clone() const =0
 
         """
         return _libBornAgainCore.IFTDistribution2D_clone(self)
 
-
     def setGamma(self, gamma):
-        """
+        r"""
         setGamma(IFTDistribution2D self, double gamma)
-
         void IFTDistribution2D::setGamma(double gamma)
 
         """
         return _libBornAgainCore.IFTDistribution2D_setGamma(self, gamma)
 
-
     def gamma(self):
-        """
+        r"""
         gamma(IFTDistribution2D self) -> double
-
         double IFTDistribution2D::gamma() const
 
         """
         return _libBornAgainCore.IFTDistribution2D_gamma(self)
 
-
     def delta(self):
-        """
+        r"""
         delta(IFTDistribution2D self) -> double
-
         double IFTDistribution2D::delta() const
 
         """
         return _libBornAgainCore.IFTDistribution2D_delta(self)
 
-
     def omegaX(self):
-        """
+        r"""
         omegaX(IFTDistribution2D self) -> double
-
         double IFTDistribution2D::omegaX() const
 
         """
         return _libBornAgainCore.IFTDistribution2D_omegaX(self)
 
-
     def omegaY(self):
-        """
+        r"""
         omegaY(IFTDistribution2D self) -> double
-
         double IFTDistribution2D::omegaY() const
 
         """
         return _libBornAgainCore.IFTDistribution2D_omegaY(self)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(IFTDistribution2D self, double qx, double qy) -> double
-
         virtual double IFTDistribution2D::evaluate(double qx, double qy) const =0
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
 
         """
         return _libBornAgainCore.IFTDistribution2D_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_IFTDistribution2D
-    __del__ = lambda self: None
-IFTDistribution2D_swigregister = _libBornAgainCore.IFTDistribution2D_swigregister
-IFTDistribution2D_swigregister(IFTDistribution2D)
+
+# Register IFTDistribution2D in _libBornAgainCore:
+_libBornAgainCore.IFTDistribution2D_swigregister(IFTDistribution2D)
 
 class FTDistribution2DCauchy(IFTDistribution2D):
-    """
+    r"""
 
 
     Two-dimensional Cauchy distribution in Fourier space; corresponds to a normalized exp(-r) in real space, with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -10162,44 +8137,28 @@ class FTDistribution2DCauchy(IFTDistribution2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution2DCauchy, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution2DCauchy, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega_x, omega_y, gamma=0):
-        """
+        r"""
         __init__(FTDistribution2DCauchy self, double omega_x, double omega_y, double gamma=0) -> FTDistribution2DCauchy
-        __init__(FTDistribution2DCauchy self, double omega_x, double omega_y) -> FTDistribution2DCauchy
-
         FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDistribution2DCauchy(omega_x, omega_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution2DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution2DCauchy(omega_x, omega_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution2DCauchy self) -> FTDistribution2DCauchy
-
         FTDistribution2DCauchy * FTDistribution2DCauchy::clone() const final
 
         """
         return _libBornAgainCore.FTDistribution2DCauchy_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution2DCauchy self, INodeVisitor visitor)
-
         void FTDistribution2DCauchy::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -10207,25 +8166,22 @@ class FTDistribution2DCauchy(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DCauchy_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDistribution2DCauchy self, double qx, double qy) -> double
-
         double FTDistribution2DCauchy::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
 
         """
         return _libBornAgainCore.FTDistribution2DCauchy_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DCauchy
-    __del__ = lambda self: None
-FTDistribution2DCauchy_swigregister = _libBornAgainCore.FTDistribution2DCauchy_swigregister
-FTDistribution2DCauchy_swigregister(FTDistribution2DCauchy)
+
+# Register FTDistribution2DCauchy in _libBornAgainCore:
+_libBornAgainCore.FTDistribution2DCauchy_swigregister(FTDistribution2DCauchy)
 
 class FTDistribution2DGauss(IFTDistribution2D):
-    """
+    r"""
 
 
     Two-dimensional Gauss distribution in Fourier space; corresponds to normalized exp(-r^2/2) in real space with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -10234,44 +8190,28 @@ class FTDistribution2DGauss(IFTDistribution2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution2DGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution2DGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega_x, omega_y, gamma=0):
-        """
+        r"""
         __init__(FTDistribution2DGauss self, double omega_x, double omega_y, double gamma=0) -> FTDistribution2DGauss
-        __init__(FTDistribution2DGauss self, double omega_x, double omega_y) -> FTDistribution2DGauss
-
         FTDistribution2DGauss::FTDistribution2DGauss(double omega_x, double omega_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDistribution2DGauss(omega_x, omega_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution2DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution2DGauss(omega_x, omega_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution2DGauss self) -> FTDistribution2DGauss
-
         FTDistribution2DGauss * FTDistribution2DGauss::clone() const final
 
         """
         return _libBornAgainCore.FTDistribution2DGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution2DGauss self, INodeVisitor visitor)
-
         void FTDistribution2DGauss::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -10279,25 +8219,22 @@ class FTDistribution2DGauss(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DGauss_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDistribution2DGauss self, double qx, double qy) -> double
-
         double FTDistribution2DGauss::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
 
         """
         return _libBornAgainCore.FTDistribution2DGauss_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DGauss
-    __del__ = lambda self: None
-FTDistribution2DGauss_swigregister = _libBornAgainCore.FTDistribution2DGauss_swigregister
-FTDistribution2DGauss_swigregister(FTDistribution2DGauss)
+
+# Register FTDistribution2DGauss in _libBornAgainCore:
+_libBornAgainCore.FTDistribution2DGauss_swigregister(FTDistribution2DGauss)
 
 class FTDistribution2DGate(IFTDistribution2D):
-    """
+    r"""
 
 
     Two-dimensional gate distribution in Fourier space; corresponds to normalized constant if r<1 (and 0 otherwise) in real space, with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -10306,44 +8243,28 @@ class FTDistribution2DGate(IFTDistribution2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution2DGate, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution2DGate, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega_x, omega_y, gamma=0):
-        """
+        r"""
         __init__(FTDistribution2DGate self, double omega_x, double omega_y, double gamma=0) -> FTDistribution2DGate
-        __init__(FTDistribution2DGate self, double omega_x, double omega_y) -> FTDistribution2DGate
-
         FTDistribution2DGate::FTDistribution2DGate(double omega_x, double omega_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDistribution2DGate(omega_x, omega_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution2DGate_swiginit(self, _libBornAgainCore.new_FTDistribution2DGate(omega_x, omega_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution2DGate self) -> FTDistribution2DGate
-
         FTDistribution2DGate * FTDistribution2DGate::clone() const final
 
         """
         return _libBornAgainCore.FTDistribution2DGate_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution2DGate self, INodeVisitor visitor)
-
         void FTDistribution2DGate::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -10351,25 +8272,22 @@ class FTDistribution2DGate(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DGate_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDistribution2DGate self, double qx, double qy) -> double
-
         double FTDistribution2DGate::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
 
         """
         return _libBornAgainCore.FTDistribution2DGate_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DGate
-    __del__ = lambda self: None
-FTDistribution2DGate_swigregister = _libBornAgainCore.FTDistribution2DGate_swigregister
-FTDistribution2DGate_swigregister(FTDistribution2DGate)
+
+# Register FTDistribution2DGate in _libBornAgainCore:
+_libBornAgainCore.FTDistribution2DGate_swigregister(FTDistribution2DGate)
 
 class FTDistribution2DCone(IFTDistribution2D):
-    """
+    r"""
 
 
     Two-dimensional cone distribution in Fourier space; corresponds to 1-r if r<1 (and 0 otherwise) in real space with  $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$.
@@ -10378,44 +8296,28 @@ class FTDistribution2DCone(IFTDistribution2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution2DCone, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution2DCone, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega_x, omega_y, gamma=0):
-        """
+        r"""
         __init__(FTDistribution2DCone self, double omega_x, double omega_y, double gamma=0) -> FTDistribution2DCone
-        __init__(FTDistribution2DCone self, double omega_x, double omega_y) -> FTDistribution2DCone
-
         FTDistribution2DCone::FTDistribution2DCone(double omega_x, double omega_y, double gamma=0)
 
         """
-        this = _libBornAgainCore.new_FTDistribution2DCone(omega_x, omega_y, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution2DCone_swiginit(self, _libBornAgainCore.new_FTDistribution2DCone(omega_x, omega_y, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution2DCone self) -> FTDistribution2DCone
-
         FTDistribution2DCone * FTDistribution2DCone::clone() const final
 
         """
         return _libBornAgainCore.FTDistribution2DCone_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution2DCone self, INodeVisitor visitor)
-
         void FTDistribution2DCone::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -10423,25 +8325,22 @@ class FTDistribution2DCone(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DCone_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDistribution2DCone self, double qx, double qy) -> double
-
         double FTDistribution2DCone::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
 
         """
         return _libBornAgainCore.FTDistribution2DCone_evaluate(self, qx, qy)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DCone
-    __del__ = lambda self: None
-FTDistribution2DCone_swigregister = _libBornAgainCore.FTDistribution2DCone_swigregister
-FTDistribution2DCone_swigregister(FTDistribution2DCone)
+
+# Register FTDistribution2DCone in _libBornAgainCore:
+_libBornAgainCore.FTDistribution2DCone_swigregister(FTDistribution2DCone)
 
 class FTDistribution2DVoigt(IFTDistribution2D):
-    """
+    r"""
 
 
     Two-dimensional Voigt distribution in Fourier space; corresponds to eta*Gauss + (1-eta)*Cauchy
@@ -10450,21 +8349,12 @@ class FTDistribution2DVoigt(IFTDistribution2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FTDistribution2DVoigt, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFTDistribution2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FTDistribution2DVoigt, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, omega_x, omega_y, eta, gamma=0):
-        """
+        r"""
         __init__(FTDistribution2DVoigt self, double omega_x, double omega_y, double eta, double gamma=0) -> FTDistribution2DVoigt
-        __init__(FTDistribution2DVoigt self, double omega_x, double omega_y, double eta) -> FTDistribution2DVoigt
-
         FTDistribution2DVoigt::FTDistribution2DVoigt(double omega_x, double omega_y, double eta, double gamma=0)
 
         Constructor of two-dimensional pseudo-Voigt probability distribution.
@@ -10485,26 +8375,19 @@ class FTDistribution2DVoigt(IFTDistribution2D):
         angle in direct space between first lattice vector and x-axis of the distribution in radians 
 
         """
-        this = _libBornAgainCore.new_FTDistribution2DVoigt(omega_x, omega_y, eta, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FTDistribution2DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution2DVoigt(omega_x, omega_y, eta, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(FTDistribution2DVoigt self) -> FTDistribution2DVoigt
-
         FTDistribution2DVoigt * FTDistribution2DVoigt::clone() const final
 
         """
         return _libBornAgainCore.FTDistribution2DVoigt_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FTDistribution2DVoigt self, INodeVisitor visitor)
-
         void FTDistribution2DVoigt::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -10512,11 +8395,9 @@ class FTDistribution2DVoigt(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DVoigt_accept(self, visitor)
 
-
     def evaluate(self, qx, qy):
-        """
+        r"""
         evaluate(FTDistribution2DVoigt self, double qx, double qy) -> double
-
         double FTDistribution2DVoigt::evaluate(double qx, double qy) const final
 
         evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 
@@ -10524,23 +8405,20 @@ class FTDistribution2DVoigt(IFTDistribution2D):
         """
         return _libBornAgainCore.FTDistribution2DVoigt_evaluate(self, qx, qy)
 
-
     def eta(self):
-        """
+        r"""
         eta(FTDistribution2DVoigt self) -> double
-
         double FTDistribution2DVoigt::eta() const
 
         """
         return _libBornAgainCore.FTDistribution2DVoigt_eta(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DVoigt
-    __del__ = lambda self: None
-FTDistribution2DVoigt_swigregister = _libBornAgainCore.FTDistribution2DVoigt_swigregister
-FTDistribution2DVoigt_swigregister(FTDistribution2DVoigt)
+
+# Register FTDistribution2DVoigt in _libBornAgainCore:
+_libBornAgainCore.FTDistribution2DVoigt_swigregister(FTDistribution2DVoigt)
 
 class FixedBinAxis(IAxis):
-    """
+    r"""
 
 
     Axis with fixed bin size.
@@ -10549,20 +8427,12 @@ class FixedBinAxis(IAxis):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IAxis]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FixedBinAxis, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IAxis]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FixedBinAxis, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, name, nbins, start, end):
-        """
+        r"""
         __init__(FixedBinAxis self, std::string const & name, size_t nbins, double start, double end) -> FixedBinAxis
-
         FixedBinAxis::FixedBinAxis(const std::string &name, size_t nbins, double start, double end)
 
         FixedBinAxis constructor.
@@ -10583,18 +8453,12 @@ class FixedBinAxis(IAxis):
         upper edge of last bin 
 
         """
-        this = _libBornAgainCore.new_FixedBinAxis(name, nbins, start, end)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FixedBinAxis_swiginit(self, _libBornAgainCore.new_FixedBinAxis(name, nbins, start, end))
     __swig_destroy__ = _libBornAgainCore.delete_FixedBinAxis
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(FixedBinAxis self) -> FixedBinAxis
-
         FixedBinAxis * FixedBinAxis::clone() const
 
         clone function 
@@ -10602,11 +8466,9 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_clone(self)
 
-
     def size(self):
-        """
+        r"""
         size(FixedBinAxis self) -> size_t
-
         size_t FixedBinAxis::size() const
 
         retrieve the number of bins 
@@ -10614,11 +8476,9 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_size(self)
 
-
     def getBin(self, index):
-        """
+        r"""
         getBin(FixedBinAxis self, size_t index) -> Bin1D
-
         Bin1D FixedBinAxis::getBin(size_t index) const
 
         retrieve a 1d bin for the given index 
@@ -10626,11 +8486,9 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_getBin(self, index)
 
-
     def getMin(self):
-        """
+        r"""
         getMin(FixedBinAxis self) -> double
-
         double FixedBinAxis::getMin() const
 
         Returns value of first point of axis. 
@@ -10638,11 +8496,9 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_getMin(self)
 
-
     def getMax(self):
-        """
+        r"""
         getMax(FixedBinAxis self) -> double
-
         double FixedBinAxis::getMax() const
 
         Returns value of last point of axis. 
@@ -10650,21 +8506,17 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_getMax(self)
 
-
     def getBinCenter(self, index):
-        """
+        r"""
         getBinCenter(FixedBinAxis self, size_t index) -> double
-
         double FixedBinAxis::getBinCenter(size_t index) const
 
         """
         return _libBornAgainCore.FixedBinAxis_getBinCenter(self, index)
 
-
     def findClosestIndex(self, value):
-        """
+        r"""
         findClosestIndex(FixedBinAxis self, double value) -> size_t
-
         size_t FixedBinAxis::findClosestIndex(double value) const
 
         find bin index which is best match for given value 
@@ -10672,31 +8524,25 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_findClosestIndex(self, value)
 
-
     def getBinCenters(self):
-        """
+        r"""
         getBinCenters(FixedBinAxis self) -> vdouble1d_t
-
         std::vector< double > FixedBinAxis::getBinCenters() const
 
         """
         return _libBornAgainCore.FixedBinAxis_getBinCenters(self)
 
-
     def getBinBoundaries(self):
-        """
+        r"""
         getBinBoundaries(FixedBinAxis self) -> vdouble1d_t
-
         std::vector< double > FixedBinAxis::getBinBoundaries() const
 
         """
         return _libBornAgainCore.FixedBinAxis_getBinBoundaries(self)
 
-
     def createClippedAxis(self, left, right):
-        """
+        r"""
         createClippedAxis(FixedBinAxis self, double left, double right) -> FixedBinAxis
-
         FixedBinAxis * FixedBinAxis::createClippedAxis(double left, double right) const
 
         Creates a new clipped axis. 
@@ -10704,16 +8550,15 @@ class FixedBinAxis(IAxis):
         """
         return _libBornAgainCore.FixedBinAxis_createClippedAxis(self, left, right)
 
-
     def __getitem__(self, i):
-        """__getitem__(FixedBinAxis self, unsigned int i) -> double"""
+        r"""__getitem__(FixedBinAxis self, unsigned int i) -> double"""
         return _libBornAgainCore.FixedBinAxis___getitem__(self, i)
 
-FixedBinAxis_swigregister = _libBornAgainCore.FixedBinAxis_swigregister
-FixedBinAxis_swigregister(FixedBinAxis)
+# Register FixedBinAxis in _libBornAgainCore:
+_libBornAgainCore.FixedBinAxis_swigregister(FixedBinAxis)
 
 class IFormFactor(ISample):
-    """
+    r"""
 
 
     Pure virtual base class for all form factors.
@@ -10726,20 +8571,12 @@ class IFormFactor(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFormFactor, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFormFactor, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(IFormFactor self) -> IFormFactor
-
         IFormFactor::IFormFactor()
 
         """
@@ -10747,18 +8584,12 @@ class IFormFactor(ISample):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_IFormFactor(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IFormFactor_swiginit(self, _libBornAgainCore.new_IFormFactor(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_IFormFactor
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IFormFactor self) -> IFormFactor
-
         IFormFactor* IFormFactor::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -10766,11 +8597,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_clone(self)
 
-
     def createSlicedFormFactor(self, limits, rot, translation):
-        """
+        r"""
         createSlicedFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor
-
         IFormFactor * IFormFactor::createSlicedFormFactor(ZLimits limits, const IRotation &rot, kvector_t translation) const
 
         Creates a (possibly sliced) form factor with the given rotation and translation. 
@@ -10778,11 +8607,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_createSlicedFormFactor(self, limits, rot, translation)
 
-
     def setAmbientMaterial(self, arg0):
-        """
+        r"""
         setAmbientMaterial(IFormFactor self, Material arg0)
-
         virtual void IFormFactor::setAmbientMaterial(Material)=0
 
         Passes the material in which this particle is embedded. 
@@ -10790,11 +8617,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_setAmbientMaterial(self, arg0)
 
-
     def evaluate(self, wavevectors):
-        """
+        r"""
         evaluate(IFormFactor self, WavevectorInfo wavevectors) -> complex_t
-
         virtual complex_t IFormFactor::evaluate(const WavevectorInfo &wavevectors) const =0
 
         Returns scattering amplitude for complex wavevectors ki, kf. 
@@ -10802,11 +8627,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_evaluate(self, wavevectors)
 
-
     def volume(self):
-        """
+        r"""
         volume(IFormFactor self) -> double
-
         double IFormFactor::volume() const
 
         Returns the total volume of the particle of this form factor's shape. 
@@ -10814,11 +8637,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_volume(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(IFormFactor self) -> double
-
         virtual double IFormFactor::radialExtension() const =0
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -10826,11 +8647,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_radialExtension(self)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(IFormFactor self, IRotation rotation) -> double
-
         virtual double IFormFactor::bottomZ(const IRotation &rotation) const =0
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -10838,11 +8657,9 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(IFormFactor self, IRotation rotation) -> double
-
         virtual double IFormFactor::topZ(const IRotation &rotation) const =0
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -10850,130 +8667,109 @@ class IFormFactor(ISample):
         """
         return _libBornAgainCore.IFormFactor_topZ(self, rotation)
 
-
     def canSliceAnalytically(self, rot):
-        """canSliceAnalytically(IFormFactor self, IRotation rot) -> bool"""
+        r"""canSliceAnalytically(IFormFactor self, IRotation rot) -> bool"""
         return _libBornAgainCore.IFormFactor_canSliceAnalytically(self, rot)
 
-
     def sliceFormFactor(self, limits, rot, translation):
-        """sliceFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"""
+        r"""sliceFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"""
         return _libBornAgainCore.IFormFactor_sliceFormFactor(self, limits, rot, translation)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_IFormFactor(self)
-        return weakref_proxy(self)
-IFormFactor_swigregister = _libBornAgainCore.IFormFactor_swigregister
-IFormFactor_swigregister(IFormFactor)
+        return weakref.proxy(self)
+
+# Register IFormFactor in _libBornAgainCore:
+_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)
-class vector_IFormFactorPtr_t(_object):
-    """Proxy of C++ std::vector<(p.IFormFactor)> class."""
+class vector_IFormFactorPtr_t(object):
+    r"""Proxy of C++ std::vector< IFormFactor * > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_IFormFactorPtr_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_IFormFactorPtr_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_IFormFactorPtr_t self) -> SwigPyIterator"""
+        r"""iterator(vector_IFormFactorPtr_t self) -> SwigPyIterator"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_IFormFactorPtr_t self) -> bool"""
+        r"""__nonzero__(vector_IFormFactorPtr_t self) -> bool"""
         return _libBornAgainCore.vector_IFormFactorPtr_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_IFormFactorPtr_t self) -> bool"""
+        r"""__bool__(vector_IFormFactorPtr_t self) -> bool"""
         return _libBornAgainCore.vector_IFormFactorPtr_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
+        r"""__len__(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
         return _libBornAgainCore.vector_IFormFactorPtr_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t"""
+        r"""__getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t"""
         return _libBornAgainCore.vector_IFormFactorPtr_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)
         __setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v)
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)"""
+        r"""__delslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i)
         __delitem__(vector_IFormFactorPtr_t self, PySliceObject * slice)
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_IFormFactorPtr_t self, PySliceObject * slice) -> vector_IFormFactorPtr_t
         __getitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i) -> IFormFactor
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_IFormFactorPtr_t self, PySliceObject * slice, vector_IFormFactorPtr_t v)
         __setitem__(vector_IFormFactorPtr_t self, PySliceObject * slice)
         __setitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, IFormFactor x)
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_IFormFactorPtr_t self) -> IFormFactor"""
+        r"""pop(vector_IFormFactorPtr_t self) -> IFormFactor"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_IFormFactorPtr_t self, IFormFactor x)"""
+        r"""append(vector_IFormFactorPtr_t self, IFormFactor x)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_IFormFactorPtr_t self) -> bool"""
+        r"""empty(vector_IFormFactorPtr_t self) -> bool"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_empty(self)
 
-
     def size(self):
-        """size(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
+        r"""size(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(vector_IFormFactorPtr_t self, vector_IFormFactorPtr_t v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -10981,115 +8777,94 @@ class vector_IFormFactorPtr_t(_object):
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"""
+        r"""begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_begin(self)
 
-
     def end(self):
-        """end(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"""
+        r"""end(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"""
+        r"""rbegin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"""
+        r"""rend(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_IFormFactorPtr_t self)"""
+        r"""clear(vector_IFormFactorPtr_t self)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"""
+        r"""get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_IFormFactorPtr_t self)"""
+        r"""pop_back(vector_IFormFactorPtr_t self)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos) -> std::vector< IFormFactor * >::iterator
         erase(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator first, std::vector< IFormFactor * >::iterator last) -> std::vector< IFormFactor * >::iterator
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_IFormFactorPtr_t self) -> vector_IFormFactorPtr_t
+        __init__(vector_IFormFactorPtr_t self, vector_IFormFactorPtr_t other) -> vector_IFormFactorPtr_t
+        __init__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type size) -> vector_IFormFactorPtr_t
+        __init__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type size, IFormFactor value) -> vector_IFormFactorPtr_t
         """
-        __init__(std::vector<(p.IFormFactor)> self) -> vector_IFormFactorPtr_t
-        __init__(std::vector<(p.IFormFactor)> self, vector_IFormFactorPtr_t arg2) -> vector_IFormFactorPtr_t
-        __init__(std::vector<(p.IFormFactor)> self, std::vector< IFormFactor * >::size_type size) -> vector_IFormFactorPtr_t
-        __init__(std::vector<(p.IFormFactor)> self, std::vector< IFormFactor * >::size_type size, IFormFactor value) -> vector_IFormFactorPtr_t
-        """
-        this = _libBornAgainCore.new_vector_IFormFactorPtr_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.vector_IFormFactorPtr_t_swiginit(self, _libBornAgainCore.new_vector_IFormFactorPtr_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_IFormFactorPtr_t self, IFormFactor x)"""
+        r"""push_back(vector_IFormFactorPtr_t self, IFormFactor x)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_IFormFactorPtr_t self) -> IFormFactor"""
+        r"""front(vector_IFormFactorPtr_t self) -> IFormFactor"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_front(self)
 
-
     def back(self):
-        """back(vector_IFormFactorPtr_t self) -> IFormFactor"""
+        r"""back(vector_IFormFactorPtr_t self) -> IFormFactor"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n, IFormFactor x)"""
+        r"""assign(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n, IFormFactor x)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type new_size)
         resize(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type new_size, IFormFactor x)
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos, IFormFactor x) -> std::vector< IFormFactor * >::iterator
         insert(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos, std::vector< IFormFactor * >::size_type n, IFormFactor x)
         """
         return _libBornAgainCore.vector_IFormFactorPtr_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n)"""
+        r"""reserve(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n)"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
+        r"""capacity(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"""
         return _libBornAgainCore.vector_IFormFactorPtr_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_vector_IFormFactorPtr_t
-    __del__ = lambda self: None
-vector_IFormFactorPtr_t_swigregister = _libBornAgainCore.vector_IFormFactorPtr_t_swigregister
-vector_IFormFactorPtr_t_swigregister(vector_IFormFactorPtr_t)
+
+# Register vector_IFormFactorPtr_t in _libBornAgainCore:
+_libBornAgainCore.vector_IFormFactorPtr_t_swigregister(vector_IFormFactorPtr_t)
 
 class IFormFactorBorn(IFormFactor):
-    """
+    r"""
 
 
     Pure virtual base class for Born form factors.
@@ -11100,20 +8875,12 @@ class IFormFactorBorn(IFormFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFormFactorBorn, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFormFactorBorn, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(IFormFactorBorn self) -> IFormFactorBorn
-
         IFormFactorBorn::IFormFactorBorn()
 
         """
@@ -11121,18 +8888,12 @@ class IFormFactorBorn(IFormFactor):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_IFormFactorBorn(_self, )
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IFormFactorBorn_swiginit(self, _libBornAgainCore.new_IFormFactorBorn(_self, ))
     __swig_destroy__ = _libBornAgainCore.delete_IFormFactorBorn
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IFormFactorBorn self) -> IFormFactorBorn
-
         IFormFactorBorn* IFormFactorBorn::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -11140,11 +8901,9 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_clone(self)
 
-
     def setAmbientMaterial(self, arg0):
-        """
+        r"""
         setAmbientMaterial(IFormFactorBorn self, Material arg0)
-
         void IFormFactorBorn::setAmbientMaterial(Material) override
 
         Passes the material in which this particle is embedded. 
@@ -11152,11 +8911,9 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_setAmbientMaterial(self, arg0)
 
-
     def evaluate(self, wavevectors):
-        """
+        r"""
         evaluate(IFormFactorBorn self, WavevectorInfo wavevectors) -> complex_t
-
         complex_t IFormFactorBorn::evaluate(const WavevectorInfo &wavevectors) const override
 
         Returns scattering amplitude for complex wavevectors ki, kf. 
@@ -11164,11 +8921,9 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_evaluate(self, wavevectors)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(IFormFactorBorn self, IRotation rotation) -> double
-
         double IFormFactorBorn::bottomZ(const IRotation &rotation) const override
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -11176,11 +8931,9 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(IFormFactorBorn self, IRotation rotation) -> double
-
         double IFormFactorBorn::topZ(const IRotation &rotation) const override
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -11188,11 +8941,9 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_topZ(self, rotation)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(IFormFactorBorn self, cvector_t q) -> complex_t
-
         virtual complex_t IFormFactorBorn::evaluate_for_q(cvector_t q) const =0
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
@@ -11200,25 +8951,23 @@ class IFormFactorBorn(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorBorn_evaluate_for_q(self, q)
 
-
     def canSliceAnalytically(self, rot):
-        """canSliceAnalytically(IFormFactorBorn self, IRotation rot) -> bool"""
+        r"""canSliceAnalytically(IFormFactorBorn self, IRotation rot) -> bool"""
         return _libBornAgainCore.IFormFactorBorn_canSliceAnalytically(self, rot)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_IFormFactorBorn(self)
-        return weakref_proxy(self)
+        return weakref.proxy(self)
 
     def sliceFormFactor(self, limits, rot, translation):
-        """sliceFormFactor(IFormFactorBorn self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"""
+        r"""sliceFormFactor(IFormFactorBorn self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"""
         return _libBornAgainCore.IFormFactorBorn_sliceFormFactor(self, limits, rot, translation)
 
-IFormFactorBorn_swigregister = _libBornAgainCore.IFormFactorBorn_swigregister
-IFormFactorBorn_swigregister(IFormFactorBorn)
+# Register IFormFactorBorn in _libBornAgainCore:
+_libBornAgainCore.IFormFactorBorn_swigregister(IFormFactorBorn)
 
-class SlicingEffects(_object):
-    """
+class SlicingEffects(object):
+    r"""
 
 
     Nested structure that holds slicing effects on position and removed parts.
@@ -11227,47 +8976,30 @@ class SlicingEffects(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SlicingEffects, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SlicingEffects, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
-    __swig_setmethods__["position"] = _libBornAgainCore.SlicingEffects_position_set
-    __swig_getmethods__["position"] = _libBornAgainCore.SlicingEffects_position_get
-    if _newclass:
-        position = _swig_property(_libBornAgainCore.SlicingEffects_position_get, _libBornAgainCore.SlicingEffects_position_set)
-    __swig_setmethods__["dz_bottom"] = _libBornAgainCore.SlicingEffects_dz_bottom_set
-    __swig_getmethods__["dz_bottom"] = _libBornAgainCore.SlicingEffects_dz_bottom_get
-    if _newclass:
-        dz_bottom = _swig_property(_libBornAgainCore.SlicingEffects_dz_bottom_get, _libBornAgainCore.SlicingEffects_dz_bottom_set)
-    __swig_setmethods__["dz_top"] = _libBornAgainCore.SlicingEffects_dz_top_set
-    __swig_getmethods__["dz_top"] = _libBornAgainCore.SlicingEffects_dz_top_get
-    if _newclass:
-        dz_top = _swig_property(_libBornAgainCore.SlicingEffects_dz_top_get, _libBornAgainCore.SlicingEffects_dz_top_set)
+    position = property(_libBornAgainCore.SlicingEffects_position_get, _libBornAgainCore.SlicingEffects_position_set, doc=r"""position : kvector_t""")
+    dz_bottom = property(_libBornAgainCore.SlicingEffects_dz_bottom_get, _libBornAgainCore.SlicingEffects_dz_bottom_set, doc=r"""dz_bottom : double""")
+    dz_top = property(_libBornAgainCore.SlicingEffects_dz_top_get, _libBornAgainCore.SlicingEffects_dz_top_set, doc=r"""dz_top : double""")
 
     def __init__(self):
-        """
+        r"""
         __init__(SlicingEffects self) -> SlicingEffects
 
 
-
         Nested structure that holds slicing effects on position and removed parts.
 
         C++ includes: IFormFactorBorn.h
 
         """
-        this = _libBornAgainCore.new_SlicingEffects()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SlicingEffects_swiginit(self, _libBornAgainCore.new_SlicingEffects())
     __swig_destroy__ = _libBornAgainCore.delete_SlicingEffects
-    __del__ = lambda self: None
-SlicingEffects_swigregister = _libBornAgainCore.SlicingEffects_swigregister
-SlicingEffects_swigregister(SlicingEffects)
+
+# Register SlicingEffects in _libBornAgainCore:
+_libBornAgainCore.SlicingEffects_swigregister(SlicingEffects)
 
 class IFormFactorDecorator(IFormFactor):
-    """
+    r"""
 
 
     Encapsulates another formfactor and adds extra functionality (a scalar factor, a position-dependent phase factor, ...).
@@ -11278,25 +9010,16 @@ class IFormFactorDecorator(IFormFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFormFactorDecorator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFormFactorDecorator, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IFormFactorDecorator
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IFormFactorDecorator self) -> IFormFactorDecorator
-
         IFormFactorDecorator* IFormFactorDecorator::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -11304,11 +9027,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IFormFactorDecorator self, INodeVisitor visitor)
-
         void IFormFactorDecorator::accept(INodeVisitor *visitor) const override=0
 
         Calls the  INodeVisitor's visit method. 
@@ -11316,11 +9037,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_accept(self, visitor)
 
-
     def setAmbientMaterial(self, material):
-        """
+        r"""
         setAmbientMaterial(IFormFactorDecorator self, Material material)
-
         void IFormFactorDecorator::setAmbientMaterial(Material material) override
 
         Passes the material in which this particle is embedded. 
@@ -11328,11 +9047,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_setAmbientMaterial(self, material)
 
-
     def volume(self):
-        """
+        r"""
         volume(IFormFactorDecorator self) -> double
-
         double IFormFactorDecorator::volume() const override
 
         Returns the total volume of the particle of this form factor's shape. 
@@ -11340,11 +9057,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_volume(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(IFormFactorDecorator self) -> double
-
         double IFormFactorDecorator::radialExtension() const override
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -11352,11 +9067,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_radialExtension(self)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(IFormFactorDecorator self, IRotation rotation) -> double
-
         double IFormFactorDecorator::bottomZ(const IRotation &rotation) const override
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -11364,11 +9077,9 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(IFormFactorDecorator self, IRotation rotation) -> double
-
         double IFormFactorDecorator::topZ(const IRotation &rotation) const override
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -11376,21 +9087,19 @@ class IFormFactorDecorator(IFormFactor):
         """
         return _libBornAgainCore.IFormFactorDecorator_topZ(self, rotation)
 
-
     def getFormFactor(self):
-        """
+        r"""
         getFormFactor(IFormFactorDecorator self) -> IFormFactor
-
         const IFormFactor* IFormFactorDecorator::getFormFactor() const
 
         """
         return _libBornAgainCore.IFormFactorDecorator_getFormFactor(self)
 
-IFormFactorDecorator_swigregister = _libBornAgainCore.IFormFactorDecorator_swigregister
-IFormFactorDecorator_swigregister(IFormFactorDecorator)
+# Register IFormFactorDecorator in _libBornAgainCore:
+_libBornAgainCore.IFormFactorDecorator_swigregister(IFormFactorDecorator)
 
-class PolygonalTopology(_object):
-    """
+class PolygonalTopology(object):
+    r"""
 
 
     For internal use in  PolyhedralFace.
@@ -11399,43 +9108,29 @@ class PolygonalTopology(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PolygonalTopology, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PolygonalTopology, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
-    __swig_setmethods__["vertexIndices"] = _libBornAgainCore.PolygonalTopology_vertexIndices_set
-    __swig_getmethods__["vertexIndices"] = _libBornAgainCore.PolygonalTopology_vertexIndices_get
-    if _newclass:
-        vertexIndices = _swig_property(_libBornAgainCore.PolygonalTopology_vertexIndices_get, _libBornAgainCore.PolygonalTopology_vertexIndices_set)
-    __swig_setmethods__["symmetry_S2"] = _libBornAgainCore.PolygonalTopology_symmetry_S2_set
-    __swig_getmethods__["symmetry_S2"] = _libBornAgainCore.PolygonalTopology_symmetry_S2_get
-    if _newclass:
-        symmetry_S2 = _swig_property(_libBornAgainCore.PolygonalTopology_symmetry_S2_get, _libBornAgainCore.PolygonalTopology_symmetry_S2_set)
+    vertexIndices = property(_libBornAgainCore.PolygonalTopology_vertexIndices_get, _libBornAgainCore.PolygonalTopology_vertexIndices_set, doc=r"""vertexIndices : std::vector<(int,std::allocator<(int)>)>""")
+    symmetry_S2 = property(_libBornAgainCore.PolygonalTopology_symmetry_S2_get, _libBornAgainCore.PolygonalTopology_symmetry_S2_set, doc=r"""symmetry_S2 : bool""")
 
     def __init__(self):
-        """
+        r"""
         __init__(PolygonalTopology self) -> PolygonalTopology
 
 
-
         For internal use in  PolyhedralFace.
 
         C++ includes: FormFactorPolyhedron.h
 
         """
-        this = _libBornAgainCore.new_PolygonalTopology()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PolygonalTopology_swiginit(self, _libBornAgainCore.new_PolygonalTopology())
     __swig_destroy__ = _libBornAgainCore.delete_PolygonalTopology
-    __del__ = lambda self: None
-PolygonalTopology_swigregister = _libBornAgainCore.PolygonalTopology_swigregister
-PolygonalTopology_swigregister(PolygonalTopology)
 
-class PolyhedralTopology(_object):
-    """
+# Register PolygonalTopology in _libBornAgainCore:
+_libBornAgainCore.PolygonalTopology_swigregister(PolygonalTopology)
+
+class PolyhedralTopology(object):
+    r"""
 
 
     For internal use in  FormFactorPolyhedron.
@@ -11444,43 +9139,29 @@ class PolyhedralTopology(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PolyhedralTopology, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PolyhedralTopology, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
-    __swig_setmethods__["faces"] = _libBornAgainCore.PolyhedralTopology_faces_set
-    __swig_getmethods__["faces"] = _libBornAgainCore.PolyhedralTopology_faces_get
-    if _newclass:
-        faces = _swig_property(_libBornAgainCore.PolyhedralTopology_faces_get, _libBornAgainCore.PolyhedralTopology_faces_set)
-    __swig_setmethods__["symmetry_Ci"] = _libBornAgainCore.PolyhedralTopology_symmetry_Ci_set
-    __swig_getmethods__["symmetry_Ci"] = _libBornAgainCore.PolyhedralTopology_symmetry_Ci_get
-    if _newclass:
-        symmetry_Ci = _swig_property(_libBornAgainCore.PolyhedralTopology_symmetry_Ci_get, _libBornAgainCore.PolyhedralTopology_symmetry_Ci_set)
+    faces = property(_libBornAgainCore.PolyhedralTopology_faces_get, _libBornAgainCore.PolyhedralTopology_faces_set, doc=r"""faces : std::vector<(PolygonalTopology,std::allocator<(PolygonalTopology)>)>""")
+    symmetry_Ci = property(_libBornAgainCore.PolyhedralTopology_symmetry_Ci_get, _libBornAgainCore.PolyhedralTopology_symmetry_Ci_set, doc=r"""symmetry_Ci : bool""")
 
     def __init__(self):
-        """
+        r"""
         __init__(PolyhedralTopology self) -> PolyhedralTopology
 
 
-
         For internal use in  FormFactorPolyhedron.
 
         C++ includes: FormFactorPolyhedron.h
 
         """
-        this = _libBornAgainCore.new_PolyhedralTopology()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PolyhedralTopology_swiginit(self, _libBornAgainCore.new_PolyhedralTopology())
     __swig_destroy__ = _libBornAgainCore.delete_PolyhedralTopology
-    __del__ = lambda self: None
-PolyhedralTopology_swigregister = _libBornAgainCore.PolyhedralTopology_swigregister
-PolyhedralTopology_swigregister(PolyhedralTopology)
 
-class PolyhedralEdge(_object):
-    """
+# Register PolyhedralTopology in _libBornAgainCore:
+_libBornAgainCore.PolyhedralTopology_swigregister(PolyhedralTopology)
+
+class PolyhedralEdge(object):
+    r"""
 
 
     One edge of a polygon, for form factor computation.
@@ -11489,83 +9170,65 @@ class PolyhedralEdge(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PolyhedralEdge, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PolyhedralEdge, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, _Vlow, _Vhig):
-        """
+        r"""
         __init__(PolyhedralEdge self, kvector_t _Vlow, kvector_t _Vhig) -> PolyhedralEdge
-
         PolyhedralEdge::PolyhedralEdge(const kvector_t _Vlow, const kvector_t _Vhig)
 
         """
-        this = _libBornAgainCore.new_PolyhedralEdge(_Vlow, _Vhig)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PolyhedralEdge_swiginit(self, _libBornAgainCore.new_PolyhedralEdge(_Vlow, _Vhig))
 
     def E(self):
-        """
+        r"""
         E(PolyhedralEdge self) -> kvector_t
-
         kvector_t PolyhedralEdge::E() const
 
         """
         return _libBornAgainCore.PolyhedralEdge_E(self)
 
-
     def R(self):
-        """
+        r"""
         R(PolyhedralEdge self) -> kvector_t
-
         kvector_t PolyhedralEdge::R() const
 
         """
         return _libBornAgainCore.PolyhedralEdge_R(self)
 
-
     def qE(self, q):
-        """
+        r"""
         qE(PolyhedralEdge self, cvector_t q) -> complex_t
-
         complex_t PolyhedralEdge::qE(cvector_t q) const
 
         """
         return _libBornAgainCore.PolyhedralEdge_qE(self, q)
 
-
     def qR(self, q):
-        """
+        r"""
         qR(PolyhedralEdge self, cvector_t q) -> complex_t
-
         complex_t PolyhedralEdge::qR(cvector_t q) const
 
         """
         return _libBornAgainCore.PolyhedralEdge_qR(self, q)
 
-
     def contrib(self, m, qpa, qrperp):
-        """
+        r"""
         contrib(PolyhedralEdge self, int m, cvector_t qpa, complex_t qrperp) -> complex_t
-
         complex_t PolyhedralEdge::contrib(int m, cvector_t qpa, complex_t qrperp) const
 
         Returns sum_l=0^M/2 u^2l v^(M-2l) / (2l+1)!(M-2l)! - vperp^M/M! 
 
         """
         return _libBornAgainCore.PolyhedralEdge_contrib(self, m, qpa, qrperp)
-
     __swig_destroy__ = _libBornAgainCore.delete_PolyhedralEdge
-    __del__ = lambda self: None
-PolyhedralEdge_swigregister = _libBornAgainCore.PolyhedralEdge_swigregister
-PolyhedralEdge_swigregister(PolyhedralEdge)
 
-class PolyhedralFace(_object):
-    """
+# Register PolyhedralEdge in _libBornAgainCore:
+_libBornAgainCore.PolyhedralEdge_swigregister(PolyhedralEdge)
+
+class PolyhedralFace(object):
+    r"""
 
 
     A polygon, for form factor computation.
@@ -11574,24 +9237,17 @@ class PolyhedralFace(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PolyhedralFace, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PolyhedralFace, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
+    @staticmethod
     def diameter(V):
-        """diameter(vector_kvector_t V) -> double"""
+        r"""diameter(vector_kvector_t V) -> double"""
         return _libBornAgainCore.PolyhedralFace_diameter(V)
 
-    diameter = staticmethod(diameter)
-
     def __init__(self, *args):
-        """
-        __init__(PolyhedralFace self, vector_kvector_t _V, bool _sym_S2=False) -> PolyhedralFace
-        __init__(PolyhedralFace self, vector_kvector_t _V) -> PolyhedralFace
-        __init__(PolyhedralFace self) -> PolyhedralFace
-
+        r"""
+        __init__(PolyhedralFace self, vector_kvector_t _V=std::vector< kvector_t >(), bool _sym_S2=False) -> PolyhedralFace
         PolyhedralFace::PolyhedralFace(const std::vector< kvector_t > &_V=std::vector< kvector_t >(), bool _sym_S2=false)
 
         Sets internal variables for given vertex chain.
@@ -11606,56 +9262,43 @@ class PolyhedralFace(_object):
         true if face has a perpedicular two-fold symmetry axis 
 
         """
-        this = _libBornAgainCore.new_PolyhedralFace(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PolyhedralFace_swiginit(self, _libBornAgainCore.new_PolyhedralFace(*args))
 
     def area(self):
-        """
+        r"""
         area(PolyhedralFace self) -> double
-
         double PolyhedralFace::area() const
 
         """
         return _libBornAgainCore.PolyhedralFace_area(self)
 
-
     def center(self):
-        """
+        r"""
         center(PolyhedralFace self) -> kvector_t
-
         kvector_t PolyhedralFace::center() const
 
         """
         return _libBornAgainCore.PolyhedralFace_center(self)
 
-
     def pyramidalVolume(self):
-        """
+        r"""
         pyramidalVolume(PolyhedralFace self) -> double
-
         double PolyhedralFace::pyramidalVolume() const
 
         """
         return _libBornAgainCore.PolyhedralFace_pyramidalVolume(self)
 
-
     def radius3d(self):
-        """
+        r"""
         radius3d(PolyhedralFace self) -> double
-
         double PolyhedralFace::radius3d() const
 
         """
         return _libBornAgainCore.PolyhedralFace_radius3d(self)
 
-
     def normalProjectionConj(self, q):
-        """
+        r"""
         normalProjectionConj(PolyhedralFace self, cvector_t q) -> complex_t
-
         complex_t PolyhedralFace::normalProjectionConj(cvector_t q) const
 
         Returns conj(q)*normal [ BasicVector3D::dot is antilinear in 'this' argument]. 
@@ -11663,11 +9306,9 @@ class PolyhedralFace(_object):
         """
         return _libBornAgainCore.PolyhedralFace_normalProjectionConj(self, q)
 
-
     def ff_n(self, m, q):
-        """
+        r"""
         ff_n(PolyhedralFace self, int m, cvector_t q) -> complex_t
-
         complex_t PolyhedralFace::ff_n(int m, cvector_t q) const
 
         Returns contribution qn*f_n [of order q^(n+1)] from this face to the polyhedral form factor. 
@@ -11675,11 +9316,9 @@ class PolyhedralFace(_object):
         """
         return _libBornAgainCore.PolyhedralFace_ff_n(self, m, q)
 
-
     def ff(self, q, sym_Ci):
-        """
+        r"""
         ff(PolyhedralFace self, cvector_t q, bool sym_Ci) -> complex_t
-
         complex_t PolyhedralFace::ff(cvector_t q, bool sym_Ci) const
 
         Returns the contribution ff(q) of this face to the polyhedral form factor. 
@@ -11687,11 +9326,9 @@ class PolyhedralFace(_object):
         """
         return _libBornAgainCore.PolyhedralFace_ff(self, q, sym_Ci)
 
-
     def ff_2D(self, qpa):
-        """
+        r"""
         ff_2D(PolyhedralFace self, cvector_t qpa) -> complex_t
-
         complex_t PolyhedralFace::ff_2D(cvector_t qpa) const
 
         Returns the two-dimensional form factor of this face, for use in a prism. 
@@ -11699,29 +9336,26 @@ class PolyhedralFace(_object):
         """
         return _libBornAgainCore.PolyhedralFace_ff_2D(self, qpa)
 
-
     def assert_Ci(self, other):
-        """
+        r"""
         assert_Ci(PolyhedralFace self, PolyhedralFace other)
-
         void PolyhedralFace::assert_Ci(const PolyhedralFace &other) const
 
         Throws if deviation from inversion symmetry is detected. Does not check vertices. 
 
         """
         return _libBornAgainCore.PolyhedralFace_assert_Ci(self, other)
-
     __swig_destroy__ = _libBornAgainCore.delete_PolyhedralFace
-    __del__ = lambda self: None
-PolyhedralFace_swigregister = _libBornAgainCore.PolyhedralFace_swigregister
-PolyhedralFace_swigregister(PolyhedralFace)
+
+# Register PolyhedralFace in _libBornAgainCore:
+_libBornAgainCore.PolyhedralFace_swigregister(PolyhedralFace)
 
 def PolyhedralFace_diameter(V):
-    """PolyhedralFace_diameter(vector_kvector_t V) -> double"""
+    r"""PolyhedralFace_diameter(vector_kvector_t V) -> double"""
     return _libBornAgainCore.PolyhedralFace_diameter(V)
 
 class FormFactorPolyhedron(IFormFactorBorn):
-    """
+    r"""
 
 
     A polyhedron, for form factor computation.
@@ -11730,23 +9364,15 @@ class FormFactorPolyhedron(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPolyhedron, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPolyhedron, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t
-
         complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const override final
 
         Returns the form factor F(q) of this polyhedron, respecting the offset z_origin. 
@@ -11754,11 +9380,9 @@ class FormFactorPolyhedron(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolyhedron_evaluate_for_q(self, q)
 
-
     def evaluate_centered(self, q):
-        """
+        r"""
         evaluate_centered(FormFactorPolyhedron self, cvector_t q) -> complex_t
-
         complex_t FormFactorPolyhedron::evaluate_centered(cvector_t q) const
 
         Returns the form factor F(q) of this polyhedron, with origin at z=0. 
@@ -11766,11 +9390,9 @@ class FormFactorPolyhedron(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolyhedron_evaluate_centered(self, q)
 
-
     def volume(self):
-        """
+        r"""
         volume(FormFactorPolyhedron self) -> double
-
         double FormFactorPolyhedron::volume() const override final
 
         Returns the total volume of the particle of this form factor's shape. 
@@ -11778,11 +9400,9 @@ class FormFactorPolyhedron(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolyhedron_volume(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorPolyhedron self) -> double
-
         double FormFactorPolyhedron::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -11790,25 +9410,22 @@ class FormFactorPolyhedron(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolyhedron_radialExtension(self)
 
-
     def assert_platonic(self):
-        """
+        r"""
         assert_platonic(FormFactorPolyhedron self)
-
         void FormFactorPolyhedron::assert_platonic() const
 
         Assertions for Platonic solid. 
 
         """
         return _libBornAgainCore.FormFactorPolyhedron_assert_platonic(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPolyhedron
-    __del__ = lambda self: None
-FormFactorPolyhedron_swigregister = _libBornAgainCore.FormFactorPolyhedron_swigregister
-FormFactorPolyhedron_swigregister(FormFactorPolyhedron)
+
+# Register FormFactorPolyhedron in _libBornAgainCore:
+_libBornAgainCore.FormFactorPolyhedron_swigregister(FormFactorPolyhedron)
 
 class FormFactorPolygonalPrism(IFormFactorBorn):
-    """
+    r"""
 
 
     A prism with a polygonal base, for form factor computation.
@@ -11817,23 +9434,15 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPolygonalPrism, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPolygonalPrism, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorPolygonalPrism self, cvector_t q) -> complex_t
-
         complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const override final
 
         Returns the form factor F(q) of this polyhedron, respecting the offset height/2. 
@@ -11841,11 +9450,9 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolygonalPrism_evaluate_for_q(self, q)
 
-
     def volume(self):
-        """
+        r"""
         volume(FormFactorPolygonalPrism self) -> double
-
         double FormFactorPolygonalPrism::volume() const override final
 
         Returns the volume of this prism. 
@@ -11853,35 +9460,30 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolygonalPrism_volume(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorPolygonalPrism self) -> double
-
         double FormFactorPolygonalPrism::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorPolygonalPrism_getHeight(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorPolygonalPrism self) -> double
-
         double FormFactorPolygonalPrism::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 
         """
         return _libBornAgainCore.FormFactorPolygonalPrism_radialExtension(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPolygonalPrism
-    __del__ = lambda self: None
-FormFactorPolygonalPrism_swigregister = _libBornAgainCore.FormFactorPolygonalPrism_swigregister
-FormFactorPolygonalPrism_swigregister(FormFactorPolygonalPrism)
+
+# Register FormFactorPolygonalPrism in _libBornAgainCore:
+_libBornAgainCore.FormFactorPolygonalPrism_swigregister(FormFactorPolygonalPrism)
 
 class FormFactorPolygonalSurface(IFormFactorBorn):
-    """
+    r"""
 
 
     A polygonal surface, for testing form factor computations.
@@ -11890,23 +9492,15 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPolygonalSurface, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPolygonalSurface, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorPolygonalSurface self, cvector_t q) -> complex_t
-
         complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
@@ -11914,11 +9508,9 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolygonalSurface_evaluate_for_q(self, q)
 
-
     def volume(self):
-        """
+        r"""
         volume(FormFactorPolygonalSurface self) -> double
-
         double FormFactorPolygonalSurface::volume() const override
 
         Returns the total volume of the particle of this form factor's shape. 
@@ -11926,25 +9518,22 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorPolygonalSurface_volume(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorPolygonalSurface self) -> double
-
         double FormFactorPolygonalSurface::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
 
         """
         return _libBornAgainCore.FormFactorPolygonalSurface_radialExtension(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPolygonalSurface
-    __del__ = lambda self: None
-FormFactorPolygonalSurface_swigregister = _libBornAgainCore.FormFactorPolygonalSurface_swigregister
-FormFactorPolygonalSurface_swigregister(FormFactorPolygonalSurface)
+
+# Register FormFactorPolygonalSurface in _libBornAgainCore:
+_libBornAgainCore.FormFactorPolygonalSurface_swigregister(FormFactorPolygonalSurface)
 
 class FormFactorAnisoPyramid(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A frustum (truncated pyramid) with rectangular base.
@@ -11953,20 +9542,12 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorAnisoPyramid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorAnisoPyramid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height, alpha):
-        """
+        r"""
         __init__(FormFactorAnisoPyramid self, double length, double width, double height, double alpha) -> FormFactorAnisoPyramid
-
         FormFactorAnisoPyramid::FormFactorAnisoPyramid(double length, double width, double height, double alpha)
 
         Constructor of a truncated pyramid with a rectangular base.
@@ -11987,16 +9568,11 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
         dihedral angle in radians between base and facet 
 
         """
-        this = _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorAnisoPyramid_swiginit(self, _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorAnisoPyramid self) -> FormFactorAnisoPyramid
-
         FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12004,11 +9580,9 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorAnisoPyramid self, INodeVisitor visitor)
-
         void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12016,53 +9590,44 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorAnisoPyramid self) -> double
-
         double FormFactorAnisoPyramid::getLength() const
 
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_getLength(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorAnisoPyramid self) -> double
-
         double FormFactorAnisoPyramid::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_getWidth(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorAnisoPyramid self) -> double
-
         double FormFactorAnisoPyramid::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_getHeight(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorAnisoPyramid self) -> double
-
         double FormFactorAnisoPyramid::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorAnisoPyramid_getAlpha(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorAnisoPyramid
-    __del__ = lambda self: None
-FormFactorAnisoPyramid_swigregister = _libBornAgainCore.FormFactorAnisoPyramid_swigregister
-FormFactorAnisoPyramid_swigregister(FormFactorAnisoPyramid)
+
+# Register FormFactorAnisoPyramid in _libBornAgainCore:
+_libBornAgainCore.FormFactorAnisoPyramid_swigregister(FormFactorAnisoPyramid)
 
 class FormFactorBox(IFormFactorBorn):
-    """
+    r"""
 
 
     A rectangular prism (parallelepiped).
@@ -12071,20 +9636,12 @@ class FormFactorBox(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorBox, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorBox, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorBox self, double length, double width, double height) -> FormFactorBox
-
         FormFactorBox::FormFactorBox(double length, double width, double height)
 
         Constructor of a rectangular cuboid.
@@ -12102,16 +9659,11 @@ class FormFactorBox(IFormFactorBorn):
         height of the box in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorBox(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorBox_swiginit(self, _libBornAgainCore.new_FormFactorBox(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorBox self) -> FormFactorBox
-
         FormFactorBox* FormFactorBox::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12119,11 +9671,9 @@ class FormFactorBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorBox_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorBox self, INodeVisitor visitor)
-
         void FormFactorBox::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12131,41 +9681,33 @@ class FormFactorBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorBox_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorBox self) -> double
-
         double FormFactorBox::getLength() const
 
         """
         return _libBornAgainCore.FormFactorBox_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorBox self) -> double
-
         double FormFactorBox::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorBox_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorBox self) -> double
-
         double FormFactorBox::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorBox_getWidth(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorBox self) -> double
-
         double FormFactorBox::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -12173,25 +9715,22 @@ class FormFactorBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorBox_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorBox self, cvector_t q) -> complex_t
-
         complex_t FormFactorBox::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorBox_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorBox
-    __del__ = lambda self: None
-FormFactorBox_swigregister = _libBornAgainCore.FormFactorBox_swigregister
-FormFactorBox_swigregister(FormFactorBox)
+
+# Register FormFactorBox in _libBornAgainCore:
+_libBornAgainCore.FormFactorBox_swigregister(FormFactorBox)
 
 class FormFactorCone(IFormFactorBorn):
-    """
+    r"""
 
 
     A conical frustum (cone truncated parallel to the base) with circular base.
@@ -12200,20 +9739,12 @@ class FormFactorCone(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorCone, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorCone, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, height, alpha):
-        """
+        r"""
         __init__(FormFactorCone self, double radius, double height, double alpha) -> FormFactorCone
-
         FormFactorCone::FormFactorCone(double radius, double height, double alpha)
 
         Constructor of a truncated cone with circular base.
@@ -12231,16 +9762,11 @@ class FormFactorCone(IFormFactorBorn):
         angle between the base and the side surface in radians 
 
         """
-        this = _libBornAgainCore.new_FormFactorCone(radius, height, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorCone_swiginit(self, _libBornAgainCore.new_FormFactorCone(radius, height, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorCone self) -> FormFactorCone
-
         FormFactorCone* FormFactorCone::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12248,11 +9774,9 @@ class FormFactorCone(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCone_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorCone self, INodeVisitor visitor)
-
         void FormFactorCone::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12260,41 +9784,33 @@ class FormFactorCone(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCone_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorCone self) -> double
-
         double FormFactorCone::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorCone_getHeight(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorCone self) -> double
-
         double FormFactorCone::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorCone_getAlpha(self)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorCone self) -> double
-
         double FormFactorCone::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorCone_getRadius(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorCone self) -> double
-
         double FormFactorCone::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -12302,25 +9818,22 @@ class FormFactorCone(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCone_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorCone self, cvector_t q) -> complex_t
-
         complex_t FormFactorCone::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorCone_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone
-    __del__ = lambda self: None
-FormFactorCone_swigregister = _libBornAgainCore.FormFactorCone_swigregister
-FormFactorCone_swigregister(FormFactorCone)
+
+# Register FormFactorCone in _libBornAgainCore:
+_libBornAgainCore.FormFactorCone_swigregister(FormFactorCone)
 
 class FormFactorCone6(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A frustum (truncated pyramid) with regular hexagonal base.
@@ -12329,20 +9842,12 @@ class FormFactorCone6(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorCone6, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorCone6, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, base_edge, height, alpha):
-        """
+        r"""
         __init__(FormFactorCone6 self, double base_edge, double height, double alpha) -> FormFactorCone6
-
         FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)
 
         Constructor of a truncated pyramid, based on a regular hexagon
@@ -12360,16 +9865,11 @@ class FormFactorCone6(FormFactorPolyhedron):
         dihedral angle in radians between base and facet 
 
         """
-        this = _libBornAgainCore.new_FormFactorCone6(base_edge, height, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorCone6_swiginit(self, _libBornAgainCore.new_FormFactorCone6(base_edge, height, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorCone6 self) -> FormFactorCone6
-
         FormFactorCone6* FormFactorCone6::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12377,11 +9877,9 @@ class FormFactorCone6(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorCone6_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorCone6 self, INodeVisitor visitor)
-
         void FormFactorCone6::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12389,43 +9887,36 @@ class FormFactorCone6(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorCone6_accept(self, visitor)
 
-
     def getBaseEdge(self):
-        """
+        r"""
         getBaseEdge(FormFactorCone6 self) -> double
-
         double FormFactorCone6::getBaseEdge() const
 
         """
         return _libBornAgainCore.FormFactorCone6_getBaseEdge(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorCone6 self) -> double
-
         double FormFactorCone6::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorCone6_getHeight(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorCone6 self) -> double
-
         double FormFactorCone6::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorCone6_getAlpha(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone6
-    __del__ = lambda self: None
-FormFactorCone6_swigregister = _libBornAgainCore.FormFactorCone6_swigregister
-FormFactorCone6_swigregister(FormFactorCone6)
+
+# Register FormFactorCone6 in _libBornAgainCore:
+_libBornAgainCore.FormFactorCone6_swigregister(FormFactorCone6)
 
 class FormFactorCrystal(IFormFactor):
-    """
+    r"""
 
 
     The formfactor of a  MesoCrystal.
@@ -12434,36 +9925,21 @@ class FormFactorCrystal(IFormFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorCrystal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorCrystal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, lattice, basis_form_factor, meso_form_factor, position_variance=0.0):
-        """
+        r"""
         __init__(FormFactorCrystal self, Lattice lattice, IFormFactor basis_form_factor, IFormFactor meso_form_factor, double position_variance=0.0) -> FormFactorCrystal
-        __init__(FormFactorCrystal self, Lattice lattice, IFormFactor basis_form_factor, IFormFactor meso_form_factor) -> FormFactorCrystal
-
         FormFactorCrystal::FormFactorCrystal(const Lattice &lattice, const IFormFactor &basis_form_factor, const IFormFactor &meso_form_factor, double position_variance=0.0)
 
         """
-        this = _libBornAgainCore.new_FormFactorCrystal(lattice, basis_form_factor, meso_form_factor, position_variance)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorCrystal_swiginit(self, _libBornAgainCore.new_FormFactorCrystal(lattice, basis_form_factor, meso_form_factor, position_variance))
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorCrystal
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorCrystal self) -> FormFactorCrystal
-
         FormFactorCrystal* FormFactorCrystal::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12471,11 +9947,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorCrystal self, INodeVisitor visitor)
-
         void FormFactorCrystal::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12483,11 +9957,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_accept(self, visitor)
 
-
     def setAmbientMaterial(self, material):
-        """
+        r"""
         setAmbientMaterial(FormFactorCrystal self, Material material)
-
         void FormFactorCrystal::setAmbientMaterial(Material material) override
 
         Passes the material in which this particle is embedded. 
@@ -12495,11 +9967,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_setAmbientMaterial(self, material)
 
-
     def volume(self):
-        """
+        r"""
         volume(FormFactorCrystal self) -> double
-
         double FormFactorCrystal::volume() const override final
 
         Returns the total volume of the particle of this form factor's shape. 
@@ -12507,11 +9977,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_volume(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorCrystal self) -> double
-
         double FormFactorCrystal::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -12519,11 +9987,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_radialExtension(self)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(FormFactorCrystal self, IRotation rotation) -> double
-
         double FormFactorCrystal::bottomZ(const IRotation &rotation) const override
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -12531,11 +9997,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(FormFactorCrystal self, IRotation rotation) -> double
-
         double FormFactorCrystal::topZ(const IRotation &rotation) const override final
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -12543,11 +10007,9 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_topZ(self, rotation)
 
-
     def evaluate(self, wavevectors):
-        """
+        r"""
         evaluate(FormFactorCrystal self, WavevectorInfo wavevectors) -> complex_t
-
         complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const override final
 
         Returns scattering amplitude for complex wavevectors ki, kf. 
@@ -12555,11 +10017,11 @@ class FormFactorCrystal(IFormFactor):
         """
         return _libBornAgainCore.FormFactorCrystal_evaluate(self, wavevectors)
 
-FormFactorCrystal_swigregister = _libBornAgainCore.FormFactorCrystal_swigregister
-FormFactorCrystal_swigregister(FormFactorCrystal)
+# Register FormFactorCrystal in _libBornAgainCore:
+_libBornAgainCore.FormFactorCrystal_swigregister(FormFactorCrystal)
 
 class FormFactorCuboctahedron(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A truncated bifrustum with quadratic base.
@@ -12568,20 +10030,12 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorCuboctahedron, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorCuboctahedron, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, height, height_ratio, alpha):
-        """
+        r"""
         __init__(FormFactorCuboctahedron self, double length, double height, double height_ratio, double alpha) -> FormFactorCuboctahedron
-
         FormFactorCuboctahedron::FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha)
 
         Constructor of cuboctahedron (compound of two truncated pyramids with a common square base and opposite orientations).
@@ -12602,16 +10056,11 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
         dihedral angle in radians between base and facet 
 
         """
-        this = _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorCuboctahedron_swiginit(self, _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorCuboctahedron self) -> FormFactorCuboctahedron
-
         FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12619,11 +10068,9 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorCuboctahedron_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorCuboctahedron self, INodeVisitor visitor)
-
         void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12631,53 +10078,44 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorCuboctahedron_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorCuboctahedron self) -> double
-
         double FormFactorCuboctahedron::getLength() const
 
         """
         return _libBornAgainCore.FormFactorCuboctahedron_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorCuboctahedron self) -> double
-
         double FormFactorCuboctahedron::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorCuboctahedron_getHeight(self)
 
-
     def getHeightRatio(self):
-        """
+        r"""
         getHeightRatio(FormFactorCuboctahedron self) -> double
-
         double FormFactorCuboctahedron::getHeightRatio() const
 
         """
         return _libBornAgainCore.FormFactorCuboctahedron_getHeightRatio(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorCuboctahedron self) -> double
-
         double FormFactorCuboctahedron::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorCuboctahedron_getAlpha(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorCuboctahedron
-    __del__ = lambda self: None
-FormFactorCuboctahedron_swigregister = _libBornAgainCore.FormFactorCuboctahedron_swigregister
-FormFactorCuboctahedron_swigregister(FormFactorCuboctahedron)
+
+# Register FormFactorCuboctahedron in _libBornAgainCore:
+_libBornAgainCore.FormFactorCuboctahedron_swigregister(FormFactorCuboctahedron)
 
 class FormFactorCylinder(IFormFactorBorn):
-    """
+    r"""
 
 
     A circular cylinder.
@@ -12686,20 +10124,12 @@ class FormFactorCylinder(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorCylinder, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorCylinder, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, height):
-        """
+        r"""
         __init__(FormFactorCylinder self, double radius, double height) -> FormFactorCylinder
-
         FormFactorCylinder::FormFactorCylinder(double radius, double height)
 
         Constructor of a cylinder with a circular base.
@@ -12714,16 +10144,11 @@ class FormFactorCylinder(IFormFactorBorn):
         height of the cylinder in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorCylinder(radius, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorCylinder_swiginit(self, _libBornAgainCore.new_FormFactorCylinder(radius, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorCylinder self) -> FormFactorCylinder
-
         FormFactorCylinder* FormFactorCylinder::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12731,11 +10156,9 @@ class FormFactorCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCylinder_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorCylinder self, INodeVisitor visitor)
-
         void FormFactorCylinder::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12743,31 +10166,25 @@ class FormFactorCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCylinder_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorCylinder self) -> double
-
         double FormFactorCylinder::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorCylinder_getHeight(self)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorCylinder self) -> double
-
         double FormFactorCylinder::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorCylinder_getRadius(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorCylinder self) -> double
-
         double FormFactorCylinder::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -12775,25 +10192,22 @@ class FormFactorCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorCylinder_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorCylinder self, cvector_t q) -> complex_t
-
         complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorCylinder_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorCylinder
-    __del__ = lambda self: None
-FormFactorCylinder_swigregister = _libBornAgainCore.FormFactorCylinder_swigregister
-FormFactorCylinder_swigregister(FormFactorCylinder)
+
+# Register FormFactorCylinder in _libBornAgainCore:
+_libBornAgainCore.FormFactorCylinder_swigregister(FormFactorCylinder)
 
 class FormFactorDebyeBueche(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor of a Debye-Bueche (see doi:10.1038/pj.2010.110).
@@ -12802,33 +10216,20 @@ class FormFactorDebyeBueche(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorDebyeBueche, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorDebyeBueche, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, I0, xi):
-        """
+        r"""
         __init__(FormFactorDebyeBueche self, double I0, double xi) -> FormFactorDebyeBueche
-
         FormFactorDebyeBueche::FormFactorDebyeBueche(double I0, double xi)
 
         """
-        this = _libBornAgainCore.new_FormFactorDebyeBueche(I0, xi)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorDebyeBueche_swiginit(self, _libBornAgainCore.new_FormFactorDebyeBueche(I0, xi))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorDebyeBueche self) -> FormFactorDebyeBueche
-
         FormFactorDebyeBueche* FormFactorDebyeBueche::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12836,11 +10237,9 @@ class FormFactorDebyeBueche(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDebyeBueche_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorDebyeBueche self, INodeVisitor visitor)
-
         void FormFactorDebyeBueche::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12848,11 +10247,9 @@ class FormFactorDebyeBueche(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDebyeBueche_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorDebyeBueche self) -> double
-
         double FormFactorDebyeBueche::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -12860,25 +10257,22 @@ class FormFactorDebyeBueche(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDebyeBueche_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorDebyeBueche self, cvector_t q) -> complex_t
-
         complex_t FormFactorDebyeBueche::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorDebyeBueche_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorDebyeBueche
-    __del__ = lambda self: None
-FormFactorDebyeBueche_swigregister = _libBornAgainCore.FormFactorDebyeBueche_swigregister
-FormFactorDebyeBueche_swigregister(FormFactorDebyeBueche)
+
+# Register FormFactorDebyeBueche in _libBornAgainCore:
+_libBornAgainCore.FormFactorDebyeBueche_swigregister(FormFactorDebyeBueche)
 
 class FormFactorDodecahedron(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A regular dodecahedron.
@@ -12887,20 +10281,12 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorDodecahedron, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorDodecahedron, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, edge):
-        """
+        r"""
         __init__(FormFactorDodecahedron self, double edge) -> FormFactorDodecahedron
-
         FormFactorDodecahedron::FormFactorDodecahedron(double edge)
 
         Constructs a regular dodecahedron.
@@ -12920,16 +10306,11 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
         length of the edge in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorDodecahedron(edge)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorDodecahedron_swiginit(self, _libBornAgainCore.new_FormFactorDodecahedron(edge))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorDodecahedron self) -> FormFactorDodecahedron
-
         FormFactorDodecahedron* FormFactorDodecahedron::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -12937,11 +10318,9 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorDodecahedron_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorDodecahedron self, INodeVisitor visitor)
-
         void FormFactorDodecahedron::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -12949,23 +10328,20 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorDodecahedron_accept(self, visitor)
 
-
     def getEdge(self):
-        """
+        r"""
         getEdge(FormFactorDodecahedron self) -> double
-
         double FormFactorDodecahedron::getEdge() const
 
         """
         return _libBornAgainCore.FormFactorDodecahedron_getEdge(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorDodecahedron
-    __del__ = lambda self: None
-FormFactorDodecahedron_swigregister = _libBornAgainCore.FormFactorDodecahedron_swigregister
-FormFactorDodecahedron_swigregister(FormFactorDodecahedron)
+
+# Register FormFactorDodecahedron in _libBornAgainCore:
+_libBornAgainCore.FormFactorDodecahedron_swigregister(FormFactorDodecahedron)
 
 class FormFactorDot(IFormFactorBorn):
-    """
+    r"""
 
 
     A dot, with trivial formfactor F(q)=1.
@@ -12974,33 +10350,20 @@ class FormFactorDot(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorDot, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorDot, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(FormFactorDot self) -> FormFactorDot
-
         FormFactorDot::FormFactorDot()
 
         """
-        this = _libBornAgainCore.new_FormFactorDot()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorDot_swiginit(self, _libBornAgainCore.new_FormFactorDot())
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorDot self) -> FormFactorDot
-
         FormFactorDot* FormFactorDot::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13008,11 +10371,9 @@ class FormFactorDot(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDot_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorDot self, INodeVisitor visitor)
-
         void FormFactorDot::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13020,11 +10381,9 @@ class FormFactorDot(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDot_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorDot self) -> double
-
         double FormFactorDot::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13032,25 +10391,22 @@ class FormFactorDot(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorDot_radialExtension(self)
 
-
     def evaluate_for_q(self, arg2):
-        """
+        r"""
         evaluate_for_q(FormFactorDot self, cvector_t arg2) -> complex_t
-
         complex_t FormFactorDot::evaluate_for_q(cvector_t) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorDot_evaluate_for_q(self, arg2)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorDot
-    __del__ = lambda self: None
-FormFactorDot_swigregister = _libBornAgainCore.FormFactorDot_swigregister
-FormFactorDot_swigregister(FormFactorDot)
+
+# Register FormFactorDot in _libBornAgainCore:
+_libBornAgainCore.FormFactorDot_swigregister(FormFactorDot)
 
 class FormFactorEllipsoidalCylinder(IFormFactorBorn):
-    """
+    r"""
 
 
     A cylinder with elliptical base.
@@ -13059,20 +10415,12 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorEllipsoidalCylinder, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorEllipsoidalCylinder, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius_x, radius_y, height):
-        """
+        r"""
         __init__(FormFactorEllipsoidalCylinder self, double radius_x, double radius_y, double height) -> FormFactorEllipsoidalCylinder
-
         FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height)
 
         Constructor of a cylinder with an ellipse cross section.
@@ -13090,16 +10438,11 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
         height of the ellipsoidal cylinder in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorEllipsoidalCylinder_swiginit(self, _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorEllipsoidalCylinder self) -> FormFactorEllipsoidalCylinder
-
         FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13107,11 +10450,9 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorEllipsoidalCylinder self, INodeVisitor visitor)
-
         void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13119,41 +10460,33 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_accept(self, visitor)
 
-
     def getRadiusX(self):
-        """
+        r"""
         getRadiusX(FormFactorEllipsoidalCylinder self) -> double
-
         double FormFactorEllipsoidalCylinder::getRadiusX() const
 
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_getRadiusX(self)
 
-
     def getRadiusY(self):
-        """
+        r"""
         getRadiusY(FormFactorEllipsoidalCylinder self) -> double
-
         double FormFactorEllipsoidalCylinder::getRadiusY() const
 
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_getRadiusY(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorEllipsoidalCylinder self) -> double
-
         double FormFactorEllipsoidalCylinder::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_getHeight(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorEllipsoidalCylinder self) -> double
-
         double FormFactorEllipsoidalCylinder::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13161,25 +10494,22 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorEllipsoidalCylinder self, cvector_t q) -> complex_t
-
         complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorEllipsoidalCylinder_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorEllipsoidalCylinder
-    __del__ = lambda self: None
-FormFactorEllipsoidalCylinder_swigregister = _libBornAgainCore.FormFactorEllipsoidalCylinder_swigregister
-FormFactorEllipsoidalCylinder_swigregister(FormFactorEllipsoidalCylinder)
+
+# Register FormFactorEllipsoidalCylinder in _libBornAgainCore:
+_libBornAgainCore.FormFactorEllipsoidalCylinder_swigregister(FormFactorEllipsoidalCylinder)
 
 class FormFactorFullSphere(IFormFactorBorn):
-    """
+    r"""
 
 
     A full sphere.
@@ -13188,21 +10518,12 @@ class FormFactorFullSphere(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorFullSphere, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorFullSphere, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, position_at_center=False):
-        """
+        r"""
         __init__(FormFactorFullSphere self, double radius, bool position_at_center=False) -> FormFactorFullSphere
-        __init__(FormFactorFullSphere self, double radius) -> FormFactorFullSphere
-
         FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center=false)
 
         Constructor of a full sphere.
@@ -13214,16 +10535,11 @@ class FormFactorFullSphere(IFormFactorBorn):
         radius of the sphere in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorFullSphere(radius, position_at_center)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorFullSphere_swiginit(self, _libBornAgainCore.new_FormFactorFullSphere(radius, position_at_center))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorFullSphere self) -> FormFactorFullSphere
-
         FormFactorFullSphere* FormFactorFullSphere::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13231,11 +10547,9 @@ class FormFactorFullSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSphere_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorFullSphere self, INodeVisitor visitor)
-
         void FormFactorFullSphere::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13243,21 +10557,17 @@ class FormFactorFullSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSphere_accept(self, visitor)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorFullSphere self) -> double
-
         double FormFactorFullSphere::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorFullSphere_getRadius(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorFullSphere self) -> double
-
         double FormFactorFullSphere::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13265,11 +10575,9 @@ class FormFactorFullSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSphere_radialExtension(self)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(FormFactorFullSphere self, IRotation rotation) -> double
-
         double FormFactorFullSphere::bottomZ(const IRotation &rotation) const override final
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -13277,11 +10585,9 @@ class FormFactorFullSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSphere_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(FormFactorFullSphere self, IRotation rotation) -> double
-
         double FormFactorFullSphere::topZ(const IRotation &rotation) const override final
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -13289,25 +10595,22 @@ class FormFactorFullSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSphere_topZ(self, rotation)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorFullSphere self, cvector_t q) -> complex_t
-
         complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorFullSphere_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorFullSphere
-    __del__ = lambda self: None
-FormFactorFullSphere_swigregister = _libBornAgainCore.FormFactorFullSphere_swigregister
-FormFactorFullSphere_swigregister(FormFactorFullSphere)
+
+# Register FormFactorFullSphere in _libBornAgainCore:
+_libBornAgainCore.FormFactorFullSphere_swigregister(FormFactorFullSphere)
 
 class FormFactorFullSpheroid(IFormFactorBorn):
-    """
+    r"""
 
 
     A full spheroid (an ellipsoid with two equal axes, hence with circular cross section)
@@ -13316,20 +10619,12 @@ class FormFactorFullSpheroid(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorFullSpheroid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorFullSpheroid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, height):
-        """
+        r"""
         __init__(FormFactorFullSpheroid self, double radius, double height) -> FormFactorFullSpheroid
-
         FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)
 
         Constructor of full spheroid.
@@ -13344,16 +10639,11 @@ class FormFactorFullSpheroid(IFormFactorBorn):
         height of the full spheroid in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorFullSpheroid(radius, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorFullSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorFullSpheroid(radius, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorFullSpheroid self) -> FormFactorFullSpheroid
-
         FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13361,11 +10651,9 @@ class FormFactorFullSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSpheroid_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorFullSpheroid self, INodeVisitor visitor)
-
         void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13373,31 +10661,25 @@ class FormFactorFullSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSpheroid_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorFullSpheroid self) -> double
-
         double FormFactorFullSpheroid::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorFullSpheroid_getHeight(self)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorFullSpheroid self) -> double
-
         double FormFactorFullSpheroid::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorFullSpheroid_getRadius(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorFullSpheroid self) -> double
-
         double FormFactorFullSpheroid::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13405,25 +10687,22 @@ class FormFactorFullSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorFullSpheroid_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorFullSpheroid self, cvector_t q) -> complex_t
-
         complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorFullSpheroid_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorFullSpheroid
-    __del__ = lambda self: None
-FormFactorFullSpheroid_swigregister = _libBornAgainCore.FormFactorFullSpheroid_swigregister
-FormFactorFullSpheroid_swigregister(FormFactorFullSpheroid)
+
+# Register FormFactorFullSpheroid in _libBornAgainCore:
+_libBornAgainCore.FormFactorFullSpheroid_swigregister(FormFactorFullSpheroid)
 
 class FormFactorGauss(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor of a gaussian.
@@ -13432,34 +10711,21 @@ class FormFactorGauss(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(FormFactorGauss self, double length) -> FormFactorGauss
         __init__(FormFactorGauss self, double width, double height) -> FormFactorGauss
-
         FormFactorGauss::FormFactorGauss(double width, double height)
 
         """
-        this = _libBornAgainCore.new_FormFactorGauss(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorGauss_swiginit(self, _libBornAgainCore.new_FormFactorGauss(*args))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorGauss self) -> FormFactorGauss
-
         FormFactorGauss* FormFactorGauss::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13467,11 +10733,9 @@ class FormFactorGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorGauss self, INodeVisitor visitor)
-
         void FormFactorGauss::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13479,31 +10743,25 @@ class FormFactorGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorGauss_accept(self, visitor)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorGauss self) -> double
-
         double FormFactorGauss::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorGauss_getWidth(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorGauss self) -> double
-
         double FormFactorGauss::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorGauss_getHeight(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorGauss self) -> double
-
         double FormFactorGauss::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13511,25 +10769,22 @@ class FormFactorGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorGauss_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorGauss self, cvector_t q) -> complex_t
-
         complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorGauss_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorGauss
-    __del__ = lambda self: None
-FormFactorGauss_swigregister = _libBornAgainCore.FormFactorGauss_swigregister
-FormFactorGauss_swigregister(FormFactorGauss)
+
+# Register FormFactorGauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorGauss_swigregister(FormFactorGauss)
 
 class FormFactorHemiEllipsoid(IFormFactorBorn):
-    """
+    r"""
 
 
     An hemi ellipsoid, obtained by truncating a full ellipsoid in the middle plane spanned by two principal axes.
@@ -13538,20 +10793,12 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorHemiEllipsoid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorHemiEllipsoid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius_x, radius_y, height):
-        """
+        r"""
         __init__(FormFactorHemiEllipsoid self, double radius_x, double radius_y, double height) -> FormFactorHemiEllipsoid
-
         FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)
 
         Constructor of horizontally oriented ellipsoid, truncated at the central plane.
@@ -13569,18 +10816,12 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
         height of the hemi ellipsoid in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorHemiEllipsoid_swiginit(self, _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height))
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorHemiEllipsoid
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorHemiEllipsoid self) -> FormFactorHemiEllipsoid
-
         FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13588,11 +10829,9 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorHemiEllipsoid self, INodeVisitor visitor)
-
         void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13600,41 +10839,33 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorHemiEllipsoid self) -> double
-
         double FormFactorHemiEllipsoid::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_getHeight(self)
 
-
     def getRadiusX(self):
-        """
+        r"""
         getRadiusX(FormFactorHemiEllipsoid self) -> double
-
         double FormFactorHemiEllipsoid::getRadiusX() const
 
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_getRadiusX(self)
 
-
     def getRadiusY(self):
-        """
+        r"""
         getRadiusY(FormFactorHemiEllipsoid self) -> double
-
         double FormFactorHemiEllipsoid::getRadiusY() const
 
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_getRadiusY(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorHemiEllipsoid self) -> double
-
         double FormFactorHemiEllipsoid::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13642,11 +10873,9 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorHemiEllipsoid self, cvector_t q) -> complex_t
-
         complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
@@ -13654,11 +10883,11 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorHemiEllipsoid_evaluate_for_q(self, q)
 
-FormFactorHemiEllipsoid_swigregister = _libBornAgainCore.FormFactorHemiEllipsoid_swigregister
-FormFactorHemiEllipsoid_swigregister(FormFactorHemiEllipsoid)
+# Register FormFactorHemiEllipsoid in _libBornAgainCore:
+_libBornAgainCore.FormFactorHemiEllipsoid_swigregister(FormFactorHemiEllipsoid)
 
 class FormFactorIcosahedron(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A regular icosahedron.
@@ -13667,20 +10896,12 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorIcosahedron, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorIcosahedron, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, edge):
-        """
+        r"""
         __init__(FormFactorIcosahedron self, double edge) -> FormFactorIcosahedron
-
         FormFactorIcosahedron::FormFactorIcosahedron(double edge)
 
         Constructor of a icosahedron.
@@ -13692,16 +10913,11 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
         length of the edge in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorIcosahedron(edge)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorIcosahedron_swiginit(self, _libBornAgainCore.new_FormFactorIcosahedron(edge))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorIcosahedron self) -> FormFactorIcosahedron
-
         FormFactorIcosahedron* FormFactorIcosahedron::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13709,11 +10925,9 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorIcosahedron_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorIcosahedron self, INodeVisitor visitor)
-
         void FormFactorIcosahedron::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13721,23 +10935,20 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorIcosahedron_accept(self, visitor)
 
-
     def getEdge(self):
-        """
+        r"""
         getEdge(FormFactorIcosahedron self) -> double
-
         double FormFactorIcosahedron::getEdge() const
 
         """
         return _libBornAgainCore.FormFactorIcosahedron_getEdge(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorIcosahedron
-    __del__ = lambda self: None
-FormFactorIcosahedron_swigregister = _libBornAgainCore.FormFactorIcosahedron_swigregister
-FormFactorIcosahedron_swigregister(FormFactorIcosahedron)
+
+# Register FormFactorIcosahedron in _libBornAgainCore:
+_libBornAgainCore.FormFactorIcosahedron_swigregister(FormFactorIcosahedron)
 
 class FormFactorLongBox(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a long rectangular box. Approximates the rapidly oscillating sinc function by the square root of a Lorentzian
@@ -13746,20 +10957,12 @@ class FormFactorLongBox(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongBox, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongBox, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorLongBox self, double length, double width, double height) -> FormFactorLongBox
-
         FormFactorLongBox::FormFactorLongBox(double length, double width, double height)
 
         Box constructor.
@@ -13777,16 +10980,11 @@ class FormFactorLongBox(IFormFactorBorn):
         of  Box
 
         """
-        this = _libBornAgainCore.new_FormFactorLongBox(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongBox_swiginit(self, _libBornAgainCore.new_FormFactorLongBox(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongBox self) -> FormFactorLongBox
-
         FormFactorLongBox* FormFactorLongBox::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13794,11 +10992,9 @@ class FormFactorLongBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBox_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongBox self, INodeVisitor visitor)
-
         void FormFactorLongBox::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13806,41 +11002,33 @@ class FormFactorLongBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBox_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongBox self) -> double
-
         double FormFactorLongBox::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongBox_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongBox self) -> double
-
         double FormFactorLongBox::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongBox_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongBox self) -> double
-
         double FormFactorLongBox::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongBox_getWidth(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongBox self) -> double
-
         double FormFactorLongBox::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13848,25 +11036,22 @@ class FormFactorLongBox(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBox_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongBox self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongBox::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorLongBox_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongBox
-    __del__ = lambda self: None
-FormFactorLongBox_swigregister = _libBornAgainCore.FormFactorLongBox_swigregister
-FormFactorLongBox_swigregister(FormFactorLongBox)
+
+# Register FormFactorLongBox in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongBox_swigregister(FormFactorLongBox)
 
 class FormFactorLongBoxGauss(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a long rectangular box.
@@ -13875,20 +11060,12 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongBoxGauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongBoxGauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorLongBoxGauss self, double length, double width, double height) -> FormFactorLongBoxGauss
-
         FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)
 
         Box constructor.
@@ -13906,16 +11083,11 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
         of  Box
 
         """
-        this = _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongBoxGauss_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongBoxGauss self) -> FormFactorLongBoxGauss
-
         FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -13923,11 +11095,9 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongBoxGauss self, INodeVisitor visitor)
-
         void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -13935,41 +11105,33 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongBoxGauss self) -> double
-
         double FormFactorLongBoxGauss::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongBoxGauss self) -> double
-
         double FormFactorLongBoxGauss::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongBoxGauss self) -> double
-
         double FormFactorLongBoxGauss::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_getWidth(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongBoxGauss self) -> double
-
         double FormFactorLongBoxGauss::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -13977,25 +11139,22 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongBoxGauss self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorLongBoxGauss_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongBoxGauss
-    __del__ = lambda self: None
-FormFactorLongBoxGauss_swigregister = _libBornAgainCore.FormFactorLongBoxGauss_swigregister
-FormFactorLongBoxGauss_swigregister(FormFactorLongBoxGauss)
+
+# Register FormFactorLongBoxGauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongBoxGauss_swigregister(FormFactorLongBoxGauss)
 
 class FormFactorLongBoxLorentz(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a long rectangular box.
@@ -14004,20 +11163,12 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongBoxLorentz, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongBoxLorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorLongBoxLorentz self, double length, double width, double height) -> FormFactorLongBoxLorentz
-
         FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)
 
         Box constructor.
@@ -14035,16 +11186,11 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
         of  Box
 
         """
-        this = _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongBoxLorentz_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongBoxLorentz self) -> FormFactorLongBoxLorentz
-
         FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14052,11 +11198,9 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongBoxLorentz self, INodeVisitor visitor)
-
         void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14064,41 +11208,33 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongBoxLorentz self) -> double
-
         double FormFactorLongBoxLorentz::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongBoxLorentz self) -> double
-
         double FormFactorLongBoxLorentz::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongBoxLorentz self) -> double
-
         double FormFactorLongBoxLorentz::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_getWidth(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongBoxLorentz self) -> double
-
         double FormFactorLongBoxLorentz::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14106,25 +11242,22 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongBoxLorentz self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorLongBoxLorentz_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongBoxLorentz
-    __del__ = lambda self: None
-FormFactorLongBoxLorentz_swigregister = _libBornAgainCore.FormFactorLongBoxLorentz_swigregister
-FormFactorLongBoxLorentz_swigregister(FormFactorLongBoxLorentz)
+
+# Register FormFactorLongBoxLorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongBoxLorentz_swigregister(FormFactorLongBoxLorentz)
 
 class FormFactorLongRipple1Gauss(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a cosine ripple.
@@ -14133,20 +11266,12 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongRipple1Gauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongRipple1Gauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorLongRipple1Gauss self, double length, double width, double height) -> FormFactorLongRipple1Gauss
-
         FormFactorLongRipple1Gauss::FormFactorLongRipple1Gauss(double length, double width, double height)
 
         Ripple1 constructor.
@@ -14164,16 +11289,11 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
         of cosine cross section 
 
         """
-        this = _libBornAgainCore.new_FormFactorLongRipple1Gauss(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongRipple1Gauss_swiginit(self, _libBornAgainCore.new_FormFactorLongRipple1Gauss(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongRipple1Gauss self) -> FormFactorLongRipple1Gauss
-
         FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14181,11 +11301,9 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongRipple1Gauss self, INodeVisitor visitor)
-
         void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14193,41 +11311,33 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongRipple1Gauss self) -> double
-
         double FormFactorLongRipple1Gauss::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongRipple1Gauss self) -> double
-
         double FormFactorLongRipple1Gauss::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_getWidth(self)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongRipple1Gauss self) -> double
-
         double FormFactorLongRipple1Gauss::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_getLength(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongRipple1Gauss self) -> double
-
         double FormFactorLongRipple1Gauss::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14235,25 +11345,22 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongRipple1Gauss self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Gauss_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Gauss
-    __del__ = lambda self: None
-FormFactorLongRipple1Gauss_swigregister = _libBornAgainCore.FormFactorLongRipple1Gauss_swigregister
-FormFactorLongRipple1Gauss_swigregister(FormFactorLongRipple1Gauss)
+
+# Register FormFactorLongRipple1Gauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongRipple1Gauss_swigregister(FormFactorLongRipple1Gauss)
 
 class FormFactorLongRipple1Lorentz(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a cosine ripple.
@@ -14262,20 +11369,12 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongRipple1Lorentz, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongRipple1Lorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorLongRipple1Lorentz self, double length, double width, double height) -> FormFactorLongRipple1Lorentz
-
         FormFactorLongRipple1Lorentz::FormFactorLongRipple1Lorentz(double length, double width, double height)
 
         FormFactorLongRipple1Lorentz constructor.
@@ -14293,16 +11392,11 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
         of cosine cross section 
 
         """
-        this = _libBornAgainCore.new_FormFactorLongRipple1Lorentz(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongRipple1Lorentz_swiginit(self, _libBornAgainCore.new_FormFactorLongRipple1Lorentz(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongRipple1Lorentz self) -> FormFactorLongRipple1Lorentz
-
         FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14310,11 +11404,9 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongRipple1Lorentz self, INodeVisitor visitor)
-
         void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14322,11 +11414,9 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongRipple1Lorentz self) -> double
-
         double FormFactorLongRipple1Lorentz::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14334,55 +11424,46 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_radialExtension(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongRipple1Lorentz self) -> double
-
         double FormFactorLongRipple1Lorentz::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongRipple1Lorentz self) -> double
-
         double FormFactorLongRipple1Lorentz::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_getWidth(self)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongRipple1Lorentz self) -> double
-
         double FormFactorLongRipple1Lorentz::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_getLength(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongRipple1Lorentz self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorLongRipple1Lorentz_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Lorentz
-    __del__ = lambda self: None
-FormFactorLongRipple1Lorentz_swigregister = _libBornAgainCore.FormFactorLongRipple1Lorentz_swigregister
-FormFactorLongRipple1Lorentz_swigregister(FormFactorLongRipple1Lorentz)
+
+# Register FormFactorLongRipple1Lorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongRipple1Lorentz_swigregister(FormFactorLongRipple1Lorentz)
 
 class FormFactorLongRipple2Gauss(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a triangular ripple.
@@ -14391,20 +11472,12 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongRipple2Gauss, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongRipple2Gauss, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height, asymmetry):
-        """
+        r"""
         __init__(FormFactorLongRipple2Gauss self, double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Gauss
-
         FormFactorLongRipple2Gauss::FormFactorLongRipple2Gauss(double length, double width, double height, double asymmetry)
 
         FormFactorLongRipple2Gauss constructor.
@@ -14425,16 +11498,11 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
         length of triangular cross section 
 
         """
-        this = _libBornAgainCore.new_FormFactorLongRipple2Gauss(length, width, height, asymmetry)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongRipple2Gauss_swiginit(self, _libBornAgainCore.new_FormFactorLongRipple2Gauss(length, width, height, asymmetry))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongRipple2Gauss self) -> FormFactorLongRipple2Gauss
-
         FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14442,11 +11510,9 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongRipple2Gauss self, INodeVisitor visitor)
-
         void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14454,51 +11520,41 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongRipple2Gauss self) -> double
-
         double FormFactorLongRipple2Gauss::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongRipple2Gauss self) -> double
-
         double FormFactorLongRipple2Gauss::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_getWidth(self)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongRipple2Gauss self) -> double
-
         double FormFactorLongRipple2Gauss::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_getLength(self)
 
-
     def getAsymmetry(self):
-        """
+        r"""
         getAsymmetry(FormFactorLongRipple2Gauss self) -> double
-
         double FormFactorLongRipple2Gauss::getAsymmetry() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_getAsymmetry(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongRipple2Gauss self) -> double
-
         double FormFactorLongRipple2Gauss::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14506,25 +11562,22 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongRipple2Gauss self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Gauss_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Gauss
-    __del__ = lambda self: None
-FormFactorLongRipple2Gauss_swigregister = _libBornAgainCore.FormFactorLongRipple2Gauss_swigregister
-FormFactorLongRipple2Gauss_swigregister(FormFactorLongRipple2Gauss)
+
+# Register FormFactorLongRipple2Gauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongRipple2Gauss_swigregister(FormFactorLongRipple2Gauss)
 
 class FormFactorLongRipple2Lorentz(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a triangular ripple.
@@ -14533,20 +11586,12 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLongRipple2Lorentz, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLongRipple2Lorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height, asymmetry):
-        """
+        r"""
         __init__(FormFactorLongRipple2Lorentz self, double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Lorentz
-
         FormFactorLongRipple2Lorentz::FormFactorLongRipple2Lorentz(double length, double width, double height, double asymmetry)
 
         Parameters:
@@ -14565,16 +11610,11 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
         length of triangular cross section 
 
         """
-        this = _libBornAgainCore.new_FormFactorLongRipple2Lorentz(length, width, height, asymmetry)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLongRipple2Lorentz_swiginit(self, _libBornAgainCore.new_FormFactorLongRipple2Lorentz(length, width, height, asymmetry))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLongRipple2Lorentz self) -> FormFactorLongRipple2Lorentz
-
         FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14582,11 +11622,9 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLongRipple2Lorentz self, INodeVisitor visitor)
-
         void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14594,51 +11632,41 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLongRipple2Lorentz self) -> double
-
         double FormFactorLongRipple2Lorentz::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLongRipple2Lorentz self) -> double
-
         double FormFactorLongRipple2Lorentz::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_getWidth(self)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorLongRipple2Lorentz self) -> double
-
         double FormFactorLongRipple2Lorentz::getLength() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_getLength(self)
 
-
     def getAsymmetry(self):
-        """
+        r"""
         getAsymmetry(FormFactorLongRipple2Lorentz self) -> double
-
         double FormFactorLongRipple2Lorentz::getAsymmetry() const
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_getAsymmetry(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLongRipple2Lorentz self) -> double
-
         double FormFactorLongRipple2Lorentz::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14646,25 +11674,22 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLongRipple2Lorentz self, cvector_t q) -> complex_t
-
         complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorLongRipple2Lorentz_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Lorentz
-    __del__ = lambda self: None
-FormFactorLongRipple2Lorentz_swigregister = _libBornAgainCore.FormFactorLongRipple2Lorentz_swigregister
-FormFactorLongRipple2Lorentz_swigregister(FormFactorLongRipple2Lorentz)
+
+# Register FormFactorLongRipple2Lorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorLongRipple2Lorentz_swigregister(FormFactorLongRipple2Lorentz)
 
 class FormFactorLorentz(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor of a lorentzian.
@@ -14673,34 +11698,21 @@ class FormFactorLorentz(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorLorentz, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorLorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(FormFactorLorentz self, double length) -> FormFactorLorentz
         __init__(FormFactorLorentz self, double width, double height) -> FormFactorLorentz
-
         FormFactorLorentz::FormFactorLorentz(double width, double height)
 
         """
-        this = _libBornAgainCore.new_FormFactorLorentz(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorLorentz_swiginit(self, _libBornAgainCore.new_FormFactorLorentz(*args))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorLorentz self) -> FormFactorLorentz
-
         FormFactorLorentz* FormFactorLorentz::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14708,11 +11720,9 @@ class FormFactorLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLorentz_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorLorentz self, INodeVisitor visitor)
-
         void FormFactorLorentz::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14720,31 +11730,25 @@ class FormFactorLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLorentz_accept(self, visitor)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorLorentz self) -> double
-
         double FormFactorLorentz::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorLorentz_getWidth(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorLorentz self) -> double
-
         double FormFactorLorentz::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorLorentz_getHeight(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorLorentz self) -> double
-
         double FormFactorLorentz::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14752,25 +11756,22 @@ class FormFactorLorentz(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorLorentz_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorLorentz self, cvector_t q) -> complex_t
-
         complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorLorentz_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorLorentz
-    __del__ = lambda self: None
-FormFactorLorentz_swigregister = _libBornAgainCore.FormFactorLorentz_swigregister
-FormFactorLorentz_swigregister(FormFactorLorentz)
+
+# Register FormFactorLorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorLorentz_swigregister(FormFactorLorentz)
 
 class FormFactorOrnsteinZernike(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor of a Ornstein-Zernike (see doi:10.1038/pj.2010.110).
@@ -14779,33 +11780,20 @@ class FormFactorOrnsteinZernike(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorOrnsteinZernike, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorOrnsteinZernike, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, I0, xi_xy, xi_z):
-        """
+        r"""
         __init__(FormFactorOrnsteinZernike self, double I0, double xi_xy, double xi_z) -> FormFactorOrnsteinZernike
-
         FormFactorOrnsteinZernike::FormFactorOrnsteinZernike(double I0, double xi_xy, double xi_z)
 
         """
-        this = _libBornAgainCore.new_FormFactorOrnsteinZernike(I0, xi_xy, xi_z)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorOrnsteinZernike_swiginit(self, _libBornAgainCore.new_FormFactorOrnsteinZernike(I0, xi_xy, xi_z))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorOrnsteinZernike self) -> FormFactorOrnsteinZernike
-
         FormFactorOrnsteinZernike* FormFactorOrnsteinZernike::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14813,11 +11801,9 @@ class FormFactorOrnsteinZernike(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorOrnsteinZernike_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorOrnsteinZernike self, INodeVisitor visitor)
-
         void FormFactorOrnsteinZernike::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14825,11 +11811,9 @@ class FormFactorOrnsteinZernike(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorOrnsteinZernike_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorOrnsteinZernike self) -> double
-
         double FormFactorOrnsteinZernike::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -14837,25 +11821,22 @@ class FormFactorOrnsteinZernike(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorOrnsteinZernike_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorOrnsteinZernike self, cvector_t q) -> complex_t
-
         complex_t FormFactorOrnsteinZernike::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorOrnsteinZernike_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorOrnsteinZernike
-    __del__ = lambda self: None
-FormFactorOrnsteinZernike_swigregister = _libBornAgainCore.FormFactorOrnsteinZernike_swigregister
-FormFactorOrnsteinZernike_swigregister(FormFactorOrnsteinZernike)
+
+# Register FormFactorOrnsteinZernike in _libBornAgainCore:
+_libBornAgainCore.FormFactorOrnsteinZernike_swigregister(FormFactorOrnsteinZernike)
 
 class FormFactorPrism3(FormFactorPolygonalPrism):
-    """
+    r"""
 
 
     A prism based on an equilateral triangle.
@@ -14864,20 +11845,12 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolygonalPrism]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPrism3, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolygonalPrism]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPrism3, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, base_edge, height):
-        """
+        r"""
         __init__(FormFactorPrism3 self, double base_edge, double height) -> FormFactorPrism3
-
         FormFactorPrism3::FormFactorPrism3(double base_edge, double height)
 
         Constructor of a prism with an equilaterial triangle base.
@@ -14892,16 +11865,11 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
         height in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorPrism3(base_edge, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorPrism3_swiginit(self, _libBornAgainCore.new_FormFactorPrism3(base_edge, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorPrism3 self) -> FormFactorPrism3
-
         FormFactorPrism3* FormFactorPrism3::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14909,11 +11877,9 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
         """
         return _libBornAgainCore.FormFactorPrism3_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorPrism3 self, INodeVisitor visitor)
-
         void FormFactorPrism3::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -14921,23 +11887,20 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
         """
         return _libBornAgainCore.FormFactorPrism3_accept(self, visitor)
 
-
     def getBaseEdge(self):
-        """
+        r"""
         getBaseEdge(FormFactorPrism3 self) -> double
-
         double FormFactorPrism3::getBaseEdge() const
 
         """
         return _libBornAgainCore.FormFactorPrism3_getBaseEdge(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPrism3
-    __del__ = lambda self: None
-FormFactorPrism3_swigregister = _libBornAgainCore.FormFactorPrism3_swigregister
-FormFactorPrism3_swigregister(FormFactorPrism3)
+
+# Register FormFactorPrism3 in _libBornAgainCore:
+_libBornAgainCore.FormFactorPrism3_swigregister(FormFactorPrism3)
 
 class FormFactorPrism6(FormFactorPolygonalPrism):
-    """
+    r"""
 
 
     A prism based on a regular hexagonal.
@@ -14946,20 +11909,12 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolygonalPrism]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPrism6, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolygonalPrism]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPrism6, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, base_edge, height):
-        """
+        r"""
         __init__(FormFactorPrism6 self, double base_edge, double height) -> FormFactorPrism6
-
         FormFactorPrism6::FormFactorPrism6(double base_edge, double height)
 
         Constructor of a prism with a regular hexagonal base.
@@ -14974,16 +11929,11 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
         height in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorPrism6(base_edge, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorPrism6_swiginit(self, _libBornAgainCore.new_FormFactorPrism6(base_edge, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorPrism6 self) -> FormFactorPrism6
-
         FormFactorPrism6* FormFactorPrism6::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -14991,11 +11941,9 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
         """
         return _libBornAgainCore.FormFactorPrism6_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorPrism6 self, INodeVisitor visitor)
-
         void FormFactorPrism6::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15003,23 +11951,20 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
         """
         return _libBornAgainCore.FormFactorPrism6_accept(self, visitor)
 
-
     def getBaseEdge(self):
-        """
+        r"""
         getBaseEdge(FormFactorPrism6 self) -> double
-
         double FormFactorPrism6::getBaseEdge() const
 
         """
         return _libBornAgainCore.FormFactorPrism6_getBaseEdge(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPrism6
-    __del__ = lambda self: None
-FormFactorPrism6_swigregister = _libBornAgainCore.FormFactorPrism6_swigregister
-FormFactorPrism6_swigregister(FormFactorPrism6)
+
+# Register FormFactorPrism6 in _libBornAgainCore:
+_libBornAgainCore.FormFactorPrism6_swigregister(FormFactorPrism6)
 
 class FormFactorPyramid(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A frustum with a quadratic base.
@@ -15028,20 +11973,12 @@ class FormFactorPyramid(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorPyramid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorPyramid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, base_edge, height, alpha):
-        """
+        r"""
         __init__(FormFactorPyramid self, double base_edge, double height, double alpha) -> FormFactorPyramid
-
         FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)
 
         Constructor of a truncated pyramid with a square base
@@ -15059,16 +11996,11 @@ class FormFactorPyramid(FormFactorPolyhedron):
         dihedral angle between the base and a side face in radians 
 
         """
-        this = _libBornAgainCore.new_FormFactorPyramid(base_edge, height, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorPyramid_swiginit(self, _libBornAgainCore.new_FormFactorPyramid(base_edge, height, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorPyramid self) -> FormFactorPyramid
-
         FormFactorPyramid* FormFactorPyramid::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15076,11 +12008,9 @@ class FormFactorPyramid(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorPyramid_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorPyramid self, INodeVisitor visitor)
-
         void FormFactorPyramid::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15088,43 +12018,36 @@ class FormFactorPyramid(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorPyramid_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorPyramid self) -> double
-
         double FormFactorPyramid::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorPyramid_getHeight(self)
 
-
     def getBaseEdge(self):
-        """
+        r"""
         getBaseEdge(FormFactorPyramid self) -> double
-
         double FormFactorPyramid::getBaseEdge() const
 
         """
         return _libBornAgainCore.FormFactorPyramid_getBaseEdge(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorPyramid self) -> double
-
         double FormFactorPyramid::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorPyramid_getAlpha(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorPyramid
-    __del__ = lambda self: None
-FormFactorPyramid_swigregister = _libBornAgainCore.FormFactorPyramid_swigregister
-FormFactorPyramid_swigregister(FormFactorPyramid)
+
+# Register FormFactorPyramid in _libBornAgainCore:
+_libBornAgainCore.FormFactorPyramid_swigregister(FormFactorPyramid)
 
 class FormFactorRipple1(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a cosine ripple.
@@ -15133,20 +12056,12 @@ class FormFactorRipple1(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorRipple1, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorRipple1, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height):
-        """
+        r"""
         __init__(FormFactorRipple1 self, double length, double width, double height) -> FormFactorRipple1
-
         FormFactorRipple1::FormFactorRipple1(double length, double width, double height)
 
         Constructor of cosine ripple.
@@ -15164,16 +12079,11 @@ class FormFactorRipple1(IFormFactorBorn):
         height of the ripple in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorRipple1(length, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorRipple1_swiginit(self, _libBornAgainCore.new_FormFactorRipple1(length, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorRipple1 self) -> FormFactorRipple1
-
         FormFactorRipple1* FormFactorRipple1::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15181,11 +12091,9 @@ class FormFactorRipple1(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple1_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorRipple1 self, INodeVisitor visitor)
-
         void FormFactorRipple1::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15193,41 +12101,33 @@ class FormFactorRipple1(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple1_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorRipple1 self) -> double
-
         double FormFactorRipple1::getLength() const
 
         """
         return _libBornAgainCore.FormFactorRipple1_getLength(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorRipple1 self) -> double
-
         double FormFactorRipple1::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorRipple1_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorRipple1 self) -> double
-
         double FormFactorRipple1::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorRipple1_getWidth(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorRipple1 self) -> double
-
         double FormFactorRipple1::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15235,25 +12135,22 @@ class FormFactorRipple1(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple1_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorRipple1 self, cvector_t q) -> complex_t
-
         complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorRipple1_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1
-    __del__ = lambda self: None
-FormFactorRipple1_swigregister = _libBornAgainCore.FormFactorRipple1_swigregister
-FormFactorRipple1_swigregister(FormFactorRipple1)
+
+# Register FormFactorRipple1 in _libBornAgainCore:
+_libBornAgainCore.FormFactorRipple1_swigregister(FormFactorRipple1)
 
 class FormFactorRipple2(IFormFactorBorn):
-    """
+    r"""
 
 
     The formfactor for a triangular ripple.
@@ -15262,20 +12159,12 @@ class FormFactorRipple2(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorRipple2, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorRipple2, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, width, height, asymmetry):
-        """
+        r"""
         __init__(FormFactorRipple2 self, double length, double width, double height, double asymmetry) -> FormFactorRipple2
-
         FormFactorRipple2::FormFactorRipple2(double length, double width, double height, double asymmetry)
 
         Constructor of a triangular ripple.
@@ -15296,16 +12185,11 @@ class FormFactorRipple2(IFormFactorBorn):
         asymmetry length of the triangular profile in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorRipple2(length, width, height, asymmetry)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorRipple2_swiginit(self, _libBornAgainCore.new_FormFactorRipple2(length, width, height, asymmetry))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorRipple2 self) -> FormFactorRipple2
-
         FormFactorRipple2* FormFactorRipple2::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15313,11 +12197,9 @@ class FormFactorRipple2(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple2_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorRipple2 self, INodeVisitor visitor)
-
         void FormFactorRipple2::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15325,51 +12207,41 @@ class FormFactorRipple2(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple2_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorRipple2 self) -> double
-
         double FormFactorRipple2::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorRipple2_getHeight(self)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(FormFactorRipple2 self) -> double
-
         double FormFactorRipple2::getWidth() const
 
         """
         return _libBornAgainCore.FormFactorRipple2_getWidth(self)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorRipple2 self) -> double
-
         double FormFactorRipple2::getLength() const
 
         """
         return _libBornAgainCore.FormFactorRipple2_getLength(self)
 
-
     def getAsymmetry(self):
-        """
+        r"""
         getAsymmetry(FormFactorRipple2 self) -> double
-
         double FormFactorRipple2::getAsymmetry() const
 
         """
         return _libBornAgainCore.FormFactorRipple2_getAsymmetry(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorRipple2 self) -> double
-
         double FormFactorRipple2::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15377,25 +12249,22 @@ class FormFactorRipple2(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorRipple2_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorRipple2 self, cvector_t q) -> complex_t
-
         complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorRipple2_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2
-    __del__ = lambda self: None
-FormFactorRipple2_swigregister = _libBornAgainCore.FormFactorRipple2_swigregister
-FormFactorRipple2_swigregister(FormFactorRipple2)
+
+# Register FormFactorRipple2 in _libBornAgainCore:
+_libBornAgainCore.FormFactorRipple2_swigregister(FormFactorRipple2)
 
 class FormFactorSphereGaussianRadius(IFormFactorBorn):
-    """
+    r"""
 
 
     A sphere with gaussian radius distribution.
@@ -15404,33 +12273,20 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorSphereGaussianRadius, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorSphereGaussianRadius, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, mean, sigma):
-        """
+        r"""
         __init__(FormFactorSphereGaussianRadius self, double mean, double sigma) -> FormFactorSphereGaussianRadius
-
         FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
 
         """
-        this = _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorSphereGaussianRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorSphereGaussianRadius self) -> FormFactorSphereGaussianRadius
-
         FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15438,11 +12294,9 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereGaussianRadius_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorSphereGaussianRadius self, INodeVisitor visitor)
-
         void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15450,11 +12304,9 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereGaussianRadius_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorSphereGaussianRadius self) -> double
-
         double FormFactorSphereGaussianRadius::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15462,25 +12314,22 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereGaussianRadius_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorSphereGaussianRadius self, cvector_t q) -> complex_t
-
         complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorSphereGaussianRadius_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereGaussianRadius
-    __del__ = lambda self: None
-FormFactorSphereGaussianRadius_swigregister = _libBornAgainCore.FormFactorSphereGaussianRadius_swigregister
-FormFactorSphereGaussianRadius_swigregister(FormFactorSphereGaussianRadius)
+
+# Register FormFactorSphereGaussianRadius in _libBornAgainCore:
+_libBornAgainCore.FormFactorSphereGaussianRadius_swigregister(FormFactorSphereGaussianRadius)
 
 class FormFactorSphereLogNormalRadius(IFormFactorBorn):
-    """
+    r"""
 
 
     A sphere with log normal radius distribution.
@@ -15489,33 +12338,20 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorSphereLogNormalRadius, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorSphereLogNormalRadius, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, mean, scale_param, n_samples):
-        """
+        r"""
         __init__(FormFactorSphereLogNormalRadius self, double mean, double scale_param, size_t n_samples) -> FormFactorSphereLogNormalRadius
-
         FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)
 
         """
-        this = _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorSphereLogNormalRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorSphereLogNormalRadius self) -> FormFactorSphereLogNormalRadius
-
         FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15523,11 +12359,9 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereLogNormalRadius_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorSphereLogNormalRadius self, INodeVisitor visitor)
-
         void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15535,11 +12369,9 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereLogNormalRadius_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorSphereLogNormalRadius self) -> double
-
         double FormFactorSphereLogNormalRadius::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15547,25 +12379,22 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereLogNormalRadius_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorSphereLogNormalRadius self, cvector_t q) -> complex_t
-
         complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorSphereLogNormalRadius_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereLogNormalRadius
-    __del__ = lambda self: None
-FormFactorSphereLogNormalRadius_swigregister = _libBornAgainCore.FormFactorSphereLogNormalRadius_swigregister
-FormFactorSphereLogNormalRadius_swigregister(FormFactorSphereLogNormalRadius)
+
+# Register FormFactorSphereLogNormalRadius in _libBornAgainCore:
+_libBornAgainCore.FormFactorSphereLogNormalRadius_swigregister(FormFactorSphereLogNormalRadius)
 
 class FormFactorSphereUniformRadius(IFormFactorBorn):
-    """
+    r"""
 
 
     Integrated full sphere form factor over a uniform distribution of radii.
@@ -15574,33 +12403,20 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorSphereUniformRadius, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorSphereUniformRadius, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, mean, full_width):
-        """
+        r"""
         __init__(FormFactorSphereUniformRadius self, double mean, double full_width) -> FormFactorSphereUniformRadius
-
         FormFactorSphereUniformRadius::FormFactorSphereUniformRadius(double mean, double full_width)
 
         """
-        this = _libBornAgainCore.new_FormFactorSphereUniformRadius(mean, full_width)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorSphereUniformRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereUniformRadius(mean, full_width))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorSphereUniformRadius self) -> FormFactorSphereUniformRadius
-
         FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15608,11 +12424,9 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereUniformRadius_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorSphereUniformRadius self, INodeVisitor visitor)
-
         void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15620,11 +12434,9 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereUniformRadius_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorSphereUniformRadius self) -> double
-
         double FormFactorSphereUniformRadius::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15632,25 +12444,22 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorSphereUniformRadius_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorSphereUniformRadius self, cvector_t q) -> complex_t
-
         complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorSphereUniformRadius_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorSphereUniformRadius
-    __del__ = lambda self: None
-FormFactorSphereUniformRadius_swigregister = _libBornAgainCore.FormFactorSphereUniformRadius_swigregister
-FormFactorSphereUniformRadius_swigregister(FormFactorSphereUniformRadius)
+
+# Register FormFactorSphereUniformRadius in _libBornAgainCore:
+_libBornAgainCore.FormFactorSphereUniformRadius_swigregister(FormFactorSphereUniformRadius)
 
 class FormFactorTetrahedron(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A frustum with equilateral trigonal base.
@@ -15659,20 +12468,12 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorTetrahedron, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorTetrahedron, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, base_edge, height, alpha):
-        """
+        r"""
         __init__(FormFactorTetrahedron self, double base_edge, double height, double alpha) -> FormFactorTetrahedron
-
         FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)
 
         Constructor of a truncated tethrahedron.
@@ -15690,16 +12491,11 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
         dihedral angle in radians between base and facet 
 
         """
-        this = _libBornAgainCore.new_FormFactorTetrahedron(base_edge, height, alpha)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorTetrahedron_swiginit(self, _libBornAgainCore.new_FormFactorTetrahedron(base_edge, height, alpha))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorTetrahedron self) -> FormFactorTetrahedron
-
         FormFactorTetrahedron* FormFactorTetrahedron::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15707,11 +12503,9 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorTetrahedron_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorTetrahedron self, INodeVisitor visitor)
-
         void FormFactorTetrahedron::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15719,43 +12513,36 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorTetrahedron_accept(self, visitor)
 
-
     def getBaseEdge(self):
-        """
+        r"""
         getBaseEdge(FormFactorTetrahedron self) -> double
-
         double FormFactorTetrahedron::getBaseEdge() const
 
         """
         return _libBornAgainCore.FormFactorTetrahedron_getBaseEdge(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorTetrahedron self) -> double
-
         double FormFactorTetrahedron::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorTetrahedron_getHeight(self)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(FormFactorTetrahedron self) -> double
-
         double FormFactorTetrahedron::getAlpha() const
 
         """
         return _libBornAgainCore.FormFactorTetrahedron_getAlpha(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorTetrahedron
-    __del__ = lambda self: None
-FormFactorTetrahedron_swigregister = _libBornAgainCore.FormFactorTetrahedron_swigregister
-FormFactorTetrahedron_swigregister(FormFactorTetrahedron)
+
+# Register FormFactorTetrahedron in _libBornAgainCore:
+_libBornAgainCore.FormFactorTetrahedron_swigregister(FormFactorTetrahedron)
 
 class FormFactorTruncatedCube(FormFactorPolyhedron):
-    """
+    r"""
 
 
     A cube, with tetrahedral truncation of all edges.
@@ -15764,20 +12551,12 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorTruncatedCube, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FormFactorPolyhedron]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorTruncatedCube, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, removed_length):
-        """
+        r"""
         __init__(FormFactorTruncatedCube self, double length, double removed_length) -> FormFactorTruncatedCube
-
         FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)
 
         Constructor of a truncated cube.
@@ -15792,16 +12571,11 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
         removed length from each edge of the cube in nanometers 
 
         """
-        this = _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorTruncatedCube_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorTruncatedCube self) -> FormFactorTruncatedCube
-
         FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15809,11 +12583,9 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorTruncatedCube_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorTruncatedCube self, INodeVisitor visitor)
-
         void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15821,33 +12593,28 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
         """
         return _libBornAgainCore.FormFactorTruncatedCube_accept(self, visitor)
 
-
     def getLength(self):
-        """
+        r"""
         getLength(FormFactorTruncatedCube self) -> double
-
         double FormFactorTruncatedCube::getLength() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedCube_getLength(self)
 
-
     def getRemovedLength(self):
-        """
+        r"""
         getRemovedLength(FormFactorTruncatedCube self) -> double
-
         double FormFactorTruncatedCube::getRemovedLength() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedCube_getRemovedLength(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedCube
-    __del__ = lambda self: None
-FormFactorTruncatedCube_swigregister = _libBornAgainCore.FormFactorTruncatedCube_swigregister
-FormFactorTruncatedCube_swigregister(FormFactorTruncatedCube)
+
+# Register FormFactorTruncatedCube in _libBornAgainCore:
+_libBornAgainCore.FormFactorTruncatedCube_swigregister(FormFactorTruncatedCube)
 
 class FormFactorTruncatedSphere(IFormFactorBorn):
-    """
+    r"""
 
 
     A truncated Sphere.
@@ -15856,21 +12623,12 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorTruncatedSphere, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorTruncatedSphere, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, height, dh=0.0):
-        """
+        r"""
         __init__(FormFactorTruncatedSphere self, double radius, double height, double dh=0.0) -> FormFactorTruncatedSphere
-        __init__(FormFactorTruncatedSphere self, double radius, double height) -> FormFactorTruncatedSphere
-
         FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh=0.0)
 
         Constructor of a spherical dome.
@@ -15888,16 +12646,11 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
         length of cup truncated from the top 
 
         """
-        this = _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height, dh)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorTruncatedSphere_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height, dh))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorTruncatedSphere self) -> FormFactorTruncatedSphere
-
         FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -15905,11 +12658,9 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorTruncatedSphere self, INodeVisitor visitor)
-
         void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -15917,41 +12668,33 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_accept(self, visitor)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorTruncatedSphere self) -> double
-
         double FormFactorTruncatedSphere::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_getHeight(self)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorTruncatedSphere self) -> double
-
         double FormFactorTruncatedSphere::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_getRadius(self)
 
-
     def getRemovedTop(self):
-        """
+        r"""
         getRemovedTop(FormFactorTruncatedSphere self) -> double
-
         double FormFactorTruncatedSphere::getRemovedTop() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_getRemovedTop(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorTruncatedSphere self) -> double
-
         double FormFactorTruncatedSphere::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -15959,25 +12702,22 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t
-
         complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const override final
 
         Complex formfactor. 
 
         """
         return _libBornAgainCore.FormFactorTruncatedSphere_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSphere
-    __del__ = lambda self: None
-FormFactorTruncatedSphere_swigregister = _libBornAgainCore.FormFactorTruncatedSphere_swigregister
-FormFactorTruncatedSphere_swigregister(FormFactorTruncatedSphere)
+
+# Register FormFactorTruncatedSphere in _libBornAgainCore:
+_libBornAgainCore.FormFactorTruncatedSphere_swigregister(FormFactorTruncatedSphere)
 
 class FormFactorTruncatedSpheroid(IFormFactorBorn):
-    """
+    r"""
 
 
     A truncated spheroid. An ellipsoid with two equal axis, truncated by a plane perpendicular to the third axis.
@@ -15986,21 +12726,12 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorTruncatedSpheroid, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactorBorn]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorTruncatedSpheroid, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, height, height_flattening, dh=0.0):
-        """
+        r"""
         __init__(FormFactorTruncatedSpheroid self, double radius, double height, double height_flattening, double dh=0.0) -> FormFactorTruncatedSpheroid
-        __init__(FormFactorTruncatedSpheroid self, double radius, double height, double height_flattening) -> FormFactorTruncatedSpheroid
-
         FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh=0.0)
 
         Constructor of a spheroidal dome.
@@ -16021,16 +12752,11 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
         length of cup truncated from the top 
 
         """
-        this = _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening, dh)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorTruncatedSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening, dh))
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorTruncatedSpheroid self) -> FormFactorTruncatedSpheroid
-
         FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -16038,11 +12764,9 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorTruncatedSpheroid self, INodeVisitor visitor)
-
         void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -16050,51 +12774,41 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_accept(self, visitor)
 
-
     def getRadius(self):
-        """
+        r"""
         getRadius(FormFactorTruncatedSpheroid self) -> double
-
         double FormFactorTruncatedSpheroid::getRadius() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_getRadius(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(FormFactorTruncatedSpheroid self) -> double
-
         double FormFactorTruncatedSpheroid::getHeight() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_getHeight(self)
 
-
     def getHeightFlattening(self):
-        """
+        r"""
         getHeightFlattening(FormFactorTruncatedSpheroid self) -> double
-
         double FormFactorTruncatedSpheroid::getHeightFlattening() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_getHeightFlattening(self)
 
-
     def getRemovedTop(self):
-        """
+        r"""
         getRemovedTop(FormFactorTruncatedSpheroid self) -> double
-
         double FormFactorTruncatedSpheroid::getRemovedTop() const
 
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_getRemovedTop(self)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorTruncatedSpheroid self) -> double
-
         double FormFactorTruncatedSpheroid::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -16102,25 +12816,22 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_radialExtension(self)
 
-
     def evaluate_for_q(self, q):
-        """
+        r"""
         evaluate_for_q(FormFactorTruncatedSpheroid self, cvector_t q) -> complex_t
-
         complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const override final
 
         Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. 
 
         """
         return _libBornAgainCore.FormFactorTruncatedSpheroid_evaluate_for_q(self, q)
-
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSpheroid
-    __del__ = lambda self: None
-FormFactorTruncatedSpheroid_swigregister = _libBornAgainCore.FormFactorTruncatedSpheroid_swigregister
-FormFactorTruncatedSpheroid_swigregister(FormFactorTruncatedSpheroid)
+
+# Register FormFactorTruncatedSpheroid in _libBornAgainCore:
+_libBornAgainCore.FormFactorTruncatedSpheroid_swigregister(FormFactorTruncatedSpheroid)
 
 class FormFactorWeighted(IFormFactor):
-    """
+    r"""
 
 
     Coherent sum of different scalar  IFormFactor's with different weights.
@@ -16131,35 +12842,21 @@ class FormFactorWeighted(IFormFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FormFactorWeighted, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFormFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FormFactorWeighted, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(FormFactorWeighted self) -> FormFactorWeighted
-
         FormFactorWeighted::FormFactorWeighted()
 
         """
-        this = _libBornAgainCore.new_FormFactorWeighted()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FormFactorWeighted_swiginit(self, _libBornAgainCore.new_FormFactorWeighted())
     __swig_destroy__ = _libBornAgainCore.delete_FormFactorWeighted
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(FormFactorWeighted self) -> FormFactorWeighted
-
         FormFactorWeighted * FormFactorWeighted::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -16167,11 +12864,9 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(FormFactorWeighted self, INodeVisitor visitor)
-
         void FormFactorWeighted::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -16179,11 +12874,9 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_accept(self, visitor)
 
-
     def radialExtension(self):
-        """
+        r"""
         radialExtension(FormFactorWeighted self) -> double
-
         double FormFactorWeighted::radialExtension() const override final
 
         Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations 
@@ -16191,11 +12884,9 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_radialExtension(self)
 
-
     def bottomZ(self, rotation):
-        """
+        r"""
         bottomZ(FormFactorWeighted self, IRotation rotation) -> double
-
         double FormFactorWeighted::bottomZ(const IRotation &rotation) const override final
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -16203,11 +12894,9 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_bottomZ(self, rotation)
 
-
     def topZ(self, rotation):
-        """
+        r"""
         topZ(FormFactorWeighted self, IRotation rotation) -> double
-
         double FormFactorWeighted::topZ(const IRotation &rotation) const override final
 
         Returns the z-coordinate of the lowest point in this shape after a given rotation. 
@@ -16215,22 +12904,17 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_topZ(self, rotation)
 
-
     def addFormFactor(self, form_factor, weight=1.0):
-        """
+        r"""
         addFormFactor(FormFactorWeighted self, IFormFactor form_factor, double weight=1.0)
-        addFormFactor(FormFactorWeighted self, IFormFactor form_factor)
-
         void FormFactorWeighted::addFormFactor(const IFormFactor &form_factor, double weight=1.0)
 
         """
         return _libBornAgainCore.FormFactorWeighted_addFormFactor(self, form_factor, weight)
 
-
     def setAmbientMaterial(self, material):
-        """
+        r"""
         setAmbientMaterial(FormFactorWeighted self, Material material)
-
         void FormFactorWeighted::setAmbientMaterial(Material material) override final
 
         Passes the material in which this particle is embedded. 
@@ -16238,11 +12922,9 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_setAmbientMaterial(self, material)
 
-
     def evaluate(self, wavevectors):
-        """
+        r"""
         evaluate(FormFactorWeighted self, WavevectorInfo wavevectors) -> complex_t
-
         complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const override final
 
         Returns scattering amplitude for complex wavevectors ki, kf. 
@@ -16250,11 +12932,11 @@ class FormFactorWeighted(IFormFactor):
         """
         return _libBornAgainCore.FormFactorWeighted_evaluate(self, wavevectors)
 
-FormFactorWeighted_swigregister = _libBornAgainCore.FormFactorWeighted_swigregister
-FormFactorWeighted_swigregister(FormFactorWeighted)
+# Register FormFactorWeighted in _libBornAgainCore:
+_libBornAgainCore.FormFactorWeighted_swigregister(FormFactorWeighted)
 
 class IFootprintFactor(ICloneable, INode):
-    """
+    r"""
 
 
     Abstract base for classes that calculate the beam footprint factor
@@ -16263,55 +12945,40 @@ class IFootprintFactor(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IFootprintFactor, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IFootprintFactor, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IFootprintFactor
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IFootprintFactor self) -> IFootprintFactor
-
         virtual IFootprintFactor* IFootprintFactor::clone() const =0
 
         """
         return _libBornAgainCore.IFootprintFactor_clone(self)
 
-
     def setWidthRatio(self, width_ratio):
-        """
+        r"""
         setWidthRatio(IFootprintFactor self, double width_ratio)
-
         void IFootprintFactor::setWidthRatio(double width_ratio)
 
         """
         return _libBornAgainCore.IFootprintFactor_setWidthRatio(self, width_ratio)
 
-
     def widthRatio(self):
-        """
+        r"""
         widthRatio(IFootprintFactor self) -> double
-
         double IFootprintFactor::widthRatio() const
 
         """
         return _libBornAgainCore.IFootprintFactor_widthRatio(self)
 
-
     def calculate(self, alpha):
-        """
+        r"""
         calculate(IFootprintFactor self, double alpha) -> double
-
         virtual double IFootprintFactor::calculate(double alpha) const =0
 
         Calculate footprint correction coefficient from the beam incident angle  alpha. 
@@ -16319,11 +12986,9 @@ class IFootprintFactor(ICloneable, INode):
         """
         return _libBornAgainCore.IFootprintFactor_calculate(self, alpha)
 
-
     def _print(self):
-        """
+        r"""
         _print(IFootprintFactor self) -> std::string
-
         virtual std::string IFootprintFactor::print() const =0
 
         Print python-formatted footprint definition. 
@@ -16331,11 +12996,11 @@ class IFootprintFactor(ICloneable, INode):
         """
         return _libBornAgainCore.IFootprintFactor__print(self)
 
-IFootprintFactor_swigregister = _libBornAgainCore.IFootprintFactor_swigregister
-IFootprintFactor_swigregister(IFootprintFactor)
+# Register IFootprintFactor in _libBornAgainCore:
+_libBornAgainCore.IFootprintFactor_swigregister(IFootprintFactor)
 
 class FootprintFactorGaussian(IFootprintFactor):
-    """
+    r"""
 
 
     Calculates footprint coefficient for a gaussian beam  Beam width is interpreted as the full width on the level of  \\[ \\exp{-1/2} \\] from the peak intensity.
@@ -16344,33 +13009,20 @@ class FootprintFactorGaussian(IFootprintFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFootprintFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FootprintFactorGaussian, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFootprintFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FootprintFactorGaussian, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, width_ratio):
-        """
+        r"""
         __init__(FootprintFactorGaussian self, double width_ratio) -> FootprintFactorGaussian
-
         FootprintFactorGaussian::FootprintFactorGaussian(double width_ratio)
 
         """
-        this = _libBornAgainCore.new_FootprintFactorGaussian(width_ratio)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FootprintFactorGaussian_swiginit(self, _libBornAgainCore.new_FootprintFactorGaussian(width_ratio))
 
     def accept(self, visitor):
-        """
+        r"""
         accept(FootprintFactorGaussian self, INodeVisitor visitor)
-
         void FootprintFactorGaussian::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -16378,21 +13030,17 @@ class FootprintFactorGaussian(IFootprintFactor):
         """
         return _libBornAgainCore.FootprintFactorGaussian_accept(self, visitor)
 
-
     def clone(self):
-        """
+        r"""
         clone(FootprintFactorGaussian self) -> FootprintFactorGaussian
-
         FootprintFactorGaussian * FootprintFactorGaussian::clone() const override
 
         """
         return _libBornAgainCore.FootprintFactorGaussian_clone(self)
 
-
     def calculate(self, alpha):
-        """
+        r"""
         calculate(FootprintFactorGaussian self, double alpha) -> double
-
         double FootprintFactorGaussian::calculate(double alpha) const override
 
         Calculate footprint correction coefficient from the beam incident angle  alpha. 
@@ -16400,25 +13048,22 @@ class FootprintFactorGaussian(IFootprintFactor):
         """
         return _libBornAgainCore.FootprintFactorGaussian_calculate(self, alpha)
 
-
     def _print(self):
-        """
+        r"""
         _print(FootprintFactorGaussian self) -> std::string
-
         std::string FootprintFactorGaussian::print() const override
 
         Print python-formatted footprint definition. 
 
         """
         return _libBornAgainCore.FootprintFactorGaussian__print(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FootprintFactorGaussian
-    __del__ = lambda self: None
-FootprintFactorGaussian_swigregister = _libBornAgainCore.FootprintFactorGaussian_swigregister
-FootprintFactorGaussian_swigregister(FootprintFactorGaussian)
+
+# Register FootprintFactorGaussian in _libBornAgainCore:
+_libBornAgainCore.FootprintFactorGaussian_swigregister(FootprintFactorGaussian)
 
 class FootprintFactorSquare(IFootprintFactor):
-    """
+    r"""
 
 
     Calculates footprint coefficient for a square beam
@@ -16427,33 +13072,20 @@ class FootprintFactorSquare(IFootprintFactor):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IFootprintFactor]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FootprintFactorSquare, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IFootprintFactor]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FootprintFactorSquare, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, width_ratio):
-        """
+        r"""
         __init__(FootprintFactorSquare self, double width_ratio) -> FootprintFactorSquare
-
         FootprintFactorSquare::FootprintFactorSquare(double width_ratio)
 
         """
-        this = _libBornAgainCore.new_FootprintFactorSquare(width_ratio)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.FootprintFactorSquare_swiginit(self, _libBornAgainCore.new_FootprintFactorSquare(width_ratio))
 
     def accept(self, visitor):
-        """
+        r"""
         accept(FootprintFactorSquare self, INodeVisitor visitor)
-
         void FootprintFactorSquare::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -16461,21 +13093,17 @@ class FootprintFactorSquare(IFootprintFactor):
         """
         return _libBornAgainCore.FootprintFactorSquare_accept(self, visitor)
 
-
     def clone(self):
-        """
+        r"""
         clone(FootprintFactorSquare self) -> FootprintFactorSquare
-
         FootprintFactorSquare * FootprintFactorSquare::clone() const override
 
         """
         return _libBornAgainCore.FootprintFactorSquare_clone(self)
 
-
     def calculate(self, alpha):
-        """
+        r"""
         calculate(FootprintFactorSquare self, double alpha) -> double
-
         double FootprintFactorSquare::calculate(double alpha) const override
 
         Calculate footprint correction coefficient from the beam incident angle  alpha. 
@@ -16483,25 +13111,22 @@ class FootprintFactorSquare(IFootprintFactor):
         """
         return _libBornAgainCore.FootprintFactorSquare_calculate(self, alpha)
 
-
     def _print(self):
-        """
+        r"""
         _print(FootprintFactorSquare self) -> std::string
-
         std::string FootprintFactorSquare::print() const override
 
         Print python-formatted footprint definition. 
 
         """
         return _libBornAgainCore.FootprintFactorSquare__print(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_FootprintFactorSquare
-    __del__ = lambda self: None
-FootprintFactorSquare_swigregister = _libBornAgainCore.FootprintFactorSquare_swigregister
-FootprintFactorSquare_swigregister(FootprintFactorSquare)
+
+# Register FootprintFactorSquare in _libBornAgainCore:
+_libBornAgainCore.FootprintFactorSquare_swigregister(FootprintFactorSquare)
 
 class Simulation(ICloneable, INode):
-    """
+    r"""
 
 
     Pure virtual base class of OffSpecularSimulation,  GISASSimulation and  SpecularSimulation. Holds the common infrastructure to run a simulation: multithreading, batch processing, weighting over parameter distributions, ...
@@ -16510,35 +13135,24 @@ class Simulation(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Simulation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Simulation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_Simulation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(Simulation self) -> Simulation
-
         virtual Simulation* Simulation::clone() const =0
 
         """
         return _libBornAgainCore.Simulation_clone(self)
 
-
     def prepareSimulation(self):
-        """
+        r"""
         prepareSimulation(Simulation self)
-
         void Simulation::prepareSimulation()
 
         Put into a clean state for running a simulation. 
@@ -16546,11 +13160,9 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_prepareSimulation(self)
 
-
     def runSimulation(self):
-        """
+        r"""
         runSimulation(Simulation self)
-
         void Simulation::runSimulation()
 
         Run a simulation, possibly averaged over parameter distributions.
@@ -16560,11 +13172,9 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_runSimulation(self)
 
-
     def runMPISimulation(self):
-        """
+        r"""
         runMPISimulation(Simulation self)
-
         void Simulation::runMPISimulation()
 
         Run a simulation in a MPI environment. 
@@ -16572,52 +13182,42 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_runMPISimulation(self)
 
-
     def setInstrument(self, instrument):
-        """
+        r"""
         setInstrument(Simulation self, Instrument instrument)
-
         void Simulation::setInstrument(const Instrument &instrument)
 
         """
         return _libBornAgainCore.Simulation_setInstrument(self, instrument)
 
-
     def getInstrument(self, *args):
-        """
+        r"""
         getInstrument(Simulation self) -> Instrument
         getInstrument(Simulation self) -> Instrument
-
         Instrument& Simulation::getInstrument()
 
         """
         return _libBornAgainCore.Simulation_getInstrument(self, *args)
 
-
     def setBeamIntensity(self, intensity):
-        """
+        r"""
         setBeamIntensity(Simulation self, double intensity)
-
         void Simulation::setBeamIntensity(double intensity)
 
         """
         return _libBornAgainCore.Simulation_setBeamIntensity(self, intensity)
 
-
     def getBeamIntensity(self):
-        """
+        r"""
         getBeamIntensity(Simulation self) -> double
-
         double Simulation::getBeamIntensity() const
 
         """
         return _libBornAgainCore.Simulation_getBeamIntensity(self)
 
-
     def setBeamPolarization(self, bloch_vector):
-        """
+        r"""
         setBeamPolarization(Simulation self, kvector_t bloch_vector)
-
         void Simulation::setBeamPolarization(const kvector_t bloch_vector)
 
         Sets the beam polarization according to the given Bloch vector. 
@@ -16625,31 +13225,25 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_setBeamPolarization(self, bloch_vector)
 
-
     def setDetectorResolutionFunction(self, resolution_function):
-        """
+        r"""
         setDetectorResolutionFunction(Simulation self, IResolutionFunction2D resolution_function)
-
         void Simulation::setDetectorResolutionFunction(const IResolutionFunction2D &resolution_function)
 
         """
         return _libBornAgainCore.Simulation_setDetectorResolutionFunction(self, resolution_function)
 
-
     def removeDetectorResolutionFunction(self):
-        """
+        r"""
         removeDetectorResolutionFunction(Simulation self)
-
         void Simulation::removeDetectorResolutionFunction()
 
         """
         return _libBornAgainCore.Simulation_removeDetectorResolutionFunction(self)
 
-
     def setAnalyzerProperties(self, direction, efficiency, total_transmission):
-        """
+        r"""
         setAnalyzerProperties(Simulation self, kvector_t direction, double efficiency, double total_transmission)
-
         void Simulation::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)
 
         Sets the polarization analyzer characteristics of the detector. 
@@ -16657,11 +13251,9 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_setAnalyzerProperties(self, direction, efficiency, total_transmission)
 
-
     def setSample(self, sample):
-        """
+        r"""
         setSample(Simulation self, MultiLayer sample)
-
         void Simulation::setSample(const MultiLayer &sample)
 
         The  MultiLayer object will not be owned by the  Simulation object. 
@@ -16669,51 +13261,41 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_setSample(self, sample)
 
-
     def sample(self):
-        """
+        r"""
         sample(Simulation self) -> MultiLayer
-
         const MultiLayer * Simulation::sample() const
 
         """
         return _libBornAgainCore.Simulation_sample(self)
 
-
     def setSampleBuilderCpp(self, sample_builder):
-        """
+        r"""
         setSampleBuilderCpp(Simulation self, std::shared_ptr< IMultiLayerBuilder > const sample_builder)
-
         void Simulation::setSampleBuilder(const std::shared_ptr< IMultiLayerBuilder > sample_builder)
 
         """
         return _libBornAgainCore.Simulation_setSampleBuilderCpp(self, sample_builder)
 
-
     def setBackground(self, bg):
-        """
+        r"""
         setBackground(Simulation self, IBackground bg)
-
         void Simulation::setBackground(const IBackground &bg)
 
         """
         return _libBornAgainCore.Simulation_setBackground(self, bg)
 
-
     def background(self):
-        """
+        r"""
         background(Simulation self) -> IBackground
-
         const IBackground* Simulation::background() const
 
         """
         return _libBornAgainCore.Simulation_background(self)
 
-
     def intensityMapSize(self):
-        """
+        r"""
         intensityMapSize(Simulation self) -> size_t
-
         virtual size_t Simulation::intensityMapSize() const =0
 
         Returns the total number of the intensity values in the simulation result. 
@@ -16721,11 +13303,9 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_intensityMapSize(self)
 
-
     def result(self):
-        """
+        r"""
         result(Simulation self) -> SimulationResult
-
         virtual SimulationResult Simulation::result() const =0
 
         Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays 
@@ -16733,65 +13313,51 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_result(self)
 
-
     def addParameterDistribution(self, *args):
-        """
-        addParameterDistribution(Simulation self, std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits)
-        addParameterDistribution(Simulation self, std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0)
-        addParameterDistribution(Simulation self, std::string const & param_name, IDistribution1D distribution, size_t nbr_samples)
+        r"""
+        addParameterDistribution(Simulation self, std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits=RealLimits())
         addParameterDistribution(Simulation self, ParameterDistribution par_distr)
-
         void Simulation::addParameterDistribution(const ParameterDistribution &par_distr)
 
         """
         return _libBornAgainCore.Simulation_addParameterDistribution(self, *args)
 
-
     def getDistributionHandler(self):
-        """
+        r"""
         getDistributionHandler(Simulation self) -> DistributionHandler const &
-
         const DistributionHandler& Simulation::getDistributionHandler() const
 
         """
         return _libBornAgainCore.Simulation_getDistributionHandler(self)
 
-
     def setOptions(self, options):
-        """
+        r"""
         setOptions(Simulation self, SimulationOptions options)
-
         void Simulation::setOptions(const SimulationOptions &options)
 
         """
         return _libBornAgainCore.Simulation_setOptions(self, options)
 
-
     def getOptions(self, *args):
-        """
+        r"""
         getOptions(Simulation self) -> SimulationOptions
         getOptions(Simulation self) -> SimulationOptions
-
         SimulationOptions& Simulation::getOptions()
 
         """
         return _libBornAgainCore.Simulation_getOptions(self, *args)
 
-
     def subscribe(self, inform):
-        """
+        r"""
         subscribe(Simulation self, ProgressHandler::Callback_t inform)
-
         void Simulation::subscribe(ProgressHandler::Callback_t inform)
 
         """
         return _libBornAgainCore.Simulation_subscribe(self, inform)
 
-
     def setTerminalProgressMonitor(self):
-        """
+        r"""
         setTerminalProgressMonitor(Simulation self)
-
         void Simulation::setTerminalProgressMonitor()
 
         Initializes a progress monitor that prints to stdout. 
@@ -16799,11 +13365,9 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_setTerminalProgressMonitor(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Simulation self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Simulation::getChildren() const
 
         Returns a vector of children (const). 
@@ -16811,16 +13375,16 @@ class Simulation(ICloneable, INode):
         """
         return _libBornAgainCore.Simulation_getChildren(self)
 
-
     def setSampleBuilder(self, ptr):
         self.samplebuilder = ptr
         self.setSampleBuilderCpp(ptr)
 
-Simulation_swigregister = _libBornAgainCore.Simulation_swigregister
-Simulation_swigregister(Simulation)
+
+# Register Simulation in _libBornAgainCore:
+_libBornAgainCore.Simulation_swigregister(Simulation)
 
 class Simulation2D(Simulation):
-    """
+    r"""
 
 
     Pure virtual base class of OffSpecularSimulation and  GISASSimulation. Holds the common implementations for simulations with a 2D detector
@@ -16829,35 +13393,24 @@ class Simulation2D(Simulation):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [Simulation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Simulation2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Simulation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Simulation2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_Simulation2D
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(Simulation2D self) -> Simulation2D
-
         Simulation2D* Simulation2D::clone() const override=0
 
         """
         return _libBornAgainCore.Simulation2D_clone(self)
 
-
     def prepareSimulation(self):
-        """
+        r"""
         prepareSimulation(Simulation2D self)
-
         void Simulation2D::prepareSimulation() override
 
         Put into a clean state for running a simulation. 
@@ -16865,11 +13418,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_prepareSimulation(self)
 
-
     def setDetectorParameters(self, n_phi, phi_min, phi_max, n_alpha, alpha_min, alpha_max):
-        """
+        r"""
         setDetectorParameters(Simulation2D self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)
-
         void Simulation2D::setDetectorParameters(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)
 
         Sets spherical detector parameters using angle ranges
@@ -16898,11 +13449,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_setDetectorParameters(self, n_phi, phi_min, phi_max, n_alpha, alpha_min, alpha_max)
 
-
     def setDetector(self, detector):
-        """
+        r"""
         setDetector(Simulation2D self, IDetector2D detector)
-
         void Simulation2D::setDetector(const IDetector2D &detector)
 
         Sets the detector (axes can be overwritten later) 
@@ -16910,11 +13459,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_setDetector(self, detector)
 
-
     def removeMasks(self):
-        """
+        r"""
         removeMasks(Simulation2D self)
-
         void Simulation2D::removeMasks()
 
         removes all masks from the detector 
@@ -16922,12 +13469,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_removeMasks(self)
 
-
     def addMask(self, shape, mask_value=True):
-        """
+        r"""
         addMask(Simulation2D self, IShape2D shape, bool mask_value=True)
-        addMask(Simulation2D self, IShape2D shape)
-
         void Simulation2D::addMask(const IShape2D &shape, bool mask_value=true)
 
         Adds mask of given shape to the stack of detector masks. The mask value 'true' means that the channel will be excluded from the simulation. The mask which is added last has priority.
@@ -16944,11 +13488,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_addMask(self, shape, mask_value)
 
-
     def maskAll(self):
-        """
+        r"""
         maskAll(Simulation2D self)
-
         void Simulation2D::maskAll()
 
         Put the mask for all detector channels (i.e. exclude whole detector from the analysis) 
@@ -16956,11 +13498,9 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_maskAll(self)
 
-
     def setRegionOfInterest(self, xlow, ylow, xup, yup):
-        """
+        r"""
         setRegionOfInterest(Simulation2D self, double xlow, double ylow, double xup, double yup)
-
         void Simulation2D::setRegionOfInterest(double xlow, double ylow, double xup, double yup)
 
         Sets rectangular region of interest with lower left and upper right corners defined. 
@@ -16968,11 +13508,11 @@ class Simulation2D(Simulation):
         """
         return _libBornAgainCore.Simulation2D_setRegionOfInterest(self, xlow, ylow, xup, yup)
 
-Simulation2D_swigregister = _libBornAgainCore.Simulation2D_swigregister
-Simulation2D_swigregister(Simulation2D)
+# Register Simulation2D in _libBornAgainCore:
+_libBornAgainCore.Simulation2D_swigregister(Simulation2D)
 
-class SimulationOptions(_object):
-    """
+class SimulationOptions(object):
+    r"""
 
 
     Collect the different options for simulation.
@@ -16983,51 +13523,36 @@ class SimulationOptions(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationOptions, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SimulationOptions, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(SimulationOptions self) -> SimulationOptions
-
         SimulationOptions::SimulationOptions()
 
         """
-        this = _libBornAgainCore.new_SimulationOptions()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SimulationOptions_swiginit(self, _libBornAgainCore.new_SimulationOptions())
 
     def isIntegrate(self):
-        """
+        r"""
         isIntegrate(SimulationOptions self) -> bool
-
         bool SimulationOptions::isIntegrate() const
 
         """
         return _libBornAgainCore.SimulationOptions_isIntegrate(self)
 
-
     def getMcPoints(self):
-        """
+        r"""
         getMcPoints(SimulationOptions self) -> size_t
-
         size_t SimulationOptions::getMcPoints() const
 
         """
         return _libBornAgainCore.SimulationOptions_getMcPoints(self)
 
-
     def setMonteCarloIntegration(self, flag=True, mc_points=50):
-        """
+        r"""
         setMonteCarloIntegration(SimulationOptions self, bool flag=True, size_t mc_points=50)
-        setMonteCarloIntegration(SimulationOptions self, bool flag=True)
-        setMonteCarloIntegration(SimulationOptions self)
-
         void SimulationOptions::setMonteCarloIntegration(bool flag=true, size_t mc_points=50)
 
         Enables/disables MonetCarlo integration.
@@ -17044,11 +13569,9 @@ class SimulationOptions(_object):
         """
         return _libBornAgainCore.SimulationOptions_setMonteCarloIntegration(self, flag, mc_points)
 
-
     def setNumberOfThreads(self, nthreads):
-        """
+        r"""
         setNumberOfThreads(SimulationOptions self, int nthreads)
-
         void SimulationOptions::setNumberOfThreads(int nthreads)
 
         Sets number of threads to use during the simulation (0 - take the default value from the hardware) 
@@ -17056,21 +13579,17 @@ class SimulationOptions(_object):
         """
         return _libBornAgainCore.SimulationOptions_setNumberOfThreads(self, nthreads)
 
-
     def getNumberOfThreads(self):
-        """
+        r"""
         getNumberOfThreads(SimulationOptions self) -> unsigned int
-
         unsigned SimulationOptions::getNumberOfThreads() const
 
         """
         return _libBornAgainCore.SimulationOptions_getNumberOfThreads(self)
 
-
     def setNumberOfBatches(self, nbatches):
-        """
+        r"""
         setNumberOfBatches(SimulationOptions self, int nbatches)
-
         void SimulationOptions::setNumberOfBatches(int nbatches)
 
         Sets number of batches to split. 
@@ -17078,31 +13597,25 @@ class SimulationOptions(_object):
         """
         return _libBornAgainCore.SimulationOptions_setNumberOfBatches(self, nbatches)
 
-
     def getNumberOfBatches(self):
-        """
+        r"""
         getNumberOfBatches(SimulationOptions self) -> unsigned int
-
         unsigned SimulationOptions::getNumberOfBatches() const
 
         """
         return _libBornAgainCore.SimulationOptions_getNumberOfBatches(self)
 
-
     def getCurrentBatch(self):
-        """
+        r"""
         getCurrentBatch(SimulationOptions self) -> unsigned int
-
         unsigned SimulationOptions::getCurrentBatch() const
 
         """
         return _libBornAgainCore.SimulationOptions_getCurrentBatch(self)
 
-
     def setThreadInfo(self, thread_info):
-        """
+        r"""
         setThreadInfo(SimulationOptions self, ThreadInfo thread_info)
-
         void SimulationOptions::setThreadInfo(const ThreadInfo &thread_info)
 
         Sets the batch and thread information to be used. 
@@ -17110,63 +13623,52 @@ class SimulationOptions(_object):
         """
         return _libBornAgainCore.SimulationOptions_setThreadInfo(self, thread_info)
 
-
     def getHardwareConcurrency(self):
-        """
+        r"""
         getHardwareConcurrency(SimulationOptions self) -> unsigned int
-
         unsigned SimulationOptions::getHardwareConcurrency() const
 
         """
         return _libBornAgainCore.SimulationOptions_getHardwareConcurrency(self)
 
-
     def setIncludeSpecular(self, include_specular):
-        """
+        r"""
         setIncludeSpecular(SimulationOptions self, bool include_specular)
-
         void SimulationOptions::setIncludeSpecular(bool include_specular)
 
         """
         return _libBornAgainCore.SimulationOptions_setIncludeSpecular(self, include_specular)
 
-
     def includeSpecular(self):
-        """
+        r"""
         includeSpecular(SimulationOptions self) -> bool
-
         bool SimulationOptions::includeSpecular() const
 
         """
         return _libBornAgainCore.SimulationOptions_includeSpecular(self)
 
-
     def setUseAvgMaterials(self, use_avg_materials):
-        """
+        r"""
         setUseAvgMaterials(SimulationOptions self, bool use_avg_materials)
-
         void SimulationOptions::setUseAvgMaterials(bool use_avg_materials)
 
         """
         return _libBornAgainCore.SimulationOptions_setUseAvgMaterials(self, use_avg_materials)
 
-
     def useAvgMaterials(self):
-        """
+        r"""
         useAvgMaterials(SimulationOptions self) -> bool
-
         bool SimulationOptions::useAvgMaterials() const
 
         """
         return _libBornAgainCore.SimulationOptions_useAvgMaterials(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_SimulationOptions
-    __del__ = lambda self: None
-SimulationOptions_swigregister = _libBornAgainCore.SimulationOptions_swigregister
-SimulationOptions_swigregister(SimulationOptions)
+
+# Register SimulationOptions in _libBornAgainCore:
+_libBornAgainCore.SimulationOptions_swigregister(SimulationOptions)
 
 class GISASSimulation(Simulation2D):
-    """
+    r"""
 
 
     Main class to run a Grazing-Incidence Small-Angle Scattering simulation.
@@ -17175,47 +13677,31 @@ class GISASSimulation(Simulation2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [Simulation2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GISASSimulation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Simulation2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GISASSimulation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(GISASSimulation self) -> GISASSimulation
         __init__(GISASSimulation self, MultiLayer p_sample) -> GISASSimulation
         __init__(GISASSimulation self, std::shared_ptr< IMultiLayerBuilder > const p_sample_builder) -> GISASSimulation
-
         GISASSimulation::GISASSimulation(const std::shared_ptr< IMultiLayerBuilder > p_sample_builder)
 
         """
-        this = _libBornAgainCore.new_GISASSimulation(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.GISASSimulation_swiginit(self, _libBornAgainCore.new_GISASSimulation(*args))
     __swig_destroy__ = _libBornAgainCore.delete_GISASSimulation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(GISASSimulation self) -> GISASSimulation
-
         GISASSimulation* GISASSimulation::clone() const override
 
         """
         return _libBornAgainCore.GISASSimulation_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(GISASSimulation self, INodeVisitor visitor)
-
         void GISASSimulation::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -17223,11 +13709,9 @@ class GISASSimulation(Simulation2D):
         """
         return _libBornAgainCore.GISASSimulation_accept(self, visitor)
 
-
     def prepareSimulation(self):
-        """
+        r"""
         prepareSimulation(GISASSimulation self)
-
         void GISASSimulation::prepareSimulation() override
 
         Put into a clean state for running a simulation. 
@@ -17235,11 +13719,9 @@ class GISASSimulation(Simulation2D):
         """
         return _libBornAgainCore.GISASSimulation_prepareSimulation(self)
 
-
     def result(self):
-        """
+        r"""
         result(GISASSimulation self) -> SimulationResult
-
         SimulationResult GISASSimulation::result() const override
 
         Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays 
@@ -17247,11 +13729,9 @@ class GISASSimulation(Simulation2D):
         """
         return _libBornAgainCore.GISASSimulation_result(self)
 
-
     def setBeamParameters(self, wavelength, alpha_i, phi_i):
-        """
+        r"""
         setBeamParameters(GISASSimulation self, double wavelength, double alpha_i, double phi_i)
-
         void GISASSimulation::setBeamParameters(double wavelength, double alpha_i, double phi_i)
 
         Sets beam parameters from here (forwarded to  Instrument) 
@@ -17259,11 +13739,9 @@ class GISASSimulation(Simulation2D):
         """
         return _libBornAgainCore.GISASSimulation_setBeamParameters(self, wavelength, alpha_i, phi_i)
 
-
     def intensityMapSize(self):
-        """
+        r"""
         intensityMapSize(GISASSimulation self) -> size_t
-
         size_t GISASSimulation::intensityMapSize() const override
 
         Returns the total number of the intensity values in the simulation result. 
@@ -17271,11 +13749,11 @@ class GISASSimulation(Simulation2D):
         """
         return _libBornAgainCore.GISASSimulation_intensityMapSize(self)
 
-GISASSimulation_swigregister = _libBornAgainCore.GISASSimulation_swigregister
-GISASSimulation_swigregister(GISASSimulation)
+# Register GISASSimulation in _libBornAgainCore:
+_libBornAgainCore.GISASSimulation_swigregister(GISASSimulation)
 
-class IHistogram(_object):
-    """
+class IHistogram(object):
+    r"""
 
 
     Base class for 1D and 2D histograms holding values of double type.
@@ -17284,35 +13762,32 @@ class IHistogram(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IHistogram, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IHistogram, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     INTEGRAL = _libBornAgainCore.IHistogram_INTEGRAL
+    
     AVERAGE = _libBornAgainCore.IHistogram_AVERAGE
+    
     STANDARD_ERROR = _libBornAgainCore.IHistogram_STANDARD_ERROR
+    
     NENTRIES = _libBornAgainCore.IHistogram_NENTRIES
+    
     __swig_destroy__ = _libBornAgainCore.delete_IHistogram
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IHistogram self) -> IHistogram
-
         virtual IHistogram* IHistogram::clone() const =0
 
         """
         return _libBornAgainCore.IHistogram_clone(self)
 
-
     def getRank(self):
-        """
+        r"""
         getRank(IHistogram self) -> size_t
-
         virtual size_t IHistogram::getRank() const =0
 
         Returns number of histogram dimensions. 
@@ -17320,11 +13795,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getRank(self)
 
-
     def getTotalNumberOfBins(self):
-        """
+        r"""
         getTotalNumberOfBins(IHistogram self) -> size_t
-
         size_t IHistogram::getTotalNumberOfBins() const
 
         Returns total number of histogram bins. For 2D histograms the result will be the product of bin numbers along X and Y axes. 
@@ -17332,11 +13805,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getTotalNumberOfBins(self)
 
-
     def getXaxis(self):
-        """
+        r"""
         getXaxis(IHistogram self) -> IAxis
-
         const IAxis & IHistogram::getXaxis() const
 
         returns x-axis 
@@ -17344,11 +13815,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getXaxis(self)
 
-
     def getYaxis(self):
-        """
+        r"""
         getYaxis(IHistogram self) -> IAxis
-
         const IAxis & IHistogram::getYaxis() const
 
         returns y-axis for 2D histograms 
@@ -17356,11 +13825,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getYaxis(self)
 
-
     def getXmin(self):
-        """
+        r"""
         getXmin(IHistogram self) -> double
-
         double IHistogram::getXmin() const
 
         Returns x-axis min (lower edge of first bin). 
@@ -17368,11 +13835,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getXmin(self)
 
-
     def getXmax(self):
-        """
+        r"""
         getXmax(IHistogram self) -> double
-
         double IHistogram::getXmax() const
 
         Returns x-axis max (upper edge of last bin). 
@@ -17380,11 +13845,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getXmax(self)
 
-
     def getNbinsX(self):
-        """
+        r"""
         getNbinsX(IHistogram self) -> size_t
-
         size_t IHistogram::getNbinsX() const
 
         Returns number of bins on x-axis. 
@@ -17392,11 +13855,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getNbinsX(self)
 
-
     def getYmin(self):
-        """
+        r"""
         getYmin(IHistogram self) -> double
-
         double IHistogram::getYmin() const
 
         Returns y-axis min (lower edge of first bin) for 2D histograms. 
@@ -17404,11 +13865,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getYmin(self)
 
-
     def getYmax(self):
-        """
+        r"""
         getYmax(IHistogram self) -> double
-
         double IHistogram::getYmax() const
 
         Returns y-axis max (upper edge of last bin) for 2D histograms. 
@@ -17416,11 +13875,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getYmax(self)
 
-
     def getNbinsY(self):
-        """
+        r"""
         getNbinsY(IHistogram self) -> size_t
-
         size_t IHistogram::getNbinsY() const
 
         Returns number of bins on y-axis. 
@@ -17428,12 +13885,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getNbinsY(self)
 
-
     def getGlobalBin(self, binx, biny=0):
-        """
+        r"""
         getGlobalBin(IHistogram self, size_t binx, size_t biny=0) -> size_t
-        getGlobalBin(IHistogram self, size_t binx) -> size_t
-
         size_t IHistogram::getGlobalBin(size_t binx, size_t biny=0) const
 
         Returns global bin index for given axes indices. For 1D histogram the global bin index coinside with x-axis index.
@@ -17452,11 +13906,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getGlobalBin(self, binx, biny)
 
-
     def findGlobalBin(self, x, y):
-        """
+        r"""
         findGlobalBin(IHistogram self, double x, double y) -> size_t
-
         size_t IHistogram::findGlobalBin(double x, double y) const
 
         Returns closest global bin index for given axes coordinates. For 1D.
@@ -17475,11 +13927,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_findGlobalBin(self, x, y)
 
-
     def getXaxisIndex(self, i):
-        """
+        r"""
         getXaxisIndex(IHistogram self, size_t i) -> size_t
-
         size_t IHistogram::getXaxisIndex(size_t i) const
 
         Returns x-axis bin index for given globalbin. For 1D histograms returned value conicide with globalbin value. 
@@ -17487,11 +13937,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getXaxisIndex(self, i)
 
-
     def getYaxisIndex(self, i):
-        """
+        r"""
         getYaxisIndex(IHistogram self, size_t i) -> size_t
-
         size_t IHistogram::getYaxisIndex(size_t i) const
 
         Returns y-axis bin index for given globalbin (for 2D histograms). 
@@ -17499,11 +13947,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getYaxisIndex(self, i)
 
-
     def getXaxisValue(self, i):
-        """
+        r"""
         getXaxisValue(IHistogram self, size_t i) -> double
-
         double IHistogram::getXaxisValue(size_t i)
 
         Returns the value on x-axis corresponding to the global bin index.
@@ -17519,11 +13965,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getXaxisValue(self, i)
 
-
     def getYaxisValue(self, i):
-        """
+        r"""
         getYaxisValue(IHistogram self, size_t i) -> double
-
         double IHistogram::getYaxisValue(size_t i)
 
         Returns the value on y-axis corresponding to the 2D histogram global bin index.
@@ -17539,23 +13983,19 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getYaxisValue(self, i)
 
-
     def getData(self, *args):
-        """
+        r"""
         getData(IHistogram self) -> OutputData< CumulativeValue > const
         getData(IHistogram self) -> OutputData< CumulativeValue > &
-
         OutputData<CumulativeValue>& IHistogram::getData()
 
         """
         return _libBornAgainCore.IHistogram_getData(self, *args)
 
-
     def getBinContent(self, *args):
-        """
+        r"""
         getBinContent(IHistogram self, size_t i) -> double
         getBinContent(IHistogram self, size_t binx, size_t biny) -> double
-
         double IHistogram::getBinContent(size_t binx, size_t biny) const
 
         Returns content (accumulated value) of the 2D histogram bin with given indices.
@@ -17574,11 +14014,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getBinContent(self, *args)
 
-
     def setBinContent(self, i, value):
-        """
+        r"""
         setBinContent(IHistogram self, size_t i, double value)
-
         void IHistogram::setBinContent(size_t i, double value)
 
         Sets content of the bin corresponding to the globalbin number. 
@@ -17586,11 +14024,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_setBinContent(self, i, value)
 
-
     def addBinContent(self, i, value):
-        """
+        r"""
         addBinContent(IHistogram self, size_t i, double value)
-
         void IHistogram::addBinContent(size_t i, double value)
 
         Add the value to the bin. 
@@ -17598,12 +14034,10 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_addBinContent(self, i, value)
 
-
     def getBinError(self, *args):
-        """
+        r"""
         getBinError(IHistogram self, size_t i) -> double
         getBinError(IHistogram self, size_t binx, size_t biny) -> double
-
         double IHistogram::getBinError(size_t binx, size_t biny) const
 
         Returns error of the bin with given indices (for 2D histograms). 
@@ -17611,12 +14045,10 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getBinError(self, *args)
 
-
     def getBinAverage(self, *args):
-        """
+        r"""
         getBinAverage(IHistogram self, size_t i) -> double
         getBinAverage(IHistogram self, size_t binx, size_t biny) -> double
-
         double IHistogram::getBinAverage(size_t binx, size_t biny) const
 
         Returns average value of the bin with given indices (for 2D histograms). 
@@ -17624,12 +14056,10 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getBinAverage(self, *args)
 
-
     def getBinNumberOfEntries(self, *args):
-        """
+        r"""
         getBinNumberOfEntries(IHistogram self, size_t i) -> int
         getBinNumberOfEntries(IHistogram self, size_t binx, size_t biny) -> int
-
         int IHistogram::getBinNumberOfEntries(size_t binx, size_t biny) const
 
         Returns number of entries in the bin with given indices (for 2D histograms). 
@@ -17637,11 +14067,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getBinNumberOfEntries(self, *args)
 
-
     def getMaximum(self):
-        """
+        r"""
         getMaximum(IHistogram self) -> double
-
         double IHistogram::getMaximum() const
 
         Returns histogram maximum value (maximum of  getBinContent() over all bins) 
@@ -17649,11 +14077,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getMaximum(self)
 
-
     def getMaximumBinIndex(self):
-        """
+        r"""
         getMaximumBinIndex(IHistogram self) -> size_t
-
         size_t IHistogram::getMaximumBinIndex() const
 
         Returns globalbin index with maximum content. 
@@ -17661,11 +14087,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getMaximumBinIndex(self)
 
-
     def getMinimum(self):
-        """
+        r"""
         getMinimum(IHistogram self) -> double
-
         double IHistogram::getMinimum() const
 
         Returns histogram minimum value (minimum of  getBinContent() over all bins) 
@@ -17673,11 +14097,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getMinimum(self)
 
-
     def getMinimumBinIndex(self):
-        """
+        r"""
         getMinimumBinIndex(IHistogram self) -> size_t
-
         size_t IHistogram::getMinimumBinIndex() const
 
         Returns globalbin index with minimum content. 
@@ -17685,11 +14107,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getMinimumBinIndex(self)
 
-
     def scale(self, value):
-        """
+        r"""
         scale(IHistogram self, double value)
-
         void IHistogram::scale(double value)
 
         Multiply this histogram (every bin content value) by a constant. 
@@ -17697,11 +14117,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_scale(self, value)
 
-
     def integral(self):
-        """
+        r"""
         integral(IHistogram self) -> double
-
         double IHistogram::integral() const
 
         Returns integral of bins content (computed as a sum of all bin content). 
@@ -17709,12 +14127,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_integral(self)
 
-
     def array(self, *args):
-        """
-        array(IHistogram self, IHistogram::DataType dataType) -> PyObject
-        array(IHistogram self) -> PyObject *
-
+        r"""
+        array(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> PyObject
         PyObject * IHistogram::array(DataType dataType=DataType::INTEGRAL) const
 
         Returns numpy array with bin content (accumulated values). 
@@ -17722,12 +14137,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_array(self, *args)
 
-
     def getArrayObsolete(self, *args):
-        """
-        getArrayObsolete(IHistogram self, IHistogram::DataType dataType) -> PyObject
-        getArrayObsolete(IHistogram self) -> PyObject *
-
+        r"""
+        getArrayObsolete(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> PyObject
         PyObject * IHistogram::getArray(DataType dataType=DataType::INTEGRAL) const
 
         Deprecated
@@ -17736,11 +14148,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_getArrayObsolete(self, *args)
 
-
     def reset(self):
-        """
+        r"""
         reset(IHistogram self)
-
         void IHistogram::reset()
 
         Reset histogram content (axes remains) 
@@ -17748,27 +14158,22 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_reset(self)
 
-
+    @staticmethod
     def createHistogram(source):
-        """createHistogram(IntensityData source) -> IHistogram"""
+        r"""createHistogram(IntensityData source) -> IHistogram"""
         return _libBornAgainCore.IHistogram_createHistogram(source)
 
-    createHistogram = staticmethod(createHistogram)
-
+    @staticmethod
     def createFrom(*args):
-        """
+        r"""
         createFrom(std::string const & filename) -> IHistogram
         createFrom(vdouble2d_t data) -> IHistogram
         """
         return _libBornAgainCore.IHistogram_createFrom(*args)
 
-    createFrom = staticmethod(createFrom)
-
     def createOutputData(self, *args):
-        """
-        createOutputData(IHistogram self, IHistogram::DataType dataType) -> IntensityData
-        createOutputData(IHistogram self) -> IntensityData
-
+        r"""
+        createOutputData(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> IntensityData
         OutputData< double > * IHistogram::createOutputData(DataType dataType=DataType::INTEGRAL) const
 
         creates new  OutputData with histogram's shape and values corresponding to DataType
@@ -17778,11 +14183,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_createOutputData(self, *args)
 
-
     def hasSameShape(self, other):
-        """
+        r"""
         hasSameShape(IHistogram self, IHistogram other) -> bool
-
         bool IHistogram::hasSameShape(const IHistogram &other) const
 
         Returns true if objects a) have same dimensions b) bin boundaries of axes coincide. 
@@ -17790,11 +14193,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_hasSameShape(self, other)
 
-
     def hasSameDimensions(self, other):
-        """
+        r"""
         hasSameDimensions(IHistogram self, IHistogram other) -> bool
-
         bool IHistogram::hasSameDimensions(const IHistogram &other) const
 
         Returns true if object have same rank and number of axes bins. 
@@ -17802,16 +14203,13 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_hasSameDimensions(self, other)
 
-
     def __iadd__(self, right):
-        """__iadd__(IHistogram self, IHistogram right) -> IHistogram"""
+        r"""__iadd__(IHistogram self, IHistogram right) -> IHistogram"""
         return _libBornAgainCore.IHistogram___iadd__(self, right)
 
-
     def relativeDifferenceHistogram(self, rhs):
-        """
+        r"""
         relativeDifferenceHistogram(IHistogram self, IHistogram rhs) -> IHistogram
-
         IHistogram * IHistogram::relativeDifferenceHistogram(const IHistogram &rhs)
 
         returns histogram representing relative difference of two histograms. 
@@ -17819,11 +14217,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_relativeDifferenceHistogram(self, rhs)
 
-
     def save(self, filename):
-        """
+        r"""
         save(IHistogram self, std::string const & filename)
-
         void IHistogram::save(const std::string &filename)
 
         Saves histogram in file Following formats are available: *.txt, *.tif, *.int (*.txt.gz, *.tif.gz, *.int.gz) 
@@ -17831,11 +14227,9 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_save(self, filename)
 
-
     def load(self, filename):
-        """
+        r"""
         load(IHistogram self, std::string const & filename)
-
         void IHistogram::load(const std::string &filename)
 
         Loads histogram from file, the shape of array in file should match Following formats are available: *.txt, *.tif, *.int (*.txt.gz, *.tif.gz, *.int.gz) Only bin content will be loaded, histogram axes remain the same. 
@@ -17843,27 +14237,27 @@ class IHistogram(_object):
         """
         return _libBornAgainCore.IHistogram_load(self, filename)
 
-
     @deprecated("Deprecated. Use array() instead.")
     def getArray(self):
         return self.getArrayObsolete()
 
-IHistogram_swigregister = _libBornAgainCore.IHistogram_swigregister
-IHistogram_swigregister(IHistogram)
+
+# Register IHistogram in _libBornAgainCore:
+_libBornAgainCore.IHistogram_swigregister(IHistogram)
 
 def IHistogram_createHistogram(source):
-    """IHistogram_createHistogram(IntensityData source) -> IHistogram"""
+    r"""IHistogram_createHistogram(IntensityData source) -> IHistogram"""
     return _libBornAgainCore.IHistogram_createHistogram(source)
 
 def IHistogram_createFrom(*args):
-    """
-    createFrom(std::string const & filename) -> IHistogram
+    r"""
+    IHistogram_createFrom(std::string const & filename) -> IHistogram
     IHistogram_createFrom(vdouble2d_t data) -> IHistogram
     """
     return _libBornAgainCore.IHistogram_createFrom(*args)
 
 class Histogram1D(IHistogram):
-    """
+    r"""
 
 
     One dimensional histogram.
@@ -17872,38 +14266,25 @@ class Histogram1D(IHistogram):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IHistogram]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Histogram1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IHistogram]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Histogram1D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Histogram1D self, int nbinsx, double xlow, double xup) -> Histogram1D
         __init__(Histogram1D self, int nbinsx, vdouble1d_t xbins) -> Histogram1D
         __init__(Histogram1D self, IAxis axis) -> Histogram1D
         __init__(Histogram1D self, IntensityData data) -> Histogram1D
-
         Histogram1D::Histogram1D(const OutputData< double > &data)
 
         Constructor for 1D histograms from basic  OutputData object. 
 
         """
-        this = _libBornAgainCore.new_Histogram1D(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Histogram1D_swiginit(self, _libBornAgainCore.new_Histogram1D(*args))
 
     def clone(self):
-        """
+        r"""
         clone(Histogram1D self) -> Histogram1D
-
         Histogram1D * Histogram1D::clone() const
 
         Returns clone of other histogram. 
@@ -17911,11 +14292,9 @@ class Histogram1D(IHistogram):
         """
         return _libBornAgainCore.Histogram1D_clone(self)
 
-
     def getRank(self):
-        """
+        r"""
         getRank(Histogram1D self) -> size_t
-
         size_t Histogram1D::getRank() const
 
         Returns the number of histogram dimensions. 
@@ -17923,12 +14302,9 @@ class Histogram1D(IHistogram):
         """
         return _libBornAgainCore.Histogram1D_getRank(self)
 
-
     def fill(self, x, weight=1.0):
-        """
+        r"""
         fill(Histogram1D self, double x, double weight=1.0) -> int
-        fill(Histogram1D self, double x) -> int
-
         int Histogram1D::fill(double x, double weight=1.0)
 
         Increment bin with abscissa x with a weight. 
@@ -17936,11 +14312,9 @@ class Histogram1D(IHistogram):
         """
         return _libBornAgainCore.Histogram1D_fill(self, x, weight)
 
-
     def getBinCenters(self):
-        """
+        r"""
         getBinCenters(Histogram1D self) -> vdouble1d_t
-
         std::vector< double > Histogram1D::getBinCenters() const
 
         returns vector of histogram bin centers 
@@ -17948,11 +14322,9 @@ class Histogram1D(IHistogram):
         """
         return self.getBinCentersNumpy()
 
-
     def getBinValues(self):
-        """
+        r"""
         getBinValues(Histogram1D self) -> vdouble1d_t
-
         std::vector< double > Histogram1D::getBinValues() const
 
         returns vector of bin content (the value accumulated by bins) 
@@ -17960,11 +14332,9 @@ class Histogram1D(IHistogram):
         """
         return self.getBinValuesNumpy()
 
-
     def getBinErrors(self):
-        """
+        r"""
         getBinErrors(Histogram1D self) -> vdouble1d_t
-
         std::vector< double > Histogram1D::getBinErrors() const
 
         returns vector of bin errors 
@@ -17972,55 +14342,46 @@ class Histogram1D(IHistogram):
         """
         return self.getBinErrorsNumpy()
 
-
     def getBinCentersNumpy(self):
-        """
+        r"""
         getBinCentersNumpy(Histogram1D self) -> PyObject *
-
         PyObject * Histogram1D::getBinCentersNumpy() const
 
         """
         return _libBornAgainCore.Histogram1D_getBinCentersNumpy(self)
 
-
     def getBinValuesNumpy(self):
-        """
+        r"""
         getBinValuesNumpy(Histogram1D self) -> PyObject *
-
         PyObject * Histogram1D::getBinValuesNumpy() const
 
         """
         return _libBornAgainCore.Histogram1D_getBinValuesNumpy(self)
 
-
     def getBinErrorsNumpy(self):
-        """
+        r"""
         getBinErrorsNumpy(Histogram1D self) -> PyObject *
-
         PyObject * Histogram1D::getBinErrorsNumpy() const
 
         """
         return _libBornAgainCore.Histogram1D_getBinErrorsNumpy(self)
 
-
     def crop(self, xmin, xmax):
-        """
+        r"""
         crop(Histogram1D self, double xmin, double xmax) -> Histogram1D
-
         Histogram1D * Histogram1D::crop(double xmin, double xmax)
 
         Create new histogram by applying crop on axis. 
 
         """
         return _libBornAgainCore.Histogram1D_crop(self, xmin, xmax)
-
     __swig_destroy__ = _libBornAgainCore.delete_Histogram1D
-    __del__ = lambda self: None
-Histogram1D_swigregister = _libBornAgainCore.Histogram1D_swigregister
-Histogram1D_swigregister(Histogram1D)
+
+# Register Histogram1D in _libBornAgainCore:
+_libBornAgainCore.Histogram1D_swigregister(Histogram1D)
 
 class Histogram2D(IHistogram):
-    """
+    r"""
 
 
     Two dimensional histogram.
@@ -18029,39 +14390,26 @@ class Histogram2D(IHistogram):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IHistogram]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Histogram2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IHistogram]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Histogram2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Histogram2D self, int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup) -> Histogram2D
         __init__(Histogram2D self, int nbinsx, vdouble1d_t xbins, int nbinsy, vdouble1d_t ybins) -> Histogram2D
         __init__(Histogram2D self, IAxis axis_x, IAxis axis_y) -> Histogram2D
         __init__(Histogram2D self, IntensityData data) -> Histogram2D
         __init__(Histogram2D self, vdouble2d_t data) -> Histogram2D
-
         Histogram2D::Histogram2D(std::vector< std::vector< double >> data)
 
         Constructor for 2D histograms from numpy array (thanks to swig) 
 
         """
-        this = _libBornAgainCore.new_Histogram2D(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Histogram2D_swiginit(self, _libBornAgainCore.new_Histogram2D(*args))
 
     def clone(self):
-        """
+        r"""
         clone(Histogram2D self) -> Histogram2D
-
         Histogram2D * Histogram2D::clone() const
 
         Returns clone of other histogram. 
@@ -18069,11 +14417,9 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_clone(self)
 
-
     def getRank(self):
-        """
+        r"""
         getRank(Histogram2D self) -> size_t
-
         size_t Histogram2D::getRank() const
 
         Returns the number of histogram dimensions. 
@@ -18081,12 +14427,9 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_getRank(self)
 
-
     def fill(self, x, y, weight=1.0):
-        """
+        r"""
         fill(Histogram2D self, double x, double y, double weight=1.0) -> int
-        fill(Histogram2D self, double x, double y) -> int
-
         int Histogram2D::fill(double x, double y, double weight=1.0)
 
         Increment bin with abscissa x and ordinate y with a weight. 
@@ -18094,13 +14437,11 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_fill(self, x, y, weight)
 
-
     def projectionX(self, *args):
-        """
+        r"""
         projectionX(Histogram2D self) -> Histogram1D
         projectionX(Histogram2D self, double yvalue) -> Histogram1D
         projectionX(Histogram2D self, double ylow, double yup) -> Histogram1D
-
         Histogram1D * Histogram2D::projectionX(double ylow, double yup)
 
         Project a 2D histogram into 1D histogram along X. The projection is made from all y-bins corresponding to ordinate between ylow and yup.
@@ -18117,13 +14458,11 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_projectionX(self, *args)
 
-
     def projectionY(self, *args):
-        """
+        r"""
         projectionY(Histogram2D self) -> Histogram1D
         projectionY(Histogram2D self, double xvalue) -> Histogram1D
         projectionY(Histogram2D self, double xlow, double xup) -> Histogram1D
-
         Histogram1D * Histogram2D::projectionY(double xlow, double xup)
 
         Project a 2D histogram into 1D histogram along Y. The projection is made from all x-bins corresponding to abscissa between xlow and xup.
@@ -18140,11 +14479,9 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_projectionY(self, *args)
 
-
     def crop(self, xmin, ymin, xmax, ymax):
-        """
+        r"""
         crop(Histogram2D self, double xmin, double ymin, double xmax, double ymax) -> Histogram2D
-
         Histogram2D * Histogram2D::crop(double xmin, double ymin, double xmax, double ymax)
 
         Create new histogram by applying rectangular clip. 
@@ -18152,11 +14489,9 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_crop(self, xmin, ymin, xmax, ymax)
 
-
     def setContent(self, data):
-        """
+        r"""
         setContent(Histogram2D self, vdouble2d_t data)
-
         void Histogram2D::setContent(const std::vector< std::vector< double >> &data)
 
         Sets the values in histograms channels from numpy array,. 
@@ -18164,25 +14499,22 @@ class Histogram2D(IHistogram):
         """
         return _libBornAgainCore.Histogram2D_setContent(self, data)
 
-
     def addContent(self, data):
-        """
+        r"""
         addContent(Histogram2D self, vdouble2d_t data)
-
         void Histogram2D::addContent(const std::vector< std::vector< double >> &data)
 
         Add to values in histograms channels from numpy array,. 
 
         """
         return _libBornAgainCore.Histogram2D_addContent(self, data)
-
     __swig_destroy__ = _libBornAgainCore.delete_Histogram2D
-    __del__ = lambda self: None
-Histogram2D_swigregister = _libBornAgainCore.Histogram2D_swigregister
-Histogram2D_swigregister(Histogram2D)
 
-class AxisInfo(_object):
-    """
+# Register Histogram2D in _libBornAgainCore:
+_libBornAgainCore.Histogram2D_swigregister(Histogram2D)
+
+class AxisInfo(object):
+    r"""
 
 
     Information about an axis in specific units. Can be used for plotting.
@@ -18191,47 +14523,30 @@ class AxisInfo(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, AxisInfo, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, AxisInfo, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
-    __swig_setmethods__["m_name"] = _libBornAgainCore.AxisInfo_m_name_set
-    __swig_getmethods__["m_name"] = _libBornAgainCore.AxisInfo_m_name_get
-    if _newclass:
-        m_name = _swig_property(_libBornAgainCore.AxisInfo_m_name_get, _libBornAgainCore.AxisInfo_m_name_set)
-    __swig_setmethods__["m_min"] = _libBornAgainCore.AxisInfo_m_min_set
-    __swig_getmethods__["m_min"] = _libBornAgainCore.AxisInfo_m_min_get
-    if _newclass:
-        m_min = _swig_property(_libBornAgainCore.AxisInfo_m_min_get, _libBornAgainCore.AxisInfo_m_min_set)
-    __swig_setmethods__["m_max"] = _libBornAgainCore.AxisInfo_m_max_set
-    __swig_getmethods__["m_max"] = _libBornAgainCore.AxisInfo_m_max_get
-    if _newclass:
-        m_max = _swig_property(_libBornAgainCore.AxisInfo_m_max_get, _libBornAgainCore.AxisInfo_m_max_set)
+    m_name = property(_libBornAgainCore.AxisInfo_m_name_get, _libBornAgainCore.AxisInfo_m_name_set, doc=r"""m_name : std::string""")
+    m_min = property(_libBornAgainCore.AxisInfo_m_min_get, _libBornAgainCore.AxisInfo_m_min_set, doc=r"""m_min : double""")
+    m_max = property(_libBornAgainCore.AxisInfo_m_max_get, _libBornAgainCore.AxisInfo_m_max_set, doc=r"""m_max : double""")
 
     def __init__(self):
-        """
+        r"""
         __init__(AxisInfo self) -> AxisInfo
 
 
-
         Information about an axis in specific units. Can be used for plotting.
 
         C++ includes: SimulationResult.h
 
         """
-        this = _libBornAgainCore.new_AxisInfo()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.AxisInfo_swiginit(self, _libBornAgainCore.new_AxisInfo())
     __swig_destroy__ = _libBornAgainCore.delete_AxisInfo
-    __del__ = lambda self: None
-AxisInfo_swigregister = _libBornAgainCore.AxisInfo_swigregister
-AxisInfo_swigregister(AxisInfo)
 
-class SimulationResult(_object):
-    """
+# Register AxisInfo in _libBornAgainCore:
+_libBornAgainCore.AxisInfo_swigregister(AxisInfo)
+
+class SimulationResult(object):
+    r"""
 
 
     Wrapper around  OutputData<double> that also provides unit conversions.
@@ -18240,44 +14555,31 @@ class SimulationResult(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationResult, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SimulationResult, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(SimulationResult self) -> SimulationResult
         __init__(SimulationResult self, IntensityData data, IUnitConverter unit_converter) -> SimulationResult
         __init__(SimulationResult self, SimulationResult other) -> SimulationResult
         __init__(SimulationResult self, SimulationResult other) -> SimulationResult
-
         SimulationResult::SimulationResult(SimulationResult &&other)
 
         """
-        this = _libBornAgainCore.new_SimulationResult(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SimulationResult_swiginit(self, _libBornAgainCore.new_SimulationResult(*args))
 
     def histogram2d(self, *args):
-        """
-        histogram2d(SimulationResult self, AxesUnits units) -> Histogram2D
-        histogram2d(SimulationResult self) -> Histogram2D
-
+        r"""
+        histogram2d(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> Histogram2D
         Histogram2D * SimulationResult::histogram2d(AxesUnits units=AxesUnits::DEFAULT) const
 
         """
         return _libBornAgainCore.SimulationResult_histogram2d(self, *args)
 
-
     def axisInfo(self, *args):
-        """
-        axisInfo(SimulationResult self, AxesUnits units) -> swig_dummy_type_axisinfo_vector
-        axisInfo(SimulationResult self) -> swig_dummy_type_axisinfo_vector
-
+        r"""
+        axisInfo(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> swig_dummy_type_axisinfo_vector
         std::vector< AxisInfo > SimulationResult::axisInfo(AxesUnits units=AxesUnits::DEFAULT) const
 
         Provide  AxisInfo for each axis and the given units. 
@@ -18285,11 +14587,9 @@ class SimulationResult(_object):
         """
         return _libBornAgainCore.SimulationResult_axisInfo(self, *args)
 
-
     def converter(self):
-        """
+        r"""
         converter(SimulationResult self) -> IUnitConverter
-
         const IUnitConverter & SimulationResult::converter() const
 
         Returns underlying unit converter. 
@@ -18297,22 +14597,17 @@ class SimulationResult(_object):
         """
         return _libBornAgainCore.SimulationResult_converter(self)
 
-
     def size(self):
-        """
+        r"""
         size(SimulationResult self) -> size_t
-
         size_t SimulationResult::size() const
 
         """
         return _libBornAgainCore.SimulationResult_size(self)
 
-
     def array(self, *args):
-        """
-        array(SimulationResult self, AxesUnits units) -> PyObject
-        array(SimulationResult self) -> PyObject *
-
+        r"""
+        array(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> PyObject
         PyObject * SimulationResult::array(AxesUnits units=AxesUnits::DEFAULT) const
 
         returns intensity data as Python numpy array 
@@ -18320,14 +14615,10 @@ class SimulationResult(_object):
         """
         return _libBornAgainCore.SimulationResult_array(self, *args)
 
-
     def axis(self, *args):
-        """
-        axis(SimulationResult self, AxesUnits units) -> vdouble1d_t
-        axis(SimulationResult self) -> vdouble1d_t
-        axis(SimulationResult self, size_t i_axis, AxesUnits units) -> vdouble1d_t
-        axis(SimulationResult self, size_t i_axis) -> vdouble1d_t
-
+        r"""
+        axis(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> vdouble1d_t
+        axis(SimulationResult self, size_t i_axis, AxesUnits units=AxesUnits::DEFAULT) -> vdouble1d_t
         std::vector< double > SimulationResult::axis(size_t i_axis, AxesUnits units=AxesUnits::DEFAULT) const
 
         Returns axis coordinates as a numpy array. With no parameters given returns coordinates of x-axis in default units. 
@@ -18335,23 +14626,20 @@ class SimulationResult(_object):
         """
         return _libBornAgainCore.SimulationResult_axis(self, *args)
 
-
     def __getitem__(self, i):
-        """__getitem__(SimulationResult self, unsigned int i) -> double"""
+        r"""__getitem__(SimulationResult self, unsigned int i) -> double"""
         return _libBornAgainCore.SimulationResult___getitem__(self, i)
 
-
     def __setitem__(self, i, value):
-        """__setitem__(SimulationResult self, unsigned int i, double value) -> double"""
+        r"""__setitem__(SimulationResult self, unsigned int i, double value) -> double"""
         return _libBornAgainCore.SimulationResult___setitem__(self, i, value)
-
     __swig_destroy__ = _libBornAgainCore.delete_SimulationResult
-    __del__ = lambda self: None
-SimulationResult_swigregister = _libBornAgainCore.SimulationResult_swigregister
-SimulationResult_swigregister(SimulationResult)
+
+# Register SimulationResult in _libBornAgainCore:
+_libBornAgainCore.SimulationResult_swigregister(SimulationResult)
 
 class IBackground(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for a simulating the background signal
@@ -18360,45 +14648,34 @@ class IBackground(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IBackground, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IBackground, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IBackground
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IBackground self) -> IBackground
-
         virtual IBackground* IBackground::clone() const =0
 
         """
         return _libBornAgainCore.IBackground_clone(self)
 
-
     def addBackGround(self, element):
-        """
+        r"""
         addBackGround(IBackground self, double element) -> double
-
         virtual double IBackground::addBackGround(double element) const =0
 
         """
         return _libBornAgainCore.IBackground_addBackGround(self, element)
 
-IBackground_swigregister = _libBornAgainCore.IBackground_swigregister
-IBackground_swigregister(IBackground)
+# Register IBackground in _libBornAgainCore:
+_libBornAgainCore.IBackground_swigregister(IBackground)
 
 class ConstantBackground(IBackground):
-    """
+    r"""
 
 
     Class representing a constant background signal
@@ -18407,55 +14684,37 @@ class ConstantBackground(IBackground):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IBackground]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantBackground, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IBackground]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstantBackground, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, background_value):
-        """
+        r"""
         __init__(ConstantBackground self, double background_value) -> ConstantBackground
-
         ConstantBackground::ConstantBackground(double background_value)
 
         """
-        this = _libBornAgainCore.new_ConstantBackground(background_value)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ConstantBackground_swiginit(self, _libBornAgainCore.new_ConstantBackground(background_value))
     __swig_destroy__ = _libBornAgainCore.delete_ConstantBackground
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ConstantBackground self) -> ConstantBackground
-
         ConstantBackground * ConstantBackground::clone() const override final
 
         """
         return _libBornAgainCore.ConstantBackground_clone(self)
 
-
     def backgroundValue(self):
-        """
+        r"""
         backgroundValue(ConstantBackground self) -> double
-
         double ConstantBackground::backgroundValue() const
 
         """
         return _libBornAgainCore.ConstantBackground_backgroundValue(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ConstantBackground self, INodeVisitor visitor)
-
         void ConstantBackground::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -18463,21 +14722,19 @@ class ConstantBackground(IBackground):
         """
         return _libBornAgainCore.ConstantBackground_accept(self, visitor)
 
-
     def addBackGround(self, intensity):
-        """
+        r"""
         addBackGround(ConstantBackground self, double intensity) -> double
-
         double ConstantBackground::addBackGround(double intensity) const override final
 
         """
         return _libBornAgainCore.ConstantBackground_addBackGround(self, intensity)
 
-ConstantBackground_swigregister = _libBornAgainCore.ConstantBackground_swigregister
-ConstantBackground_swigregister(ConstantBackground)
+# Register ConstantBackground in _libBornAgainCore:
+_libBornAgainCore.ConstantBackground_swigregister(ConstantBackground)
 
 class IDetector(ICloneable, INode):
-    """
+    r"""
 
 
     Abstract detector interface.
@@ -18486,35 +14743,24 @@ class IDetector(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IDetector, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IDetector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IDetector self) -> IDetector
-
         IDetector* IDetector::clone() const override=0
 
         """
         return _libBornAgainCore.IDetector_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IDetector
-    __del__ = lambda self: None
 
     def init(self, arg2):
-        """
+        r"""
         init(IDetector self, Beam arg2)
-
         virtual void IDetector::init(const Beam &)
 
         Inits detector with the beam settings. 
@@ -18522,41 +14768,33 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_init(self, arg2)
 
-
     def clear(self):
-        """
+        r"""
         clear(IDetector self)
-
         void IDetector::clear()
 
         """
         return _libBornAgainCore.IDetector_clear(self)
 
-
     def addAxis(self, axis):
-        """
+        r"""
         addAxis(IDetector self, IAxis axis)
-
         void IDetector::addAxis(const IAxis &axis)
 
         """
         return _libBornAgainCore.IDetector_addAxis(self, axis)
 
-
     def getAxis(self, index):
-        """
+        r"""
         getAxis(IDetector self, size_t index) -> IAxis
-
         const IAxis & IDetector::getAxis(size_t index) const
 
         """
         return _libBornAgainCore.IDetector_getAxis(self, index)
 
-
     def dimension(self):
-        """
+        r"""
         dimension(IDetector self) -> size_t
-
         size_t IDetector::dimension() const
 
         Returns actual dimensionality of the detector (number of defined axes) 
@@ -18564,11 +14802,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_dimension(self)
 
-
     def axisBinIndex(self, index, selected_axis):
-        """
+        r"""
         axisBinIndex(IDetector self, size_t index, size_t selected_axis) -> size_t
-
         size_t IDetector::axisBinIndex(size_t index, size_t selected_axis) const
 
         Calculate axis index for given global index. 
@@ -18576,11 +14812,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_axisBinIndex(self, index, selected_axis)
 
-
     def totalSize(self):
-        """
+        r"""
         totalSize(IDetector self) -> size_t
-
         size_t IDetector::totalSize() const
 
         Returns total number of pixels. 
@@ -18588,11 +14822,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_totalSize(self)
 
-
     def detectorMask(self):
-        """
+        r"""
         detectorMask(IDetector self) -> DetectorMask
-
         virtual const DetectorMask* IDetector::detectorMask() const =0
 
         Returns detector masks container. 
@@ -18600,11 +14832,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_detectorMask(self)
 
-
     def setAnalyzerProperties(self, direction, efficiency, total_transmission):
-        """
+        r"""
         setAnalyzerProperties(IDetector self, kvector_t direction, double efficiency, double total_transmission)
-
         void IDetector::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)
 
         Sets the polarization analyzer characteristics of the detector. 
@@ -18612,11 +14842,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_setAnalyzerProperties(self, direction, efficiency, total_transmission)
 
-
     def setDetectorResolution(self, p_detector_resolution):
-        """
+        r"""
         setDetectorResolution(IDetector self, IDetectorResolution p_detector_resolution)
-
         void IDetector::setDetectorResolution(const IDetectorResolution &p_detector_resolution)
 
         Sets the detector resolution. 
@@ -18624,21 +14852,17 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_setDetectorResolution(self, p_detector_resolution)
 
-
     def setResolutionFunction(self, resFunc):
-        """
+        r"""
         setResolutionFunction(IDetector self, IResolutionFunction2D resFunc)
-
         void IDetector::setResolutionFunction(const IResolutionFunction2D &resFunc)
 
         """
         return _libBornAgainCore.IDetector_setResolutionFunction(self, resFunc)
 
-
     def applyDetectorResolution(self, p_intensity_map):
-        """
+        r"""
         applyDetectorResolution(IDetector self, IntensityData p_intensity_map)
-
         void IDetector::applyDetectorResolution(OutputData< double > *p_intensity_map) const
 
         Applies the detector resolution to the given intensity maps. 
@@ -18646,11 +14870,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_applyDetectorResolution(self, p_intensity_map)
 
-
     def removeDetectorResolution(self):
-        """
+        r"""
         removeDetectorResolution(IDetector self)
-
         void IDetector::removeDetectorResolution()
 
         Removes detector resolution function. 
@@ -18658,11 +14880,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_removeDetectorResolution(self)
 
-
     def detectorResolution(self):
-        """
+        r"""
         detectorResolution(IDetector self) -> IDetectorResolution
-
         const IDetectorResolution * IDetector::detectorResolution() const
 
         Returns a pointer to detector resolution object. 
@@ -18670,11 +14890,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_detectorResolution(self)
 
-
     def regionOfInterest(self):
-        """
+        r"""
         regionOfInterest(IDetector self) -> RegionOfInterest const *
-
         virtual const RegionOfInterest* IDetector::regionOfInterest() const =0
 
         Returns region of interest if exists. 
@@ -18682,11 +14900,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_regionOfInterest(self)
 
-
     def resetRegionOfInterest(self):
-        """
+        r"""
         resetRegionOfInterest(IDetector self)
-
         virtual void IDetector::resetRegionOfInterest()=0
 
         Resets region of interest making whole detector plane available for the simulation. 
@@ -18694,11 +14910,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_resetRegionOfInterest(self)
 
-
     def detectionProperties(self):
-        """
+        r"""
         detectionProperties(IDetector self) -> DetectionProperties const &
-
         const DetectionProperties& IDetector::detectionProperties() const
 
         Returns detection properties. 
@@ -18706,11 +14920,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_detectionProperties(self)
 
-
     def createDetectorIntensity(self, elements):
-        """
+        r"""
         createDetectorIntensity(IDetector self, std::vector< SimulationElement,std::allocator< SimulationElement > > const & elements) -> IntensityData
-
         OutputData< double > * IDetector::createDetectorIntensity(const std::vector< SimulationElement > &elements) const
 
         Returns new intensity map with detector resolution applied. Map will be cropped to ROI if ROI is present. 
@@ -18718,11 +14930,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_createDetectorIntensity(self, elements)
 
-
     def defaultAxesUnits(self):
-        """
+        r"""
         defaultAxesUnits(IDetector self) -> AxesUnits
-
         virtual AxesUnits IDetector::defaultAxesUnits() const
 
         Return default axes units. 
@@ -18730,11 +14940,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_defaultAxesUnits(self)
 
-
     def numberOfSimulationElements(self):
-        """
+        r"""
         numberOfSimulationElements(IDetector self) -> size_t
-
         size_t IDetector::numberOfSimulationElements() const
 
         Returns number of simulation elements. 
@@ -18742,11 +14950,9 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_numberOfSimulationElements(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(IDetector self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > IDetector::getChildren() const override
 
         Returns a vector of children (const). 
@@ -18754,22 +14960,19 @@ class IDetector(ICloneable, INode):
         """
         return _libBornAgainCore.IDetector_getChildren(self)
 
-
     def iterate(self, func, visit_masks=False):
-        """
+        r"""
         iterate(IDetector self, std::function< void (IDetector::const_iterator) > func, bool visit_masks=False)
-        iterate(IDetector self, std::function< void (IDetector::const_iterator) > func)
-
         void IDetector::iterate(std::function< void(const_iterator)> func, bool visit_masks=false) const
 
         """
         return _libBornAgainCore.IDetector_iterate(self, func, visit_masks)
 
-IDetector_swigregister = _libBornAgainCore.IDetector_swigregister
-IDetector_swigregister(IDetector)
+# Register IDetector in _libBornAgainCore:
+_libBornAgainCore.IDetector_swigregister(IDetector)
 
 class IDetector2D(IDetector):
-    """
+    r"""
 
 
     Abstract 2D detector interface.
@@ -18778,35 +14981,24 @@ class IDetector2D(IDetector):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDetector]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IDetector2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDetector]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IDetector2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(IDetector2D self) -> IDetector2D
-
         IDetector2D* IDetector2D::clone() const override=0
 
         """
         return _libBornAgainCore.IDetector2D_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IDetector2D
-    __del__ = lambda self: None
 
     def setDetectorParameters(self, n_x, x_min, x_max, n_y, y_min, y_max):
-        """
+        r"""
         setDetectorParameters(IDetector2D self, size_t n_x, double x_min, double x_max, size_t n_y, double y_min, double y_max)
-
         void IDetector2D::setDetectorParameters(size_t n_x, double x_min, double x_max, size_t n_y, double y_min, double y_max)
 
         Sets detector parameters using angle ranges. 
@@ -18814,11 +15006,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_setDetectorParameters(self, n_x, x_min, x_max, n_y, y_min, y_max)
 
-
     def setDetectorAxes(self, axis0, axis1):
-        """
+        r"""
         setDetectorAxes(IDetector2D self, IAxis axis0, IAxis axis1)
-
         void IDetector2D::setDetectorAxes(const IAxis &axis0, const IAxis &axis1)
 
         Sets detector parameters using axes. 
@@ -18826,11 +15016,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_setDetectorAxes(self, axis0, axis1)
 
-
     def removeMasks(self):
-        """
+        r"""
         removeMasks(IDetector2D self)
-
         void IDetector2D::removeMasks()
 
         Removes all masks from the detector. 
@@ -18838,11 +15026,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_removeMasks(self)
 
-
     def detectorMask(self):
-        """
+        r"""
         detectorMask(IDetector2D self) -> DetectorMask
-
         const DetectorMask * IDetector2D::detectorMask() const override
 
         Returns detector masks container. 
@@ -18850,12 +15036,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_detectorMask(self)
 
-
     def addMask(self, shape, mask_value=True):
-        """
+        r"""
         addMask(IDetector2D self, IShape2D shape, bool mask_value=True)
-        addMask(IDetector2D self, IShape2D shape)
-
         void IDetector2D::addMask(const IShape2D &shape, bool mask_value=true)
 
         Adds mask of given shape to the stack of detector masks. The mask value 'true' means that the channel will be excluded from the simulation. The mask which is added last has priority.
@@ -18872,11 +15055,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_addMask(self, shape, mask_value)
 
-
     def maskAll(self):
-        """
+        r"""
         maskAll(IDetector2D self)
-
         void IDetector2D::maskAll()
 
         Put the mask for all detector channels (i.e. exclude whole detector from the analysis) 
@@ -18884,11 +15065,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_maskAll(self)
 
-
     def regionOfInterest(self):
-        """
+        r"""
         regionOfInterest(IDetector2D self) -> RegionOfInterest const *
-
         const RegionOfInterest * IDetector2D::regionOfInterest() const override
 
         Returns region of interest if exists. 
@@ -18896,11 +15075,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_regionOfInterest(self)
 
-
     def setRegionOfInterest(self, xlow, ylow, xup, yup):
-        """
+        r"""
         setRegionOfInterest(IDetector2D self, double xlow, double ylow, double xup, double yup)
-
         void IDetector2D::setRegionOfInterest(double xlow, double ylow, double xup, double yup)
 
         Sets rectangular region of interest with lower left and upper right corners defined. 
@@ -18908,11 +15085,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_setRegionOfInterest(self, xlow, ylow, xup, yup)
 
-
     def resetRegionOfInterest(self):
-        """
+        r"""
         resetRegionOfInterest(IDetector2D self)
-
         void IDetector2D::resetRegionOfInterest() override
 
         Resets region of interest making whole detector plane available for the simulation. 
@@ -18920,11 +15095,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_resetRegionOfInterest(self)
 
-
     def active_indices(self):
-        """
+        r"""
         active_indices(IDetector2D self) -> std::vector< size_t,std::allocator< size_t > >
-
         std::vector< size_t > IDetector2D::active_indices() const
 
         Returns vector of unmasked detector indices. 
@@ -18932,11 +15105,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_active_indices(self)
 
-
     def createPixel(self, index):
-        """
+        r"""
         createPixel(IDetector2D self, size_t index) -> IPixel
-
         virtual IPixel* IDetector2D::createPixel(size_t index) const =0
 
         Create an  IPixel for the given  OutputData object and index. 
@@ -18944,11 +15115,9 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_createPixel(self, index)
 
-
     def getIndexOfSpecular(self, beam):
-        """
+        r"""
         getIndexOfSpecular(IDetector2D self, Beam beam) -> size_t
-
         virtual size_t IDetector2D::getIndexOfSpecular(const Beam &beam) const =0
 
         Returns index of pixel that contains the specular wavevector. If no pixel contains this specular wavevector, the number of pixels is returned. This corresponds to an overflow index. 
@@ -18956,11 +15125,11 @@ class IDetector2D(IDetector):
         """
         return _libBornAgainCore.IDetector2D_getIndexOfSpecular(self, beam)
 
-IDetector2D_swigregister = _libBornAgainCore.IDetector2D_swigregister
-IDetector2D_swigregister(IDetector2D)
+# Register IDetector2D in _libBornAgainCore:
+_libBornAgainCore.IDetector2D_swigregister(IDetector2D)
 
 class IDetectorResolution(ICloneable, INode):
-    """
+    r"""
 
 
     Interface for detector resolution algorithms
@@ -18969,25 +15138,16 @@ class IDetectorResolution(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IDetectorResolution, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IDetectorResolution, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IDetectorResolution
-    __del__ = lambda self: None
 
     def applyDetectorResolution(self, p_intensity_map):
-        """
+        r"""
         applyDetectorResolution(IDetectorResolution self, IntensityData p_intensity_map)
-
         virtual void IDetectorResolution::applyDetectorResolution(OutputData< double > *p_intensity_map) const =0
 
         Apply the resolution function to the intensity data. 
@@ -18995,21 +15155,19 @@ class IDetectorResolution(ICloneable, INode):
         """
         return _libBornAgainCore.IDetectorResolution_applyDetectorResolution(self, p_intensity_map)
 
-
     def clone(self):
-        """
+        r"""
         clone(IDetectorResolution self) -> IDetectorResolution
-
         virtual IDetectorResolution* IDetectorResolution::clone() const =0
 
         """
         return _libBornAgainCore.IDetectorResolution_clone(self)
 
-IDetectorResolution_swigregister = _libBornAgainCore.IDetectorResolution_swigregister
-IDetectorResolution_swigregister(IDetectorResolution)
+# Register IDetectorResolution in _libBornAgainCore:
+_libBornAgainCore.IDetectorResolution_swigregister(IDetectorResolution)
 
 class IInterferenceFunction(ISample):
-    """
+    r"""
 
 
     Pure virtual base class of interference functions.
@@ -19018,21 +15176,13 @@ class IInterferenceFunction(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IInterferenceFunction, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IInterferenceFunction, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(IInterferenceFunction self) -> IInterferenceFunction
         __init__(IInterferenceFunction self, IInterferenceFunction other) -> IInterferenceFunction
-
         IInterferenceFunction::IInterferenceFunction(const IInterferenceFunction &other)
 
         """
@@ -19040,18 +15190,12 @@ class IInterferenceFunction(ISample):
             _self = None
         else:
             _self = self
-        this = _libBornAgainCore.new_IInterferenceFunction(_self, *args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IInterferenceFunction_swiginit(self, _libBornAgainCore.new_IInterferenceFunction(_self, *args))
     __swig_destroy__ = _libBornAgainCore.delete_IInterferenceFunction
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IInterferenceFunction self) -> IInterferenceFunction
-
         virtual IInterferenceFunction* IInterferenceFunction::clone() const =0
 
         Returns a clone of this  ISample object. 
@@ -19059,11 +15203,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IInterferenceFunction self, INodeVisitor visitor)
-
         virtual void IInterferenceFunction::accept(INodeVisitor *visitor) const =0
 
         Calls the  INodeVisitor's visit method. 
@@ -19071,12 +15213,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_accept(self, visitor)
 
-
     def evaluate(self, q, outer_iff=1.0):
-        """
+        r"""
         evaluate(IInterferenceFunction self, kvector_t q, double outer_iff=1.0) -> double
-        evaluate(IInterferenceFunction self, kvector_t q) -> double
-
         double IInterferenceFunction::evaluate(const kvector_t q, double outer_iff=1.0) const
 
         Evaluates the interference function for a given wavevector transfer. 
@@ -19084,11 +15223,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_evaluate(self, q, outer_iff)
 
-
     def setPositionVariance(self, var):
-        """
+        r"""
         setPositionVariance(IInterferenceFunction self, double var)
-
         void IInterferenceFunction::setPositionVariance(double var)
 
         Sets the variance of the position for the calculation of the DW factor It is defined as the variance in each relevant dimension 
@@ -19096,11 +15233,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_setPositionVariance(self, var)
 
-
     def positionVariance(self):
-        """
+        r"""
         positionVariance(IInterferenceFunction self) -> double
-
         double IInterferenceFunction::positionVariance() const
 
         Returns the position variance. 
@@ -19108,11 +15243,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_positionVariance(self)
 
-
     def getParticleDensity(self):
-        """
+        r"""
         getParticleDensity(IInterferenceFunction self) -> double
-
         virtual double IInterferenceFunction::getParticleDensity() const
 
         If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value 
@@ -19120,11 +15253,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_getParticleDensity(self)
 
-
     def supportsMultilayer(self):
-        """
+        r"""
         supportsMultilayer(IInterferenceFunction self) -> bool
-
         virtual bool IInterferenceFunction::supportsMultilayer() const
 
         Indicates if this interference function can be used with a multilayer (DWBA mode) 
@@ -19132,11 +15263,9 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_supportsMultilayer(self)
 
-
     def DWfactor(self, q):
-        """
+        r"""
         DWfactor(IInterferenceFunction self, kvector_t q) -> double
-
         double IInterferenceFunction::DWfactor(kvector_t q) const
 
         Evaluates the Debye-Waller factor for a given wavevector transfer. 
@@ -19144,20 +15273,19 @@ class IInterferenceFunction(ISample):
         """
         return _libBornAgainCore.IInterferenceFunction_DWfactor(self, q)
 
-
     def iff_without_dw(self, q):
-        """iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"""
+        r"""iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"""
         return _libBornAgainCore.IInterferenceFunction_iff_without_dw(self, q)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainCore.disown_IInterferenceFunction(self)
-        return weakref_proxy(self)
-IInterferenceFunction_swigregister = _libBornAgainCore.IInterferenceFunction_swigregister
-IInterferenceFunction_swigregister(IInterferenceFunction)
+        return weakref.proxy(self)
+
+# Register IInterferenceFunction in _libBornAgainCore:
+_libBornAgainCore.IInterferenceFunction_swigregister(IInterferenceFunction)
 
 class ILayout(ISample):
-    """
+    r"""
 
 
     Pure virtual interface class to equip a sample layer with scattering properties. Currently only inherited by  ParticleLayout; in the future also by domain structure.
@@ -19166,25 +15294,16 @@ class ILayout(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ILayout, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ILayout, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_ILayout
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ILayout self) -> ILayout
-
         virtual ILayout* ILayout::clone() const =0
 
         Returns a clone of this  ISample object. 
@@ -19192,11 +15311,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ILayout self, INodeVisitor visitor)
-
         virtual void ILayout::accept(INodeVisitor *visitor) const =0
 
         Calls the  INodeVisitor's visit method. 
@@ -19204,11 +15321,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_accept(self, visitor)
 
-
     def particles(self):
-        """
+        r"""
         particles(ILayout self) -> SafePointerVector< IParticle >
-
         virtual SafePointerVector<IParticle> ILayout::particles() const =0
 
         Returns information on all particles (type and abundance) and generates new particles if an  IAbstractParticle denotes a collection 
@@ -19216,11 +15331,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_particles(self)
 
-
     def interferenceFunction(self):
-        """
+        r"""
         interferenceFunction(ILayout self) -> IInterferenceFunction
-
         virtual const IInterferenceFunction* ILayout::interferenceFunction() const =0
 
         Returns the interference function. 
@@ -19228,11 +15341,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_interferenceFunction(self)
 
-
     def getTotalAbundance(self):
-        """
+        r"""
         getTotalAbundance(ILayout self) -> double
-
         virtual double ILayout::getTotalAbundance() const =0
 
         Get total abundance of all particles. 
@@ -19240,11 +15351,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_getTotalAbundance(self)
 
-
     def totalParticleSurfaceDensity(self):
-        """
+        r"""
         totalParticleSurfaceDensity(ILayout self) -> double
-
         virtual double ILayout::totalParticleSurfaceDensity() const =0
 
         Returns surface density of all particles. 
@@ -19252,11 +15361,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_totalParticleSurfaceDensity(self)
 
-
     def setTotalParticleSurfaceDensity(self, particle_density):
-        """
+        r"""
         setTotalParticleSurfaceDensity(ILayout self, double particle_density)
-
         virtual void ILayout::setTotalParticleSurfaceDensity(double particle_density)=0
 
         Sets surface density of all particles. 
@@ -19264,11 +15371,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_setTotalParticleSurfaceDensity(self, particle_density)
 
-
     def weight(self):
-        """
+        r"""
         weight(ILayout self) -> double
-
         double ILayout::weight() const
 
         Returns the relative weight of this layout. 
@@ -19276,11 +15381,9 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_weight(self)
 
-
     def setWeight(self, weight):
-        """
+        r"""
         setWeight(ILayout self, double weight)
-
         void ILayout::setWeight(double weight)
 
         Sets the relative weight of this layout. 
@@ -19288,11 +15391,11 @@ class ILayout(ISample):
         """
         return _libBornAgainCore.ILayout_setWeight(self, weight)
 
-ILayout_swigregister = _libBornAgainCore.ILayout_swigregister
-ILayout_swigregister(ILayout)
+# Register ILayout in _libBornAgainCore:
+_libBornAgainCore.ILayout_swigregister(ILayout)
 
 class IAbstractParticle(ISample):
-    """
+    r"""
 
 
     Interface for a generic particle.
@@ -19303,25 +15406,16 @@ class IAbstractParticle(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IAbstractParticle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IAbstractParticle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IAbstractParticle
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IAbstractParticle self) -> IAbstractParticle
-
         virtual IAbstractParticle* IAbstractParticle::clone() const =0
 
         Returns a clone of this  ISample object. 
@@ -19329,11 +15423,9 @@ class IAbstractParticle(ISample):
         """
         return _libBornAgainCore.IAbstractParticle_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IAbstractParticle self, INodeVisitor visitor)
-
         void IAbstractParticle::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -19341,21 +15433,17 @@ class IAbstractParticle(ISample):
         """
         return _libBornAgainCore.IAbstractParticle_accept(self, visitor)
 
-
     def abundance(self):
-        """
+        r"""
         abundance(IAbstractParticle self) -> double
-
         double IAbstractParticle::abundance() const
 
         """
         return _libBornAgainCore.IAbstractParticle_abundance(self)
 
-
     def setAbundance(self, abundance):
-        """
+        r"""
         setAbundance(IAbstractParticle self, double abundance)
-
         void IAbstractParticle::setAbundance(double abundance)
 
         Sets particle abundance.
@@ -19369,11 +15457,9 @@ class IAbstractParticle(ISample):
         """
         return _libBornAgainCore.IAbstractParticle_setAbundance(self, abundance)
 
-
     def translate(self, translation):
-        """
+        r"""
         translate(IAbstractParticle self, kvector_t translation)
-
         virtual void IAbstractParticle::translate(kvector_t translation)=0
 
         Translates the particle with the given vector. 
@@ -19381,11 +15467,9 @@ class IAbstractParticle(ISample):
         """
         return _libBornAgainCore.IAbstractParticle_translate(self, translation)
 
-
     def rotate(self, rotation):
-        """
+        r"""
         rotate(IAbstractParticle self, IRotation rotation)
-
         virtual void IAbstractParticle::rotate(const IRotation &rotation)=0
 
         Applies the given rotation to the particle. 
@@ -19393,11 +15477,11 @@ class IAbstractParticle(ISample):
         """
         return _libBornAgainCore.IAbstractParticle_rotate(self, rotation)
 
-IAbstractParticle_swigregister = _libBornAgainCore.IAbstractParticle_swigregister
-IAbstractParticle_swigregister(IAbstractParticle)
+# Register IAbstractParticle in _libBornAgainCore:
+_libBornAgainCore.IAbstractParticle_swigregister(IAbstractParticle)
 
 class IParameterReal(INamed):
-    """
+    r"""
 
 
     Pure virtual base class for parameter wrapper classes  RealParameter, ComponentParameter. Holds a pointer to the wrapped parameter, a name, and a callback function to be called when the parameter is changed. This class is templated on the data type of the wrapped parameter.
@@ -19406,34 +15490,23 @@ class IParameterReal(INamed):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [INamed]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IParameterReal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [INamed]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IParameterReal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self, *args):
-        """
-        clone(IParameterReal self, std::string const & new_name) -> IParameterReal
-        clone(IParameterReal self) -> IParameterReal
-
+        r"""
+        clone(IParameterReal self, std::string const & new_name="") -> IParameterReal
         virtual IParameter* IParameter< T >::clone(const std::string &new_name="") const =0
 
         """
         return _libBornAgainCore.IParameterReal_clone(self, *args)
 
-
     def isNull(self):
-        """
+        r"""
         isNull(IParameterReal self) -> bool
-
         virtual bool IParameter< T >::isNull() const
 
         Returns true if wrapped parameter was not initialized with proper real value. 
@@ -19441,45 +15514,38 @@ class IParameterReal(INamed):
         """
         return _libBornAgainCore.IParameterReal_isNull(self)
 
-
     def getData(self):
-        """
+        r"""
         getData(IParameterReal self) -> double &
-
         T& IParameter< T >::getData() const
 
         """
         return _libBornAgainCore.IParameterReal_getData(self)
 
-
     def setData(self, data):
-        """
+        r"""
         setData(IParameterReal self, double & data)
-
         void IParameter< T >::setData(T &data)
 
         """
         return _libBornAgainCore.IParameterReal_setData(self, data)
 
-
     def hasSameData(self, other):
-        """
+        r"""
         hasSameData(IParameterReal self, IParameterReal other) -> bool
-
         bool IParameter< T >::hasSameData(const IParameter &other)
 
         Returns true if two parameters are pointing to the same raw data. 
 
         """
         return _libBornAgainCore.IParameterReal_hasSameData(self, other)
-
     __swig_destroy__ = _libBornAgainCore.delete_IParameterReal
-    __del__ = lambda self: None
-IParameterReal_swigregister = _libBornAgainCore.IParameterReal_swigregister
-IParameterReal_swigregister(IParameterReal)
 
-class ParticleLimits(_object):
-    """
+# Register IParameterReal in _libBornAgainCore:
+_libBornAgainCore.IParameterReal_swigregister(IParameterReal)
+
+class ParticleLimits(object):
+    r"""
 
 
     Vertical extension of a particle, specified by bottom and top z coordinate.
@@ -19488,43 +15554,29 @@ class ParticleLimits(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParticleLimits, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ParticleLimits, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
-    __swig_setmethods__["m_bottom"] = _libBornAgainCore.ParticleLimits_m_bottom_set
-    __swig_getmethods__["m_bottom"] = _libBornAgainCore.ParticleLimits_m_bottom_get
-    if _newclass:
-        m_bottom = _swig_property(_libBornAgainCore.ParticleLimits_m_bottom_get, _libBornAgainCore.ParticleLimits_m_bottom_set)
-    __swig_setmethods__["m_top"] = _libBornAgainCore.ParticleLimits_m_top_set
-    __swig_getmethods__["m_top"] = _libBornAgainCore.ParticleLimits_m_top_get
-    if _newclass:
-        m_top = _swig_property(_libBornAgainCore.ParticleLimits_m_top_get, _libBornAgainCore.ParticleLimits_m_top_set)
+    m_bottom = property(_libBornAgainCore.ParticleLimits_m_bottom_get, _libBornAgainCore.ParticleLimits_m_bottom_set, doc=r"""m_bottom : double""")
+    m_top = property(_libBornAgainCore.ParticleLimits_m_top_get, _libBornAgainCore.ParticleLimits_m_top_set, doc=r"""m_top : double""")
 
     def __init__(self):
-        """
+        r"""
         __init__(ParticleLimits self) -> ParticleLimits
 
 
-
         Vertical extension of a particle, specified by bottom and top z coordinate.
 
         C++ includes: IParticle.h
 
         """
-        this = _libBornAgainCore.new_ParticleLimits()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParticleLimits_swiginit(self, _libBornAgainCore.new_ParticleLimits())
     __swig_destroy__ = _libBornAgainCore.delete_ParticleLimits
-    __del__ = lambda self: None
-ParticleLimits_swigregister = _libBornAgainCore.ParticleLimits_swigregister
-ParticleLimits_swigregister(ParticleLimits)
+
+# Register ParticleLimits in _libBornAgainCore:
+_libBornAgainCore.ParticleLimits_swigregister(ParticleLimits)
 
 class IParticle(IAbstractParticle):
-    """
+    r"""
 
 
     Pure virtual base class for  Particle,  ParticleComposition,  ParticleCoreShell,  MesoCrystal. Provides position/rotation and form factor. Abundance is inherited from  IAbstractParticle.
@@ -19533,25 +15585,16 @@ class IParticle(IAbstractParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IAbstractParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IParticle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IAbstractParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IParticle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IParticle
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IParticle self) -> IParticle
-
         IParticle* IParticle::clone() const override=0
 
         Returns a clone of this  ISample object. 
@@ -19559,11 +15602,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IParticle self, INodeVisitor visitor)
-
         void IParticle::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -19571,11 +15612,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_accept(self, visitor)
 
-
     def createFormFactor(self):
-        """
+        r"""
         createFormFactor(IParticle self) -> IFormFactor
-
         IFormFactor * IParticle::createFormFactor() const
 
         Create a form factor for this particle. 
@@ -19583,11 +15622,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_createFormFactor(self)
 
-
     def createSlicedParticle(self, limits):
-        """
+        r"""
         createSlicedParticle(IParticle self, ZLimits limits) -> SlicedParticle
-
         SlicedParticle IParticle::createSlicedParticle(ZLimits limits) const
 
         Create a sliced form factor for this particle. 
@@ -19595,11 +15632,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_createSlicedParticle(self, limits)
 
-
     def position(self):
-        """
+        r"""
         position(IParticle self) -> kvector_t
-
         kvector_t IParticle::position() const
 
         Returns particle position. 
@@ -19607,12 +15642,10 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_position(self)
 
-
     def setPosition(self, *args):
-        """
+        r"""
         setPosition(IParticle self, kvector_t position)
         setPosition(IParticle self, double x, double y, double z)
-
         void IParticle::setPosition(double x, double y, double z)
 
         Sets relative position of the particle's reference point in the coordinate system of parent.
@@ -19632,11 +15665,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_setPosition(self, *args)
 
-
     def translate(self, translation):
-        """
+        r"""
         translate(IParticle self, kvector_t translation)
-
         void IParticle::translate(kvector_t translation) override final
 
         Translates the particle. 
@@ -19644,11 +15675,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_translate(self, translation)
 
-
     def rotation(self):
-        """
+        r"""
         rotation(IParticle self) -> IRotation
-
         const IRotation * IParticle::rotation() const
 
         Returns rotation object. 
@@ -19656,11 +15685,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_rotation(self)
 
-
     def setRotation(self, rotation):
-        """
+        r"""
         setRotation(IParticle self, IRotation rotation)
-
         void IParticle::setRotation(const IRotation &rotation)
 
         Sets transformation. 
@@ -19668,11 +15695,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_setRotation(self, rotation)
 
-
     def rotate(self, rotation):
-        """
+        r"""
         rotate(IParticle self, IRotation rotation)
-
         void IParticle::rotate(const IRotation &rotation) override final
 
         Rotates the particle. 
@@ -19680,11 +15705,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_rotate(self, rotation)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(IParticle self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > IParticle::getChildren() const override
 
         Returns a vector of children (const). 
@@ -19692,23 +15715,17 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_getChildren(self)
 
-
     def registerAbundance(self, make_registered=True):
-        """
+        r"""
         registerAbundance(IParticle self, bool make_registered=True)
-        registerAbundance(IParticle self)
-
         void IParticle::registerAbundance(bool make_registered=true)
 
         """
         return _libBornAgainCore.IParticle_registerAbundance(self, make_registered)
 
-
     def registerPosition(self, make_registered=True):
-        """
+        r"""
         registerPosition(IParticle self, bool make_registered=True)
-        registerPosition(IParticle self)
-
         void IParticle::registerPosition(bool make_registered=true)
 
         Registers the three components of its position. 
@@ -19716,11 +15733,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_registerPosition(self, make_registered)
 
-
     def decompose(self):
-        """
+        r"""
         decompose(IParticle self) -> SafePointerVector< IParticle >
-
         SafePointerVector< IParticle > IParticle::decompose() const
 
         Decompose in constituent  IParticle objects. 
@@ -19728,11 +15743,9 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_decompose(self)
 
-
     def bottomTopZ(self):
-        """
+        r"""
         bottomTopZ(IParticle self) -> ParticleLimits
-
         ParticleLimits IParticle::bottomTopZ() const
 
         Top and bottom z-coordinate. 
@@ -19740,11 +15753,11 @@ class IParticle(IAbstractParticle):
         """
         return _libBornAgainCore.IParticle_bottomTopZ(self)
 
-IParticle_swigregister = _libBornAgainCore.IParticle_swigregister
-IParticle_swigregister(IParticle)
+# Register IParticle in _libBornAgainCore:
+_libBornAgainCore.IParticle_swigregister(IParticle)
 
 class IPeakShape(ISample):
-    """
+    r"""
 
 
     Pure virtual interface class that defines the peak shape of a Bragg peak.
@@ -19753,25 +15766,16 @@ class IPeakShape(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IPeakShape self) -> IPeakShape
-
         virtual IPeakShape* IPeakShape::clone() const =0
 
         Returns a clone of this  ISample object. 
@@ -19779,11 +15783,9 @@ class IPeakShape(ISample):
         """
         return _libBornAgainCore.IPeakShape_clone(self)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(IPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         virtual double IPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const =0
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -19791,11 +15793,9 @@ class IPeakShape(ISample):
         """
         return _libBornAgainCore.IPeakShape_evaluate(self, q, q_lattice_point)
 
-
     def angularDisorder(self):
-        """
+        r"""
         angularDisorder(IPeakShape self) -> bool
-
         virtual bool IPeakShape::angularDisorder() const
 
         Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed 
@@ -19803,11 +15803,11 @@ class IPeakShape(ISample):
         """
         return _libBornAgainCore.IPeakShape_angularDisorder(self)
 
-IPeakShape_swigregister = _libBornAgainCore.IPeakShape_swigregister
-IPeakShape_swigregister(IPeakShape)
+# Register IPeakShape in _libBornAgainCore:
+_libBornAgainCore.IPeakShape_swigregister(IPeakShape)
 
 class IsotropicGaussPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements an isotropic Gaussian peak shape of a Bragg peak.
@@ -19816,35 +15816,21 @@ class IsotropicGaussPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IsotropicGaussPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IsotropicGaussPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, domainsize):
-        """
+        r"""
         __init__(IsotropicGaussPeakShape self, double max_intensity, double domainsize) -> IsotropicGaussPeakShape
-
         IsotropicGaussPeakShape::IsotropicGaussPeakShape(double max_intensity, double domainsize)
 
         """
-        this = _libBornAgainCore.new_IsotropicGaussPeakShape(max_intensity, domainsize)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IsotropicGaussPeakShape_swiginit(self, _libBornAgainCore.new_IsotropicGaussPeakShape(max_intensity, domainsize))
     __swig_destroy__ = _libBornAgainCore.delete_IsotropicGaussPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IsotropicGaussPeakShape self) -> IsotropicGaussPeakShape
-
         IsotropicGaussPeakShape * IsotropicGaussPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -19852,11 +15838,9 @@ class IsotropicGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicGaussPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IsotropicGaussPeakShape self, INodeVisitor visitor)
-
         void IsotropicGaussPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -19864,11 +15848,9 @@ class IsotropicGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicGaussPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(IsotropicGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double IsotropicGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -19876,11 +15858,11 @@ class IsotropicGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicGaussPeakShape_evaluate(self, q, q_lattice_point)
 
-IsotropicGaussPeakShape_swigregister = _libBornAgainCore.IsotropicGaussPeakShape_swigregister
-IsotropicGaussPeakShape_swigregister(IsotropicGaussPeakShape)
+# Register IsotropicGaussPeakShape in _libBornAgainCore:
+_libBornAgainCore.IsotropicGaussPeakShape_swigregister(IsotropicGaussPeakShape)
 
 class IsotropicLorentzPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements an isotropic Lorentzian peak shape of a Bragg peak.
@@ -19889,35 +15871,21 @@ class IsotropicLorentzPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IsotropicLorentzPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IsotropicLorentzPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, domainsize):
-        """
+        r"""
         __init__(IsotropicLorentzPeakShape self, double max_intensity, double domainsize) -> IsotropicLorentzPeakShape
-
         IsotropicLorentzPeakShape::IsotropicLorentzPeakShape(double max_intensity, double domainsize)
 
         """
-        this = _libBornAgainCore.new_IsotropicLorentzPeakShape(max_intensity, domainsize)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IsotropicLorentzPeakShape_swiginit(self, _libBornAgainCore.new_IsotropicLorentzPeakShape(max_intensity, domainsize))
     __swig_destroy__ = _libBornAgainCore.delete_IsotropicLorentzPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IsotropicLorentzPeakShape self) -> IsotropicLorentzPeakShape
-
         IsotropicLorentzPeakShape * IsotropicLorentzPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -19925,11 +15893,9 @@ class IsotropicLorentzPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicLorentzPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IsotropicLorentzPeakShape self, INodeVisitor visitor)
-
         void IsotropicLorentzPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -19937,11 +15903,9 @@ class IsotropicLorentzPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicLorentzPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(IsotropicLorentzPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double IsotropicLorentzPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -19949,11 +15913,11 @@ class IsotropicLorentzPeakShape(IPeakShape):
         """
         return _libBornAgainCore.IsotropicLorentzPeakShape_evaluate(self, q, q_lattice_point)
 
-IsotropicLorentzPeakShape_swigregister = _libBornAgainCore.IsotropicLorentzPeakShape_swigregister
-IsotropicLorentzPeakShape_swigregister(IsotropicLorentzPeakShape)
+# Register IsotropicLorentzPeakShape in _libBornAgainCore:
+_libBornAgainCore.IsotropicLorentzPeakShape_swigregister(IsotropicLorentzPeakShape)
 
 class GaussFisherPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements a peak shape that is Gaussian in the radial direction and uses the von Mises-Fisher distribution in the angular direction.
@@ -19962,35 +15926,21 @@ class GaussFisherPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GaussFisherPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GaussFisherPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, radial_size, kappa):
-        """
+        r"""
         __init__(GaussFisherPeakShape self, double max_intensity, double radial_size, double kappa) -> GaussFisherPeakShape
-
         GaussFisherPeakShape::GaussFisherPeakShape(double max_intensity, double radial_size, double kappa)
 
         """
-        this = _libBornAgainCore.new_GaussFisherPeakShape(max_intensity, radial_size, kappa)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.GaussFisherPeakShape_swiginit(self, _libBornAgainCore.new_GaussFisherPeakShape(max_intensity, radial_size, kappa))
     __swig_destroy__ = _libBornAgainCore.delete_GaussFisherPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(GaussFisherPeakShape self) -> GaussFisherPeakShape
-
         GaussFisherPeakShape * GaussFisherPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -19998,11 +15948,9 @@ class GaussFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.GaussFisherPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(GaussFisherPeakShape self, INodeVisitor visitor)
-
         void GaussFisherPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -20010,11 +15958,9 @@ class GaussFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.GaussFisherPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(GaussFisherPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double GaussFisherPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -20022,11 +15968,9 @@ class GaussFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.GaussFisherPeakShape_evaluate(self, q, q_lattice_point)
 
-
     def angularDisorder(self):
-        """
+        r"""
         angularDisorder(GaussFisherPeakShape self) -> bool
-
         bool GaussFisherPeakShape::angularDisorder() const override
 
         Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed 
@@ -20034,11 +15978,11 @@ class GaussFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.GaussFisherPeakShape_angularDisorder(self)
 
-GaussFisherPeakShape_swigregister = _libBornAgainCore.GaussFisherPeakShape_swigregister
-GaussFisherPeakShape_swigregister(GaussFisherPeakShape)
+# Register GaussFisherPeakShape in _libBornAgainCore:
+_libBornAgainCore.GaussFisherPeakShape_swigregister(GaussFisherPeakShape)
 
 class LorentzFisherPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements a peak shape that is Lorentzian in the radial direction and uses the von Mises-Fisher distribution in the angular direction.
@@ -20047,35 +15991,21 @@ class LorentzFisherPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, LorentzFisherPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, LorentzFisherPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, radial_size, kappa):
-        """
+        r"""
         __init__(LorentzFisherPeakShape self, double max_intensity, double radial_size, double kappa) -> LorentzFisherPeakShape
-
         LorentzFisherPeakShape::LorentzFisherPeakShape(double max_intensity, double radial_size, double kappa)
 
         """
-        this = _libBornAgainCore.new_LorentzFisherPeakShape(max_intensity, radial_size, kappa)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.LorentzFisherPeakShape_swiginit(self, _libBornAgainCore.new_LorentzFisherPeakShape(max_intensity, radial_size, kappa))
     __swig_destroy__ = _libBornAgainCore.delete_LorentzFisherPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(LorentzFisherPeakShape self) -> LorentzFisherPeakShape
-
         LorentzFisherPeakShape * LorentzFisherPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -20083,11 +16013,9 @@ class LorentzFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.LorentzFisherPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(LorentzFisherPeakShape self, INodeVisitor visitor)
-
         void LorentzFisherPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -20095,11 +16023,9 @@ class LorentzFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.LorentzFisherPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(LorentzFisherPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double LorentzFisherPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -20107,11 +16033,9 @@ class LorentzFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.LorentzFisherPeakShape_evaluate(self, q, q_lattice_point)
 
-
     def angularDisorder(self):
-        """
+        r"""
         angularDisorder(LorentzFisherPeakShape self) -> bool
-
         bool LorentzFisherPeakShape::angularDisorder() const override
 
         Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed 
@@ -20119,11 +16043,11 @@ class LorentzFisherPeakShape(IPeakShape):
         """
         return _libBornAgainCore.LorentzFisherPeakShape_angularDisorder(self)
 
-LorentzFisherPeakShape_swigregister = _libBornAgainCore.LorentzFisherPeakShape_swigregister
-LorentzFisherPeakShape_swigregister(LorentzFisherPeakShape)
+# Register LorentzFisherPeakShape in _libBornAgainCore:
+_libBornAgainCore.LorentzFisherPeakShape_swigregister(LorentzFisherPeakShape)
 
 class VonMisesFisherGaussPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements a peak shape that is Gaussian in the radial direction and a convolution of a von Mises-Fisher distribution with a von Mises distribution on the two-sphere
@@ -20132,35 +16056,21 @@ class VonMisesFisherGaussPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VonMisesFisherGaussPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VonMisesFisherGaussPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, radial_size, zenith, kappa_1, kappa_2):
-        """
+        r"""
         __init__(VonMisesFisherGaussPeakShape self, double max_intensity, double radial_size, kvector_t zenith, double kappa_1, double kappa_2) -> VonMisesFisherGaussPeakShape
-
         VonMisesFisherGaussPeakShape::VonMisesFisherGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa_1, double kappa_2)
 
         """
-        this = _libBornAgainCore.new_VonMisesFisherGaussPeakShape(max_intensity, radial_size, zenith, kappa_1, kappa_2)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VonMisesFisherGaussPeakShape_swiginit(self, _libBornAgainCore.new_VonMisesFisherGaussPeakShape(max_intensity, radial_size, zenith, kappa_1, kappa_2))
     __swig_destroy__ = _libBornAgainCore.delete_VonMisesFisherGaussPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(VonMisesFisherGaussPeakShape self) -> VonMisesFisherGaussPeakShape
-
         VonMisesFisherGaussPeakShape * VonMisesFisherGaussPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -20168,11 +16078,9 @@ class VonMisesFisherGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesFisherGaussPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(VonMisesFisherGaussPeakShape self, INodeVisitor visitor)
-
         void VonMisesFisherGaussPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -20180,11 +16088,9 @@ class VonMisesFisherGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesFisherGaussPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(VonMisesFisherGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double VonMisesFisherGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -20192,11 +16098,9 @@ class VonMisesFisherGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesFisherGaussPeakShape_evaluate(self, q, q_lattice_point)
 
-
     def angularDisorder(self):
-        """
+        r"""
         angularDisorder(VonMisesFisherGaussPeakShape self) -> bool
-
         bool VonMisesFisherGaussPeakShape::angularDisorder() const override
 
         Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed 
@@ -20204,11 +16108,11 @@ class VonMisesFisherGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesFisherGaussPeakShape_angularDisorder(self)
 
-VonMisesFisherGaussPeakShape_swigregister = _libBornAgainCore.VonMisesFisherGaussPeakShape_swigregister
-VonMisesFisherGaussPeakShape_swigregister(VonMisesFisherGaussPeakShape)
+# Register VonMisesFisherGaussPeakShape in _libBornAgainCore:
+_libBornAgainCore.VonMisesFisherGaussPeakShape_swigregister(VonMisesFisherGaussPeakShape)
 
 class VonMisesGaussPeakShape(IPeakShape):
-    """
+    r"""
 
 
     Class that implements a peak shape that is a convolution of a von Mises-Fisher distribution with a 3d Gaussian
@@ -20217,35 +16121,21 @@ class VonMisesGaussPeakShape(IPeakShape):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VonMisesGaussPeakShape, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPeakShape]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VonMisesGaussPeakShape, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, max_intensity, radial_size, zenith, kappa):
-        """
+        r"""
         __init__(VonMisesGaussPeakShape self, double max_intensity, double radial_size, kvector_t zenith, double kappa) -> VonMisesGaussPeakShape
-
         VonMisesGaussPeakShape::VonMisesGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa)
 
         """
-        this = _libBornAgainCore.new_VonMisesGaussPeakShape(max_intensity, radial_size, zenith, kappa)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VonMisesGaussPeakShape_swiginit(self, _libBornAgainCore.new_VonMisesGaussPeakShape(max_intensity, radial_size, zenith, kappa))
     __swig_destroy__ = _libBornAgainCore.delete_VonMisesGaussPeakShape
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(VonMisesGaussPeakShape self) -> VonMisesGaussPeakShape
-
         VonMisesGaussPeakShape * VonMisesGaussPeakShape::clone() const override
 
         Returns a clone of this  ISample object. 
@@ -20253,11 +16143,9 @@ class VonMisesGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesGaussPeakShape_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(VonMisesGaussPeakShape self, INodeVisitor visitor)
-
         void VonMisesGaussPeakShape::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -20265,11 +16153,9 @@ class VonMisesGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesGaussPeakShape_accept(self, visitor)
 
-
     def evaluate(self, q, q_lattice_point):
-        """
+        r"""
         evaluate(VonMisesGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double
-
         double VonMisesGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override
 
         Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. 
@@ -20277,11 +16163,9 @@ class VonMisesGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesGaussPeakShape_evaluate(self, q, q_lattice_point)
 
-
     def angularDisorder(self):
-        """
+        r"""
         angularDisorder(VonMisesGaussPeakShape self) -> bool
-
         bool VonMisesGaussPeakShape::angularDisorder() const override
 
         Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed 
@@ -20289,11 +16173,11 @@ class VonMisesGaussPeakShape(IPeakShape):
         """
         return _libBornAgainCore.VonMisesGaussPeakShape_angularDisorder(self)
 
-VonMisesGaussPeakShape_swigregister = _libBornAgainCore.VonMisesGaussPeakShape_swigregister
-VonMisesGaussPeakShape_swigregister(VonMisesGaussPeakShape)
+# Register VonMisesGaussPeakShape in _libBornAgainCore:
+_libBornAgainCore.VonMisesGaussPeakShape_swigregister(VonMisesGaussPeakShape)
 
 class IResolutionFunction2D(ICloneable, INode):
-    """
+    r"""
 
 
     Interface providing two-dimensional resolution function.
@@ -20302,45 +16186,34 @@ class IResolutionFunction2D(ICloneable, INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IResolutionFunction2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IResolutionFunction2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IResolutionFunction2D
-    __del__ = lambda self: None
 
     def evaluateCDF(self, x, y):
-        """
+        r"""
         evaluateCDF(IResolutionFunction2D self, double x, double y) -> double
-
         virtual double IResolutionFunction2D::evaluateCDF(double x, double y) const =0
 
         """
         return _libBornAgainCore.IResolutionFunction2D_evaluateCDF(self, x, y)
 
-
     def clone(self):
-        """
+        r"""
         clone(IResolutionFunction2D self) -> IResolutionFunction2D
-
         virtual IResolutionFunction2D* IResolutionFunction2D::clone() const =0
 
         """
         return _libBornAgainCore.IResolutionFunction2D_clone(self)
 
-IResolutionFunction2D_swigregister = _libBornAgainCore.IResolutionFunction2D_swigregister
-IResolutionFunction2D_swigregister(IResolutionFunction2D)
+# Register IResolutionFunction2D in _libBornAgainCore:
+_libBornAgainCore.IResolutionFunction2D_swigregister(IResolutionFunction2D)
 
 class IRotation(ISample):
-    """
+    r"""
 
 
     Pure virtual interface for rotations.
@@ -20349,37 +16222,26 @@ class IRotation(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IRotation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IRotation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
+    @staticmethod
     def createRotation(transform):
-        """createRotation(Transform3D const & transform) -> IRotation"""
+        r"""createRotation(Transform3D const & transform) -> IRotation"""
         return _libBornAgainCore.IRotation_createRotation(transform)
 
-    createRotation = staticmethod(createRotation)
-
+    @staticmethod
     def createIdentity():
-        """createIdentity() -> IRotation"""
+        r"""createIdentity() -> IRotation"""
         return _libBornAgainCore.IRotation_createIdentity()
-
-    createIdentity = staticmethod(createIdentity)
     __swig_destroy__ = _libBornAgainCore.delete_IRotation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IRotation self) -> IRotation
-
         virtual IRotation* IRotation::clone() const =0
 
         Returns a clone of this  ISample object. 
@@ -20387,11 +16249,9 @@ class IRotation(ISample):
         """
         return _libBornAgainCore.IRotation_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(IRotation self) -> IRotation
-
         virtual IRotation* IRotation::createInverse() const =0
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20399,11 +16259,9 @@ class IRotation(ISample):
         """
         return _libBornAgainCore.IRotation_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IRotation self, INodeVisitor visitor)
-
         void IRotation::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20411,11 +16269,9 @@ class IRotation(ISample):
         """
         return _libBornAgainCore.IRotation_accept(self, visitor)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(IRotation self) -> Transform3D
-
         virtual Transform3D IRotation::getTransform3D() const =0
 
         Returns transformation. 
@@ -20423,11 +16279,9 @@ class IRotation(ISample):
         """
         return _libBornAgainCore.IRotation_getTransform3D(self)
 
-
     def isIdentity(self):
-        """
+        r"""
         isIdentity(IRotation self) -> bool
-
         bool IRotation::isIdentity() const
 
         Returns true if rotation matrix is identity matrix (no rotations) 
@@ -20435,22 +16289,21 @@ class IRotation(ISample):
         """
         return _libBornAgainCore.IRotation_isIdentity(self)
 
-IRotation_swigregister = _libBornAgainCore.IRotation_swigregister
-IRotation_swigregister(IRotation)
+# Register IRotation in _libBornAgainCore:
+_libBornAgainCore.IRotation_swigregister(IRotation)
 
 def IRotation_createRotation(transform):
-    """IRotation_createRotation(Transform3D const & transform) -> IRotation"""
+    r"""IRotation_createRotation(Transform3D const & transform) -> IRotation"""
     return _libBornAgainCore.IRotation_createRotation(transform)
 
 def IRotation_createIdentity():
-    """IRotation_createIdentity() -> IRotation"""
+    r"""IRotation_createIdentity() -> IRotation"""
     return _libBornAgainCore.IRotation_createIdentity()
 
 
 def createProduct(left, right):
-    """
+    r"""
     createProduct(IRotation left, IRotation right) -> IRotation
-
     BA_CORE_API_ IRotation* createProduct(const IRotation &left, const IRotation &right)
 
     Returns concatenated rotation (first right, then left). 
@@ -20459,43 +16312,29 @@ def createProduct(left, right):
     return _libBornAgainCore.createProduct(left, right)
 
 def IsZRotation(rot):
-    """
+    r"""
     IsZRotation(IRotation rot) -> bool
-
     bool IsZRotation(const IRotation &rot)
 
     """
     return _libBornAgainCore.IsZRotation(rot)
 class IdentityRotation(IRotation):
-    """Proxy of C++ IdentityRotation class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IRotation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IdentityRotation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IRotation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IdentityRotation, name)
+    r"""Proxy of C++ IdentityRotation class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(IdentityRotation self) -> IdentityRotation
-
         IdentityRotation::IdentityRotation()=default
 
         """
-        this = _libBornAgainCore.new_IdentityRotation()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IdentityRotation_swiginit(self, _libBornAgainCore.new_IdentityRotation())
 
     def clone(self):
-        """
+        r"""
         clone(IdentityRotation self) -> IdentityRotation
-
         IdentityRotation* IdentityRotation::clone() const
 
         Returns a clone of this  ISample object. 
@@ -20503,11 +16342,9 @@ class IdentityRotation(IRotation):
         """
         return _libBornAgainCore.IdentityRotation_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(IdentityRotation self) -> IdentityRotation
-
         IdentityRotation* IdentityRotation::createInverse() const
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20515,11 +16352,9 @@ class IdentityRotation(IRotation):
         """
         return _libBornAgainCore.IdentityRotation_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IdentityRotation self, INodeVisitor visitor)
-
         void IdentityRotation::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20527,11 +16362,9 @@ class IdentityRotation(IRotation):
         """
         return _libBornAgainCore.IdentityRotation_accept(self, visitor)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(IdentityRotation self) -> Transform3D
-
         Transform3D IdentityRotation::getTransform3D() const
 
         Returns transformation. 
@@ -20539,40 +16372,29 @@ class IdentityRotation(IRotation):
         """
         return _libBornAgainCore.IdentityRotation_getTransform3D(self)
 
-
     def isIdentity(self):
-        """
+        r"""
         isIdentity(IdentityRotation self) -> bool
-
         bool IdentityRotation::isIdentity() const
 
         Returns true if rotation matrix is identity matrix (no rotations) 
 
         """
         return _libBornAgainCore.IdentityRotation_isIdentity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IdentityRotation
-    __del__ = lambda self: None
-IdentityRotation_swigregister = _libBornAgainCore.IdentityRotation_swigregister
-IdentityRotation_swigregister(IdentityRotation)
+
+# Register IdentityRotation in _libBornAgainCore:
+_libBornAgainCore.IdentityRotation_swigregister(IdentityRotation)
 
 class RotationX(IRotation):
-    """Proxy of C++ RotationX class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IRotation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RotationX, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IRotation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RotationX, name)
+    r"""Proxy of C++ RotationX class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, angle):
-        """
+        r"""
         __init__(RotationX self, double angle) -> RotationX
-
         RotationX::RotationX(double angle)
 
         Constructor of rotation around x-axis
@@ -20584,16 +16406,11 @@ class RotationX(IRotation):
         rotation angle around x-axis in radians 
 
         """
-        this = _libBornAgainCore.new_RotationX(angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RotationX_swiginit(self, _libBornAgainCore.new_RotationX(angle))
 
     def clone(self):
-        """
+        r"""
         clone(RotationX self) -> RotationX
-
         RotationX* RotationX::clone() const
 
         Returns a clone of this  ISample object. 
@@ -20601,11 +16418,9 @@ class RotationX(IRotation):
         """
         return _libBornAgainCore.RotationX_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(RotationX self) -> RotationX
-
         RotationX* RotationX::createInverse() const
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20613,11 +16428,9 @@ class RotationX(IRotation):
         """
         return _libBornAgainCore.RotationX_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(RotationX self, INodeVisitor visitor)
-
         void RotationX::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20625,50 +16438,37 @@ class RotationX(IRotation):
         """
         return _libBornAgainCore.RotationX_accept(self, visitor)
 
-
     def getAngle(self):
-        """
+        r"""
         getAngle(RotationX self) -> double
-
         double RotationX::getAngle() const
 
         """
         return _libBornAgainCore.RotationX_getAngle(self)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(RotationX self) -> Transform3D
-
         Transform3D RotationX::getTransform3D() const
 
         Returns transformation. 
 
         """
         return _libBornAgainCore.RotationX_getTransform3D(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RotationX
-    __del__ = lambda self: None
-RotationX_swigregister = _libBornAgainCore.RotationX_swigregister
-RotationX_swigregister(RotationX)
+
+# Register RotationX in _libBornAgainCore:
+_libBornAgainCore.RotationX_swigregister(RotationX)
 
 class RotationY(IRotation):
-    """Proxy of C++ RotationY class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IRotation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RotationY, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IRotation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RotationY, name)
+    r"""Proxy of C++ RotationY class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, angle):
-        """
+        r"""
         __init__(RotationY self, double angle) -> RotationY
-
         RotationY::RotationY(double angle)
 
         Constructor of rotation around y-axis
@@ -20680,16 +16480,11 @@ class RotationY(IRotation):
         rotation angle around y-axis in radians 
 
         """
-        this = _libBornAgainCore.new_RotationY(angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RotationY_swiginit(self, _libBornAgainCore.new_RotationY(angle))
 
     def clone(self):
-        """
+        r"""
         clone(RotationY self) -> RotationY
-
         RotationY* RotationY::clone() const
 
         Returns a clone of this  ISample object. 
@@ -20697,11 +16492,9 @@ class RotationY(IRotation):
         """
         return _libBornAgainCore.RotationY_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(RotationY self) -> RotationY
-
         RotationY* RotationY::createInverse() const
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20709,11 +16502,9 @@ class RotationY(IRotation):
         """
         return _libBornAgainCore.RotationY_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(RotationY self, INodeVisitor visitor)
-
         void RotationY::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20721,51 +16512,37 @@ class RotationY(IRotation):
         """
         return _libBornAgainCore.RotationY_accept(self, visitor)
 
-
     def getAngle(self):
-        """
+        r"""
         getAngle(RotationY self) -> double
-
         double RotationY::getAngle() const
 
         """
         return _libBornAgainCore.RotationY_getAngle(self)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(RotationY self) -> Transform3D
-
         Transform3D RotationY::getTransform3D() const
 
         Returns transformation. 
 
         """
         return _libBornAgainCore.RotationY_getTransform3D(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RotationY
-    __del__ = lambda self: None
-RotationY_swigregister = _libBornAgainCore.RotationY_swigregister
-RotationY_swigregister(RotationY)
+
+# Register RotationY in _libBornAgainCore:
+_libBornAgainCore.RotationY_swigregister(RotationY)
 
 class RotationZ(IRotation):
-    """Proxy of C++ RotationZ class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IRotation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RotationZ, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IRotation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RotationZ, name)
+    r"""Proxy of C++ RotationZ class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, angle=0.0):
-        """
+        r"""
         __init__(RotationZ self, double angle=0.0) -> RotationZ
-        __init__(RotationZ self) -> RotationZ
-
         RotationZ::RotationZ(double angle=0.0)
 
         Constructor of rotation around z-axis
@@ -20777,16 +16554,11 @@ class RotationZ(IRotation):
         rotation angle around z-axis in radians 
 
         """
-        this = _libBornAgainCore.new_RotationZ(angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RotationZ_swiginit(self, _libBornAgainCore.new_RotationZ(angle))
 
     def clone(self):
-        """
+        r"""
         clone(RotationZ self) -> RotationZ
-
         RotationZ* RotationZ::clone() const
 
         Returns a clone of this  ISample object. 
@@ -20794,11 +16566,9 @@ class RotationZ(IRotation):
         """
         return _libBornAgainCore.RotationZ_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(RotationZ self) -> RotationZ
-
         RotationZ* RotationZ::createInverse() const
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20806,11 +16576,9 @@ class RotationZ(IRotation):
         """
         return _libBornAgainCore.RotationZ_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(RotationZ self, INodeVisitor visitor)
-
         void RotationZ::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20818,50 +16586,37 @@ class RotationZ(IRotation):
         """
         return _libBornAgainCore.RotationZ_accept(self, visitor)
 
-
     def getAngle(self):
-        """
+        r"""
         getAngle(RotationZ self) -> double
-
         double RotationZ::getAngle() const
 
         """
         return _libBornAgainCore.RotationZ_getAngle(self)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(RotationZ self) -> Transform3D
-
         Transform3D RotationZ::getTransform3D() const
 
         Returns transformation. 
 
         """
         return _libBornAgainCore.RotationZ_getTransform3D(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RotationZ
-    __del__ = lambda self: None
-RotationZ_swigregister = _libBornAgainCore.RotationZ_swigregister
-RotationZ_swigregister(RotationZ)
+
+# Register RotationZ in _libBornAgainCore:
+_libBornAgainCore.RotationZ_swigregister(RotationZ)
 
 class RotationEuler(IRotation):
-    """Proxy of C++ RotationEuler class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IRotation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RotationEuler, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IRotation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RotationEuler, name)
+    r"""Proxy of C++ RotationEuler class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, alpha, beta, gamma):
-        """
+        r"""
         __init__(RotationEuler self, double alpha, double beta, double gamma) -> RotationEuler
-
         RotationEuler::RotationEuler(double alpha, double beta, double gamma)
 
         Constructor of Euler rotation (sequence of three rotations following Euler angles notation z-x'-z').
@@ -20879,16 +16634,11 @@ class RotationEuler(IRotation):
         third Euler angle in radians 
 
         """
-        this = _libBornAgainCore.new_RotationEuler(alpha, beta, gamma)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RotationEuler_swiginit(self, _libBornAgainCore.new_RotationEuler(alpha, beta, gamma))
 
     def clone(self):
-        """
+        r"""
         clone(RotationEuler self) -> RotationEuler
-
         RotationEuler* RotationEuler::clone() const
 
         Returns a clone of this  ISample object. 
@@ -20896,11 +16646,9 @@ class RotationEuler(IRotation):
         """
         return _libBornAgainCore.RotationEuler_clone(self)
 
-
     def createInverse(self):
-        """
+        r"""
         createInverse(RotationEuler self) -> IRotation
-
         IRotation * RotationEuler::createInverse() const
 
         Returns a new  IRotation object that is the current object's inverse. 
@@ -20908,11 +16656,9 @@ class RotationEuler(IRotation):
         """
         return _libBornAgainCore.RotationEuler_createInverse(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(RotationEuler self, INodeVisitor visitor)
-
         void RotationEuler::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -20920,55 +16666,46 @@ class RotationEuler(IRotation):
         """
         return _libBornAgainCore.RotationEuler_accept(self, visitor)
 
-
     def getAlpha(self):
-        """
+        r"""
         getAlpha(RotationEuler self) -> double
-
         double RotationEuler::getAlpha() const
 
         """
         return _libBornAgainCore.RotationEuler_getAlpha(self)
 
-
     def getBeta(self):
-        """
+        r"""
         getBeta(RotationEuler self) -> double
-
         double RotationEuler::getBeta() const
 
         """
         return _libBornAgainCore.RotationEuler_getBeta(self)
 
-
     def getGamma(self):
-        """
+        r"""
         getGamma(RotationEuler self) -> double
-
         double RotationEuler::getGamma() const
 
         """
         return _libBornAgainCore.RotationEuler_getGamma(self)
 
-
     def getTransform3D(self):
-        """
+        r"""
         getTransform3D(RotationEuler self) -> Transform3D
-
         Transform3D RotationEuler::getTransform3D() const
 
         Returns transformation. 
 
         """
         return _libBornAgainCore.RotationEuler_getTransform3D(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RotationEuler
-    __del__ = lambda self: None
-RotationEuler_swigregister = _libBornAgainCore.RotationEuler_swigregister
-RotationEuler_swigregister(RotationEuler)
 
-class ISelectionRule(_object):
-    """
+# Register RotationEuler in _libBornAgainCore:
+_libBornAgainCore.RotationEuler_swigregister(RotationEuler)
+
+class ISelectionRule(object):
+    r"""
 
 
     Pure virtual base class for selection rules.
@@ -20977,41 +16714,34 @@ class ISelectionRule(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ISelectionRule, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ISelectionRule, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_ISelectionRule
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ISelectionRule self) -> ISelectionRule
-
         virtual ISelectionRule* ISelectionRule::clone() const =0
 
         """
         return _libBornAgainCore.ISelectionRule_clone(self)
 
-
     def coordinateSelected(self, coordinate):
-        """
+        r"""
         coordinateSelected(ISelectionRule self, ivector_t const & coordinate) -> bool
-
         virtual bool ISelectionRule::coordinateSelected(const ivector_t &coordinate) const =0
 
         """
         return _libBornAgainCore.ISelectionRule_coordinateSelected(self, coordinate)
 
-ISelectionRule_swigregister = _libBornAgainCore.ISelectionRule_swigregister
-ISelectionRule_swigregister(ISelectionRule)
+# Register ISelectionRule in _libBornAgainCore:
+_libBornAgainCore.ISelectionRule_swigregister(ISelectionRule)
 
 class SimpleSelectionRule(ISelectionRule):
-    """
+    r"""
 
 
     Selection rule (v*q)modulus!=0, defined by vector v(a,b,c) and modulus.
@@ -21020,55 +16750,39 @@ class SimpleSelectionRule(ISelectionRule):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISelectionRule]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SimpleSelectionRule, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISelectionRule]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SimpleSelectionRule, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, a, b, c, modulus):
-        """
+        r"""
         __init__(SimpleSelectionRule self, int a, int b, int c, int modulus) -> SimpleSelectionRule
-
         SimpleSelectionRule::SimpleSelectionRule(int a, int b, int c, int modulus)
 
         """
-        this = _libBornAgainCore.new_SimpleSelectionRule(a, b, c, modulus)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SimpleSelectionRule_swiginit(self, _libBornAgainCore.new_SimpleSelectionRule(a, b, c, modulus))
     __swig_destroy__ = _libBornAgainCore.delete_SimpleSelectionRule
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(SimpleSelectionRule self) -> SimpleSelectionRule
-
         SimpleSelectionRule * SimpleSelectionRule::clone() const
 
         """
         return _libBornAgainCore.SimpleSelectionRule_clone(self)
 
-
     def coordinateSelected(self, coordinate):
-        """
+        r"""
         coordinateSelected(SimpleSelectionRule self, ivector_t const & coordinate) -> bool
-
         bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const
 
         """
         return _libBornAgainCore.SimpleSelectionRule_coordinateSelected(self, coordinate)
 
-SimpleSelectionRule_swigregister = _libBornAgainCore.SimpleSelectionRule_swigregister
-SimpleSelectionRule_swigregister(SimpleSelectionRule)
+# Register SimpleSelectionRule in _libBornAgainCore:
+_libBornAgainCore.SimpleSelectionRule_swigregister(SimpleSelectionRule)
 
 class Instrument(INode):
-    """
+    r"""
 
 
     Assembles beam, detector and their relative positions wrt the sample.
@@ -21077,36 +16791,22 @@ class Instrument(INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Instrument, name, value)
-    __swig_getmethods__ = {}
-    for _s in [INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Instrument, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Instrument self) -> Instrument
         __init__(Instrument self, Instrument other) -> Instrument
-
         Instrument::Instrument(const Instrument &other)
 
         """
-        this = _libBornAgainCore.new_Instrument(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Instrument_swiginit(self, _libBornAgainCore.new_Instrument(*args))
     __swig_destroy__ = _libBornAgainCore.delete_Instrument
-    __del__ = lambda self: None
 
     def accept(self, visitor):
-        """
+        r"""
         accept(Instrument self, INodeVisitor visitor)
-
         void Instrument::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -21114,32 +16814,26 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_accept(self, visitor)
 
-
     def getBeam(self, *args):
-        """
+        r"""
         getBeam(Instrument self) -> Beam
         getBeam(Instrument self) -> Beam
-
         const Beam& Instrument::getBeam() const
 
         """
         return _libBornAgainCore.Instrument_getBeam(self, *args)
 
-
     def setBeam(self, beam):
-        """
+        r"""
         setBeam(Instrument self, Beam beam)
-
         void Instrument::setBeam(const Beam &beam)
 
         """
         return _libBornAgainCore.Instrument_setBeam(self, beam)
 
-
     def setBeamParameters(self, wavelength, alpha_i, phi_i):
-        """
+        r"""
         setBeamParameters(Instrument self, double wavelength, double alpha_i, double phi_i)
-
         void Instrument::setBeamParameters(double wavelength, double alpha_i, double phi_i)
 
         Sets the beam wavelength and incoming angles. 
@@ -21147,11 +16841,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setBeamParameters(self, wavelength, alpha_i, phi_i)
 
-
     def setBeamIntensity(self, intensity):
-        """
+        r"""
         setBeamIntensity(Instrument self, double intensity)
-
         void Instrument::setBeamIntensity(double intensity)
 
         Sets the beam's intensity. 
@@ -21159,11 +16851,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setBeamIntensity(self, intensity)
 
-
     def setBeamPolarization(self, bloch_vector):
-        """
+        r"""
         setBeamPolarization(Instrument self, kvector_t bloch_vector)
-
         void Instrument::setBeamPolarization(const kvector_t bloch_vector)
 
         Sets the beam's polarization according to the given Bloch vector. 
@@ -21171,11 +16861,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setBeamPolarization(self, bloch_vector)
 
-
     def getBeamIntensity(self):
-        """
+        r"""
         getBeamIntensity(Instrument self) -> double
-
         double Instrument::getBeamIntensity() const
 
         Returns the beam's intensity. 
@@ -21183,32 +16871,26 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_getBeamIntensity(self)
 
-
     def getDetector(self, *args):
-        """
+        r"""
         getDetector(Instrument self) -> IDetector
         getDetector(Instrument self) -> IDetector
-
         IDetector* Instrument::getDetector()
 
         """
         return _libBornAgainCore.Instrument_getDetector(self, *args)
 
-
     def getDetectorMask(self):
-        """
+        r"""
         getDetectorMask(Instrument self) -> DetectorMask
-
         const DetectorMask * Instrument::getDetectorMask() const
 
         """
         return _libBornAgainCore.Instrument_getDetectorMask(self)
 
-
     def getDetectorAxis(self, index):
-        """
+        r"""
         getDetectorAxis(Instrument self, size_t index) -> IAxis
-
         const IAxis & Instrument::getDetectorAxis(size_t index) const
 
         Returns a detector axis. 
@@ -21216,11 +16898,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_getDetectorAxis(self, index)
 
-
     def getDetectorDimension(self):
-        """
+        r"""
         getDetectorDimension(Instrument self) -> size_t
-
         size_t Instrument::getDetectorDimension() const
 
         Returns the detector's dimension. 
@@ -21228,11 +16908,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_getDetectorDimension(self)
 
-
     def setDetector(self, detector):
-        """
+        r"""
         setDetector(Instrument self, IDetector detector)
-
         void Instrument::setDetector(const IDetector &detector)
 
         Sets the detector (axes can be overwritten later) 
@@ -21240,11 +16918,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setDetector(self, detector)
 
-
     def setDetectorResolutionFunction(self, p_resolution_function):
-        """
+        r"""
         setDetectorResolutionFunction(Instrument self, IResolutionFunction2D p_resolution_function)
-
         void Instrument::setDetectorResolutionFunction(const IResolutionFunction2D &p_resolution_function)
 
         Sets detector resolution function. 
@@ -21252,11 +16928,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setDetectorResolutionFunction(self, p_resolution_function)
 
-
     def removeDetectorResolution(self):
-        """
+        r"""
         removeDetectorResolution(Instrument self)
-
         void Instrument::removeDetectorResolution()
 
         Removes detector resolution function. 
@@ -21264,11 +16938,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_removeDetectorResolution(self)
 
-
     def setAnalyzerProperties(self, direction, efficiency, total_transmission):
-        """
+        r"""
         setAnalyzerProperties(Instrument self, kvector_t direction, double efficiency, double total_transmission)
-
         void Instrument::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)
 
         Sets the polarization analyzer characteristics of the detector. 
@@ -21276,11 +16948,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_setAnalyzerProperties(self, direction, efficiency, total_transmission)
 
-
     def applyDetectorResolution(self, p_intensity_map):
-        """
+        r"""
         applyDetectorResolution(Instrument self, IntensityData p_intensity_map)
-
         void Instrument::applyDetectorResolution(OutputData< double > *p_intensity_map) const
 
         apply the detector resolution to the given intensity map 
@@ -21288,11 +16958,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_applyDetectorResolution(self, p_intensity_map)
 
-
     def createDetectorIntensity(self, elements):
-        """
+        r"""
         createDetectorIntensity(Instrument self, std::vector< SimulationElement,std::allocator< SimulationElement > > const & elements) -> IntensityData
-
         OutputData< double > * Instrument::createDetectorIntensity(const std::vector< SimulationElement > &elements) const
 
         Returns new intensity map with detector resolution applied and axes in requested units. 
@@ -21300,11 +16968,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_createDetectorIntensity(self, elements)
 
-
     def initDetector(self):
-        """
+        r"""
         initDetector(Instrument self)
-
         void Instrument::initDetector()
 
         init detector with beam settings 
@@ -21312,11 +16978,9 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_initDetector(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Instrument self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Instrument::getChildren() const
 
         Returns a vector of children (const). 
@@ -21324,14 +16988,13 @@ class Instrument(INode):
         """
         return _libBornAgainCore.Instrument_getChildren(self)
 
-Instrument_swigregister = _libBornAgainCore.Instrument_swigregister
-Instrument_swigregister(Instrument)
+# Register Instrument in _libBornAgainCore:
+_libBornAgainCore.Instrument_swigregister(Instrument)
 
 
 def RelativeDifference(dat, ref):
-    """
+    r"""
     RelativeDifference(SimulationResult dat, SimulationResult ref) -> double
-
     double IntensityDataFunctions::RelativeDifference(const SimulationResult &dat, const SimulationResult &ref)
 
     Returns sum of relative differences between each pair of elements: (a, b) -> 2*abs(a - b)/(a + b) ( and zero if a-b=0 )
@@ -21342,20 +17005,18 @@ def RelativeDifference(dat, ref):
     return _libBornAgainCore.RelativeDifference(dat, ref)
 
 def getRelativeDifference(*args):
-    """
+    r"""
     getRelativeDifference(IntensityData dat, IntensityData ref) -> double
     getRelativeDifference(IHistogram dat, IHistogram ref) -> double
-
     double IntensityDataFunctions::getRelativeDifference(const IHistogram &dat, const IHistogram &ref)
 
     """
     return _libBornAgainCore.getRelativeDifference(*args)
 
 def coordinateToBinf(*args):
-    """
+    r"""
     coordinateToBinf(double coordinate, IAxis axis) -> double
     coordinateToBinf(double & x, double & y, IntensityData data)
-
     void IntensityDataFunctions::coordinateToBinf(double &x, double &y, const OutputData< double > &data)
 
     Transforms x,y coordinate from  OutputData axes coordinates to bin-fraction-coordinates. 
@@ -21364,10 +17025,9 @@ def coordinateToBinf(*args):
     return _libBornAgainCore.coordinateToBinf(*args)
 
 def coordinateFromBinf(*args):
-    """
+    r"""
     coordinateFromBinf(double value, IAxis axis) -> double
     coordinateFromBinf(double & x, double & y, IntensityData data)
-
     void IntensityDataFunctions::coordinateFromBinf(double &x, double &y, const OutputData< double > &data)
 
     Transforms x,y coordinate from bin-fraction-coordinates to  OutputData's axes coordinates. 
@@ -21376,9 +17036,8 @@ def coordinateFromBinf(*args):
     return _libBornAgainCore.coordinateFromBinf(*args)
 
 def create2DArrayfromOutputData(data):
-    """
+    r"""
     create2DArrayfromOutputData(IntensityData data) -> vdouble2d_t
-
     std::vector< std::vector< double > > IntensityDataFunctions::create2DArrayfromOutputData(const OutputData< double > &data)
 
     Creates a vector of vectors of double (2D Array) from  OutputData. 
@@ -21387,9 +17046,8 @@ def create2DArrayfromOutputData(data):
     return _libBornAgainCore.create2DArrayfromOutputData(data)
 
 def FT2DArray(signal):
-    """
+    r"""
     FT2DArray(vdouble2d_t signal) -> vdouble2d_t
-
     std::vector< std::vector< double > > IntensityDataFunctions::FT2DArray(const std::vector< std::vector< double >> &signal)
 
     Creates a Fourier Transform of a 2D Array (vector of vectors). 
@@ -21398,18 +17056,15 @@ def FT2DArray(signal):
     return _libBornAgainCore.FT2DArray(signal)
 
 def ConvertData(*args):
-    """
+    r"""
     ConvertData(Simulation simulation, IntensityData data, bool put_masked_areas_to_zero=True) -> SimulationResult
-    ConvertData(Simulation simulation, IntensityData data) -> SimulationResult
     ConvertData(Simulation simulation, vdouble2d_t data, bool put_masked_areas_to_zero=True) -> SimulationResult
-    ConvertData(Simulation simulation, vdouble2d_t data) -> SimulationResult
-
     SimulationResult IntensityDataFunctions::ConvertData(const Simulation &simulation, const std::vector< std::vector< double >> &data, bool put_masked_areas_to_zero=true)
 
     """
     return _libBornAgainCore.ConvertData(*args)
-class IntensityDataIOFactory(_object):
-    """
+class IntensityDataIOFactory(object):
+    r"""
 
 
     Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int -  BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm.
@@ -21420,54 +17075,44 @@ class IntensityDataIOFactory(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityDataIOFactory, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityDataIOFactory, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
+    @staticmethod
     def readOutputData(file_name):
-        """readOutputData(std::string const & file_name) -> IntensityData"""
+        r"""readOutputData(std::string const & file_name) -> IntensityData"""
         return _libBornAgainCore.IntensityDataIOFactory_readOutputData(file_name)
 
-    readOutputData = staticmethod(readOutputData)
-
+    @staticmethod
     def readReflectometryData(file_name):
-        """readReflectometryData(std::string const & file_name) -> IntensityData"""
+        r"""readReflectometryData(std::string const & file_name) -> IntensityData"""
         return _libBornAgainCore.IntensityDataIOFactory_readReflectometryData(file_name)
 
-    readReflectometryData = staticmethod(readReflectometryData)
-
+    @staticmethod
     def readIntensityData(file_name):
-        """readIntensityData(std::string const & file_name) -> IHistogram"""
+        r"""readIntensityData(std::string const & file_name) -> IHistogram"""
         return _libBornAgainCore.IntensityDataIOFactory_readIntensityData(file_name)
 
-    readIntensityData = staticmethod(readIntensityData)
-
+    @staticmethod
     def writeOutputData(data, file_name):
-        """writeOutputData(IntensityData data, std::string const & file_name)"""
+        r"""writeOutputData(IntensityData data, std::string const & file_name)"""
         return _libBornAgainCore.IntensityDataIOFactory_writeOutputData(data, file_name)
 
-    writeOutputData = staticmethod(writeOutputData)
-
+    @staticmethod
     def writeIntensityData(histogram, file_name):
-        """writeIntensityData(IHistogram histogram, std::string const & file_name)"""
+        r"""writeIntensityData(IHistogram histogram, std::string const & file_name)"""
         return _libBornAgainCore.IntensityDataIOFactory_writeIntensityData(histogram, file_name)
 
-    writeIntensityData = staticmethod(writeIntensityData)
-
+    @staticmethod
     def writeSimulationResult(result, file_name):
-        """writeSimulationResult(SimulationResult result, std::string const & file_name)"""
+        r"""writeSimulationResult(SimulationResult result, std::string const & file_name)"""
         return _libBornAgainCore.IntensityDataIOFactory_writeSimulationResult(result, file_name)
 
-    writeSimulationResult = staticmethod(writeSimulationResult)
-
     def __init__(self):
-        """
+        r"""
         __init__(IntensityDataIOFactory self) -> IntensityDataIOFactory
 
 
-
         Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int -  BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth "*.gz" or "*.bz2" the file will be zipped on the fly using appropriate algorithm.
 
         Usage:
@@ -21475,42 +17120,38 @@ class IntensityDataIOFactory(_object):
         C++ includes: IntensityDataIOFactory.h
 
         """
-        this = _libBornAgainCore.new_IntensityDataIOFactory()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityDataIOFactory_swiginit(self, _libBornAgainCore.new_IntensityDataIOFactory())
     __swig_destroy__ = _libBornAgainCore.delete_IntensityDataIOFactory
-    __del__ = lambda self: None
-IntensityDataIOFactory_swigregister = _libBornAgainCore.IntensityDataIOFactory_swigregister
-IntensityDataIOFactory_swigregister(IntensityDataIOFactory)
+
+# Register IntensityDataIOFactory in _libBornAgainCore:
+_libBornAgainCore.IntensityDataIOFactory_swigregister(IntensityDataIOFactory)
 
 def IntensityDataIOFactory_readOutputData(file_name):
-    """IntensityDataIOFactory_readOutputData(std::string const & file_name) -> IntensityData"""
+    r"""IntensityDataIOFactory_readOutputData(std::string const & file_name) -> IntensityData"""
     return _libBornAgainCore.IntensityDataIOFactory_readOutputData(file_name)
 
 def IntensityDataIOFactory_readReflectometryData(file_name):
-    """IntensityDataIOFactory_readReflectometryData(std::string const & file_name) -> IntensityData"""
+    r"""IntensityDataIOFactory_readReflectometryData(std::string const & file_name) -> IntensityData"""
     return _libBornAgainCore.IntensityDataIOFactory_readReflectometryData(file_name)
 
 def IntensityDataIOFactory_readIntensityData(file_name):
-    """IntensityDataIOFactory_readIntensityData(std::string const & file_name) -> IHistogram"""
+    r"""IntensityDataIOFactory_readIntensityData(std::string const & file_name) -> IHistogram"""
     return _libBornAgainCore.IntensityDataIOFactory_readIntensityData(file_name)
 
 def IntensityDataIOFactory_writeOutputData(data, file_name):
-    """IntensityDataIOFactory_writeOutputData(IntensityData data, std::string const & file_name)"""
+    r"""IntensityDataIOFactory_writeOutputData(IntensityData data, std::string const & file_name)"""
     return _libBornAgainCore.IntensityDataIOFactory_writeOutputData(data, file_name)
 
 def IntensityDataIOFactory_writeIntensityData(histogram, file_name):
-    """IntensityDataIOFactory_writeIntensityData(IHistogram histogram, std::string const & file_name)"""
+    r"""IntensityDataIOFactory_writeIntensityData(IHistogram histogram, std::string const & file_name)"""
     return _libBornAgainCore.IntensityDataIOFactory_writeIntensityData(histogram, file_name)
 
 def IntensityDataIOFactory_writeSimulationResult(result, file_name):
-    """IntensityDataIOFactory_writeSimulationResult(SimulationResult result, std::string const & file_name)"""
+    r"""IntensityDataIOFactory_writeSimulationResult(SimulationResult result, std::string const & file_name)"""
     return _libBornAgainCore.IntensityDataIOFactory_writeSimulationResult(result, file_name)
 
 class InterferenceFunction1DLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a 1D lattice.
@@ -21519,20 +17160,12 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunction1DLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunction1DLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, xi):
-        """
+        r"""
         __init__(InterferenceFunction1DLattice self, double length, double xi) -> InterferenceFunction1DLattice
-
         InterferenceFunction1DLattice::InterferenceFunction1DLattice(double length, double xi)
 
         Constructor of interference function of one-dimensional lattice.
@@ -21547,18 +17180,12 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
         rotation of lattice with respect to x-axis in radians 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunction1DLattice(length, xi)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunction1DLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunction1DLattice(length, xi))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction1DLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunction1DLattice self) -> InterferenceFunction1DLattice
-
         InterferenceFunction1DLattice * InterferenceFunction1DLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -21566,11 +17193,9 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction1DLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunction1DLattice self, INodeVisitor visitor)
-
         void InterferenceFunction1DLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -21578,11 +17203,9 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction1DLattice_accept(self, visitor)
 
-
     def setDecayFunction(self, decay):
-        """
+        r"""
         setDecayFunction(InterferenceFunction1DLattice self, IFTDecayFunction1D decay)
-
         void InterferenceFunction1DLattice::setDecayFunction(const IFTDecayFunction1D &decay)
 
         Sets one-dimensional decay function.
@@ -21596,21 +17219,17 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction1DLattice_setDecayFunction(self, decay)
 
-
     def getLatticeParameters(self):
-        """
+        r"""
         getLatticeParameters(InterferenceFunction1DLattice self) -> Lattice1DParameters
-
         Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const
 
         """
         return _libBornAgainCore.InterferenceFunction1DLattice_getLatticeParameters(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunction1DLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunction1DLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -21618,11 +17237,11 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction1DLattice_getChildren(self)
 
-InterferenceFunction1DLattice_swigregister = _libBornAgainCore.InterferenceFunction1DLattice_swigregister
-InterferenceFunction1DLattice_swigregister(InterferenceFunction1DLattice)
+# Register InterferenceFunction1DLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunction1DLattice_swigregister(InterferenceFunction1DLattice)
 
 class InterferenceFunction2DLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a 2D lattice.
@@ -21631,22 +17250,13 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunction2DLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunction2DLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(InterferenceFunction2DLattice self, Lattice2D lattice) -> InterferenceFunction2DLattice
         __init__(InterferenceFunction2DLattice self, double length_1, double length_2, double alpha, double xi=0.0) -> InterferenceFunction2DLattice
-        __init__(InterferenceFunction2DLattice self, double length_1, double length_2, double alpha) -> InterferenceFunction2DLattice
-
         InterferenceFunction2DLattice::InterferenceFunction2DLattice(double length_1, double length_2, double alpha, double xi=0.0)
 
         Constructor of two-dimensional interference function.
@@ -21667,18 +17277,12 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         rotation of the lattice with respect to the x-axis (beam direction) in radians 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunction2DLattice(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunction2DLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunction2DLattice(*args))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunction2DLattice self) -> InterferenceFunction2DLattice
-
         InterferenceFunction2DLattice * InterferenceFunction2DLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -21686,11 +17290,9 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunction2DLattice self, INodeVisitor visitor)
-
         void InterferenceFunction2DLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -21698,29 +17300,19 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_accept(self, visitor)
 
-
+    @staticmethod
     def createSquare(lattice_length, xi=0.0):
-        """
-        createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice
-        createSquare(double lattice_length) -> InterferenceFunction2DLattice
-        """
+        r"""createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"""
         return _libBornAgainCore.InterferenceFunction2DLattice_createSquare(lattice_length, xi)
 
-    createSquare = staticmethod(createSquare)
-
+    @staticmethod
     def createHexagonal(lattice_length, xi=0.0):
-        """
-        createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice
-        createHexagonal(double lattice_length) -> InterferenceFunction2DLattice
-        """
+        r"""createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"""
         return _libBornAgainCore.InterferenceFunction2DLattice_createHexagonal(lattice_length, xi)
 
-    createHexagonal = staticmethod(createHexagonal)
-
     def setDecayFunction(self, decay):
-        """
+        r"""
         setDecayFunction(InterferenceFunction2DLattice self, IFTDecayFunction2D decay)
-
         void InterferenceFunction2DLattice::setDecayFunction(const IFTDecayFunction2D &decay)
 
         Sets two-dimensional decay function.
@@ -21734,41 +17326,33 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_setDecayFunction(self, decay)
 
-
     def setIntegrationOverXi(self, integrate_xi):
-        """
+        r"""
         setIntegrationOverXi(InterferenceFunction2DLattice self, bool integrate_xi)
-
         void InterferenceFunction2DLattice::setIntegrationOverXi(bool integrate_xi)
 
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_setIntegrationOverXi(self, integrate_xi)
 
-
     def integrationOverXi(self):
-        """
+        r"""
         integrationOverXi(InterferenceFunction2DLattice self) -> bool
-
         bool InterferenceFunction2DLattice::integrationOverXi() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_integrationOverXi(self)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunction2DLattice self) -> Lattice2D
-
         const Lattice2D & InterferenceFunction2DLattice::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_lattice(self)
 
-
     def getParticleDensity(self):
-        """
+        r"""
         getParticleDensity(InterferenceFunction2DLattice self) -> double
-
         double InterferenceFunction2DLattice::getParticleDensity() const override final
 
         Returns the particle density associated with this 2d lattice. 
@@ -21776,11 +17360,9 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_getParticleDensity(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunction2DLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunction2DLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -21788,11 +17370,9 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_getChildren(self)
 
-
     def onChange(self):
-        """
+        r"""
         onChange(InterferenceFunction2DLattice self)
-
         void InterferenceFunction2DLattice::onChange() override final
 
         Action to be taken in inherited class when a parameter has changed. 
@@ -21800,25 +17380,19 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DLattice_onChange(self)
 
-InterferenceFunction2DLattice_swigregister = _libBornAgainCore.InterferenceFunction2DLattice_swigregister
-InterferenceFunction2DLattice_swigregister(InterferenceFunction2DLattice)
+# Register InterferenceFunction2DLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunction2DLattice_swigregister(InterferenceFunction2DLattice)
 
 def InterferenceFunction2DLattice_createSquare(lattice_length, xi=0.0):
-    """
-    createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice
-    InterferenceFunction2DLattice_createSquare(double lattice_length) -> InterferenceFunction2DLattice
-    """
+    r"""InterferenceFunction2DLattice_createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"""
     return _libBornAgainCore.InterferenceFunction2DLattice_createSquare(lattice_length, xi)
 
 def InterferenceFunction2DLattice_createHexagonal(lattice_length, xi=0.0):
-    """
-    createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice
-    InterferenceFunction2DLattice_createHexagonal(double lattice_length) -> InterferenceFunction2DLattice
-    """
+    r"""InterferenceFunction2DLattice_createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"""
     return _libBornAgainCore.InterferenceFunction2DLattice_createHexagonal(lattice_length, xi)
 
 class InterferenceFunction2DParaCrystal(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a 2D paracrystal.
@@ -21827,26 +17401,13 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunction2DParaCrystal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunction2DParaCrystal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(InterferenceFunction2DParaCrystal self, Lattice2D lattice, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal
-        __init__(InterferenceFunction2DParaCrystal self, Lattice2D lattice, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal
-        __init__(InterferenceFunction2DParaCrystal self, Lattice2D lattice, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-        __init__(InterferenceFunction2DParaCrystal self, Lattice2D lattice) -> InterferenceFunction2DParaCrystal
         __init__(InterferenceFunction2DParaCrystal self, double length_1, double length_2, double alpha, double xi=0.0, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-        __init__(InterferenceFunction2DParaCrystal self, double length_1, double length_2, double alpha, double xi=0.0) -> InterferenceFunction2DParaCrystal
-        __init__(InterferenceFunction2DParaCrystal self, double length_1, double length_2, double alpha) -> InterferenceFunction2DParaCrystal
-
         InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(double length_1, double length_2, double alpha, double xi=0.0, double damping_length=0.0)
 
         Constructor of interference function of two-dimensional paracrystal.
@@ -21870,18 +17431,12 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         the damping (coherence) length of the paracrystal in nanometers 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunction2DParaCrystal(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunction2DParaCrystal_swiginit(self, _libBornAgainCore.new_InterferenceFunction2DParaCrystal(*args))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DParaCrystal
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunction2DParaCrystal self) -> InterferenceFunction2DParaCrystal
-
         InterferenceFunction2DParaCrystal * InterferenceFunction2DParaCrystal::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -21889,11 +17444,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunction2DParaCrystal self, INodeVisitor visitor)
-
         void InterferenceFunction2DParaCrystal::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -21901,33 +17454,19 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_accept(self, visitor)
 
-
+    @staticmethod
     def createSquare(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
-        """
-        createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal
-        createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal
-        createSquare(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-        createSquare(double lattice_length) -> InterferenceFunction2DParaCrystal
-        """
+        r"""createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"""
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_createSquare(lattice_length, damping_length, domain_size_1, domain_size_2)
 
-    createSquare = staticmethod(createSquare)
-
+    @staticmethod
     def createHexagonal(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
-        """
-        createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal
-        createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal
-        createHexagonal(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-        createHexagonal(double lattice_length) -> InterferenceFunction2DParaCrystal
-        """
+        r"""createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"""
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_createHexagonal(lattice_length, damping_length, domain_size_1, domain_size_2)
 
-    createHexagonal = staticmethod(createHexagonal)
-
     def setDomainSizes(self, size_1, size_2):
-        """
+        r"""
         setDomainSizes(InterferenceFunction2DParaCrystal self, double size_1, double size_2)
-
         void InterferenceFunction2DParaCrystal::setDomainSizes(double size_1, double size_2)
 
         Sets the sizes of coherence domains.
@@ -21944,11 +17483,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_setDomainSizes(self, size_1, size_2)
 
-
     def setProbabilityDistributions(self, pdf_1, pdf_2):
-        """
+        r"""
         setProbabilityDistributions(InterferenceFunction2DParaCrystal self, IFTDistribution2D pdf_1, IFTDistribution2D pdf_2)
-
         void InterferenceFunction2DParaCrystal::setProbabilityDistributions(const IFTDistribution2D &pdf_1, const IFTDistribution2D &pdf_2)
 
         Sets the probability distributions (Fourier transformed) for the two lattice directions.
@@ -21965,11 +17502,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_setProbabilityDistributions(self, pdf_1, pdf_2)
 
-
     def setDampingLength(self, damping_length):
-        """
+        r"""
         setDampingLength(InterferenceFunction2DParaCrystal self, double damping_length)
-
         void InterferenceFunction2DParaCrystal::setDampingLength(double damping_length)
 
         Sets the damping length.
@@ -21983,21 +17518,17 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_setDampingLength(self, damping_length)
 
-
     def domainSizes(self):
-        """
+        r"""
         domainSizes(InterferenceFunction2DParaCrystal self) -> vdouble1d_t
-
         std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_domainSizes(self)
 
-
     def setIntegrationOverXi(self, integrate_xi):
-        """
+        r"""
         setIntegrationOverXi(InterferenceFunction2DParaCrystal self, bool integrate_xi)
-
         void InterferenceFunction2DParaCrystal::setIntegrationOverXi(bool integrate_xi)
 
         Enables/disables averaging over the lattice rotation angle.
@@ -22011,41 +17542,33 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_setIntegrationOverXi(self, integrate_xi)
 
-
     def integrationOverXi(self):
-        """
+        r"""
         integrationOverXi(InterferenceFunction2DParaCrystal self) -> bool
-
         bool InterferenceFunction2DParaCrystal::integrationOverXi() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_integrationOverXi(self)
 
-
     def dampingLength(self):
-        """
+        r"""
         dampingLength(InterferenceFunction2DParaCrystal self) -> double
-
         double InterferenceFunction2DParaCrystal::dampingLength() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_dampingLength(self)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunction2DParaCrystal self) -> Lattice2D
-
         const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_lattice(self)
 
-
     def getParticleDensity(self):
-        """
+        r"""
         getParticleDensity(InterferenceFunction2DParaCrystal self) -> double
-
         double InterferenceFunction2DParaCrystal::getParticleDensity() const override final
 
         If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value 
@@ -22053,11 +17576,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_getParticleDensity(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunction2DParaCrystal self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunction2DParaCrystal::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -22065,49 +17586,35 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_getChildren(self)
 
-
     def pdf1(self):
-        """
+        r"""
         pdf1(InterferenceFunction2DParaCrystal self) -> IFTDistribution2D
-
         const IFTDistribution2D* InterferenceFunction2DParaCrystal::pdf1() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_pdf1(self)
 
-
     def pdf2(self):
-        """
+        r"""
         pdf2(InterferenceFunction2DParaCrystal self) -> IFTDistribution2D
-
         const IFTDistribution2D* InterferenceFunction2DParaCrystal::pdf2() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DParaCrystal_pdf2(self)
 
-InterferenceFunction2DParaCrystal_swigregister = _libBornAgainCore.InterferenceFunction2DParaCrystal_swigregister
-InterferenceFunction2DParaCrystal_swigregister(InterferenceFunction2DParaCrystal)
+# Register InterferenceFunction2DParaCrystal in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunction2DParaCrystal_swigregister(InterferenceFunction2DParaCrystal)
 
 def InterferenceFunction2DParaCrystal_createSquare(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
-    """
-    createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal
-    createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal
-    createSquare(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-    InterferenceFunction2DParaCrystal_createSquare(double lattice_length) -> InterferenceFunction2DParaCrystal
-    """
+    r"""InterferenceFunction2DParaCrystal_createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"""
     return _libBornAgainCore.InterferenceFunction2DParaCrystal_createSquare(lattice_length, damping_length, domain_size_1, domain_size_2)
 
 def InterferenceFunction2DParaCrystal_createHexagonal(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
-    """
-    createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal
-    createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal
-    createHexagonal(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal
-    InterferenceFunction2DParaCrystal_createHexagonal(double lattice_length) -> InterferenceFunction2DParaCrystal
-    """
+    r"""InterferenceFunction2DParaCrystal_createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"""
     return _libBornAgainCore.InterferenceFunction2DParaCrystal_createHexagonal(lattice_length, damping_length, domain_size_1, domain_size_2)
 
 class InterferenceFunction2DSuperLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a 2D superlattice with a configurable interference function for each lattice site.
@@ -22116,21 +17623,13 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunction2DSuperLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunction2DSuperLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(InterferenceFunction2DSuperLattice self, Lattice2D lattice, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice
         __init__(InterferenceFunction2DSuperLattice self, double length_1, double length_2, double alpha, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice
-
         InterferenceFunction2DSuperLattice::InterferenceFunction2DSuperLattice(double length_1, double length_2, double alpha, double xi, unsigned size_1, unsigned size_2)
 
         Constructor of two-dimensional interference function.
@@ -22151,18 +17650,12 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
         rotation of lattice with respect to x-axis (beam direction) in radians 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunction2DSuperLattice(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunction2DSuperLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunction2DSuperLattice(*args))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DSuperLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunction2DSuperLattice self) -> InterferenceFunction2DSuperLattice
-
         InterferenceFunction2DSuperLattice * InterferenceFunction2DSuperLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22170,11 +17663,9 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunction2DSuperLattice self, INodeVisitor visitor)
-
         void InterferenceFunction2DSuperLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22182,44 +17673,35 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_accept(self, visitor)
 
-
     def setSubstructureIFF(self, sub_iff):
-        """
+        r"""
         setSubstructureIFF(InterferenceFunction2DSuperLattice self, IInterferenceFunction sub_iff)
-
         void InterferenceFunction2DSuperLattice::setSubstructureIFF(const IInterferenceFunction &sub_iff)
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_setSubstructureIFF(self, sub_iff)
 
-
     def substructureIFF(self):
-        """
+        r"""
         substructureIFF(InterferenceFunction2DSuperLattice self) -> IInterferenceFunction
-
         const IInterferenceFunction & InterferenceFunction2DSuperLattice::substructureIFF() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_substructureIFF(self)
 
-
+    @staticmethod
     def createSquare(lattice_length, xi, size_1, size_2):
-        """createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
+        r"""createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2)
 
-    createSquare = staticmethod(createSquare)
-
+    @staticmethod
     def createHexagonal(lattice_length, xi, size_1, size_2):
-        """createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
+        r"""createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2)
 
-    createHexagonal = staticmethod(createHexagonal)
-
     def evaluate(self, q, outer_iff=1.0):
-        """
+        r"""
         evaluate(InterferenceFunction2DSuperLattice self, kvector_t q, double outer_iff=1.0) -> double
-        evaluate(InterferenceFunction2DSuperLattice self, kvector_t q) -> double
-
         double InterferenceFunction2DSuperLattice::evaluate(const kvector_t q, double outer_iff=1.0) const override final
 
         Evaluates the interference function for a given wavevector transfer. 
@@ -22227,61 +17709,49 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_evaluate(self, q, outer_iff)
 
-
     def domainSize1(self):
-        """
+        r"""
         domainSize1(InterferenceFunction2DSuperLattice self) -> unsigned int
-
         unsigned InterferenceFunction2DSuperLattice::domainSize1() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_domainSize1(self)
 
-
     def domainSize2(self):
-        """
+        r"""
         domainSize2(InterferenceFunction2DSuperLattice self) -> unsigned int
-
         unsigned InterferenceFunction2DSuperLattice::domainSize2() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_domainSize2(self)
 
-
     def setIntegrationOverXi(self, integrate_xi):
-        """
+        r"""
         setIntegrationOverXi(InterferenceFunction2DSuperLattice self, bool integrate_xi)
-
         void InterferenceFunction2DSuperLattice::setIntegrationOverXi(bool integrate_xi)
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_setIntegrationOverXi(self, integrate_xi)
 
-
     def integrationOverXi(self):
-        """
+        r"""
         integrationOverXi(InterferenceFunction2DSuperLattice self) -> bool
-
         bool InterferenceFunction2DSuperLattice::integrationOverXi() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_integrationOverXi(self)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunction2DSuperLattice self) -> Lattice2D
-
         const Lattice2D & InterferenceFunction2DSuperLattice::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_lattice(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunction2DSuperLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunction2DSuperLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -22289,19 +17759,19 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction2DSuperLattice_getChildren(self)
 
-InterferenceFunction2DSuperLattice_swigregister = _libBornAgainCore.InterferenceFunction2DSuperLattice_swigregister
-InterferenceFunction2DSuperLattice_swigregister(InterferenceFunction2DSuperLattice)
+# Register InterferenceFunction2DSuperLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunction2DSuperLattice_swigregister(InterferenceFunction2DSuperLattice)
 
 def InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2):
-    """InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
+    r"""InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
     return _libBornAgainCore.InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2)
 
 def InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2):
-    """InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
+    r"""InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
     return _libBornAgainCore.InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2)
 
 class InterferenceFunction3DLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a 3D lattice.
@@ -22310,35 +17780,21 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunction3DLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunction3DLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, lattice):
-        """
+        r"""
         __init__(InterferenceFunction3DLattice self, Lattice lattice) -> InterferenceFunction3DLattice
-
         InterferenceFunction3DLattice::InterferenceFunction3DLattice(const Lattice &lattice)
 
         """
-        this = _libBornAgainCore.new_InterferenceFunction3DLattice(lattice)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunction3DLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunction3DLattice(lattice))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction3DLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunction3DLattice self) -> InterferenceFunction3DLattice
-
         InterferenceFunction3DLattice * InterferenceFunction3DLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22346,11 +17802,9 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunction3DLattice self, INodeVisitor visitor)
-
         void InterferenceFunction3DLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22358,31 +17812,25 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_accept(self, visitor)
 
-
     def setPeakShape(self, peak_shape):
-        """
+        r"""
         setPeakShape(InterferenceFunction3DLattice self, IPeakShape peak_shape)
-
         void InterferenceFunction3DLattice::setPeakShape(const IPeakShape &peak_shape)
 
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_setPeakShape(self, peak_shape)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunction3DLattice self) -> Lattice
-
         const Lattice & InterferenceFunction3DLattice::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_lattice(self)
 
-
     def supportsMultilayer(self):
-        """
+        r"""
         supportsMultilayer(InterferenceFunction3DLattice self) -> bool
-
         bool InterferenceFunction3DLattice::supportsMultilayer() const override final
 
         Indicates if this interference function can be used with a multilayer (DWBA mode) 
@@ -22390,11 +17838,9 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_supportsMultilayer(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunction3DLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunction3DLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -22402,11 +17848,9 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_getChildren(self)
 
-
     def onChange(self):
-        """
+        r"""
         onChange(InterferenceFunction3DLattice self)
-
         void InterferenceFunction3DLattice::onChange() override final
 
         Action to be taken in inherited class when a parameter has changed. 
@@ -22414,11 +17858,11 @@ class InterferenceFunction3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunction3DLattice_onChange(self)
 
-InterferenceFunction3DLattice_swigregister = _libBornAgainCore.InterferenceFunction3DLattice_swigregister
-InterferenceFunction3DLattice_swigregister(InterferenceFunction3DLattice)
+# Register InterferenceFunction3DLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunction3DLattice_swigregister(InterferenceFunction3DLattice)
 
 class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a finite 2D lattice.
@@ -22427,21 +17871,13 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionFinite2DLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionFinite2DLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(InterferenceFunctionFinite2DLattice self, Lattice2D lattice, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice
         __init__(InterferenceFunctionFinite2DLattice self, double length_1, double length_2, double alpha, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice
-
         InterferenceFunctionFinite2DLattice::InterferenceFunctionFinite2DLattice(double length_1, double length_2, double alpha, double xi, unsigned N_1, unsigned N_2)
 
         Constructor of two-dimensional finite lattice interference function.
@@ -22468,18 +17904,12 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
         number of lattice cells in the second lattice direction 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionFinite2DLattice(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionFinite2DLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunctionFinite2DLattice(*args))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionFinite2DLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionFinite2DLattice self) -> InterferenceFunctionFinite2DLattice
-
         InterferenceFunctionFinite2DLattice * InterferenceFunctionFinite2DLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22487,11 +17917,9 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionFinite2DLattice self, INodeVisitor visitor)
-
         void InterferenceFunctionFinite2DLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22499,73 +17927,59 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_accept(self, visitor)
 
-
+    @staticmethod
     def createSquare(lattice_length, xi, N_1, N_2):
-        """createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
+        r"""createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_createSquare(lattice_length, xi, N_1, N_2)
 
-    createSquare = staticmethod(createSquare)
-
+    @staticmethod
     def createHexagonal(lattice_length, xi, N_1, N_2):
-        """createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
+        r"""createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_createHexagonal(lattice_length, xi, N_1, N_2)
 
-    createHexagonal = staticmethod(createHexagonal)
-
     def numberUnitCells1(self):
-        """
+        r"""
         numberUnitCells1(InterferenceFunctionFinite2DLattice self) -> unsigned int
-
         unsigned InterferenceFunctionFinite2DLattice::numberUnitCells1() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_numberUnitCells1(self)
 
-
     def numberUnitCells2(self):
-        """
+        r"""
         numberUnitCells2(InterferenceFunctionFinite2DLattice self) -> unsigned int
-
         unsigned InterferenceFunctionFinite2DLattice::numberUnitCells2() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_numberUnitCells2(self)
 
-
     def setIntegrationOverXi(self, integrate_xi):
-        """
+        r"""
         setIntegrationOverXi(InterferenceFunctionFinite2DLattice self, bool integrate_xi)
-
         void InterferenceFunctionFinite2DLattice::setIntegrationOverXi(bool integrate_xi)
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_setIntegrationOverXi(self, integrate_xi)
 
-
     def integrationOverXi(self):
-        """
+        r"""
         integrationOverXi(InterferenceFunctionFinite2DLattice self) -> bool
-
         bool InterferenceFunctionFinite2DLattice::integrationOverXi() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_integrationOverXi(self)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunctionFinite2DLattice self) -> Lattice2D
-
         const Lattice2D & InterferenceFunctionFinite2DLattice::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_lattice(self)
 
-
     def getParticleDensity(self):
-        """
+        r"""
         getParticleDensity(InterferenceFunctionFinite2DLattice self) -> double
-
         double InterferenceFunctionFinite2DLattice::getParticleDensity() const override final
 
         Returns the particle density associated with this 2d lattice. 
@@ -22573,11 +17987,9 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_getParticleDensity(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunctionFinite2DLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunctionFinite2DLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -22585,19 +17997,19 @@ class InterferenceFunctionFinite2DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite2DLattice_getChildren(self)
 
-InterferenceFunctionFinite2DLattice_swigregister = _libBornAgainCore.InterferenceFunctionFinite2DLattice_swigregister
-InterferenceFunctionFinite2DLattice_swigregister(InterferenceFunctionFinite2DLattice)
+# Register InterferenceFunctionFinite2DLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionFinite2DLattice_swigregister(InterferenceFunctionFinite2DLattice)
 
 def InterferenceFunctionFinite2DLattice_createSquare(lattice_length, xi, N_1, N_2):
-    """InterferenceFunctionFinite2DLattice_createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
+    r"""InterferenceFunctionFinite2DLattice_createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
     return _libBornAgainCore.InterferenceFunctionFinite2DLattice_createSquare(lattice_length, xi, N_1, N_2)
 
 def InterferenceFunctionFinite2DLattice_createHexagonal(lattice_length, xi, N_1, N_2):
-    """InterferenceFunctionFinite2DLattice_createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
+    r"""InterferenceFunctionFinite2DLattice_createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"""
     return _libBornAgainCore.InterferenceFunctionFinite2DLattice_createHexagonal(lattice_length, xi, N_1, N_2)
 
 class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of a finite 3D lattice.
@@ -22606,20 +18018,12 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionFinite3DLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionFinite3DLattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, lattice, N_1, N_2, N_3):
-        """
+        r"""
         __init__(InterferenceFunctionFinite3DLattice self, Lattice lattice, unsigned int N_1, unsigned int N_2, unsigned int N_3) -> InterferenceFunctionFinite3DLattice
-
         InterferenceFunctionFinite3DLattice::InterferenceFunctionFinite3DLattice(const Lattice &lattice, unsigned N_1, unsigned N_2, unsigned N_3)
 
         Constructor of three-dimensional finite lattice interference function.
@@ -22637,18 +18041,12 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
         number of lattice cells in the second lattice direction 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionFinite3DLattice(lattice, N_1, N_2, N_3)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionFinite3DLattice_swiginit(self, _libBornAgainCore.new_InterferenceFunctionFinite3DLattice(lattice, N_1, N_2, N_3))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionFinite3DLattice
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionFinite3DLattice self) -> InterferenceFunctionFinite3DLattice
-
         InterferenceFunctionFinite3DLattice * InterferenceFunctionFinite3DLattice::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22656,11 +18054,9 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionFinite3DLattice self, INodeVisitor visitor)
-
         void InterferenceFunctionFinite3DLattice::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22668,51 +18064,41 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_accept(self, visitor)
 
-
     def numberUnitCells1(self):
-        """
+        r"""
         numberUnitCells1(InterferenceFunctionFinite3DLattice self) -> unsigned int
-
         unsigned InterferenceFunctionFinite3DLattice::numberUnitCells1() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_numberUnitCells1(self)
 
-
     def numberUnitCells2(self):
-        """
+        r"""
         numberUnitCells2(InterferenceFunctionFinite3DLattice self) -> unsigned int
-
         unsigned InterferenceFunctionFinite3DLattice::numberUnitCells2() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_numberUnitCells2(self)
 
-
     def numberUnitCells3(self):
-        """
+        r"""
         numberUnitCells3(InterferenceFunctionFinite3DLattice self) -> unsigned int
-
         unsigned InterferenceFunctionFinite3DLattice::numberUnitCells3() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_numberUnitCells3(self)
 
-
     def lattice(self):
-        """
+        r"""
         lattice(InterferenceFunctionFinite3DLattice self) -> Lattice
-
         const Lattice & InterferenceFunctionFinite3DLattice::lattice() const
 
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_lattice(self)
 
-
     def supportsMultilayer(self):
-        """
+        r"""
         supportsMultilayer(InterferenceFunctionFinite3DLattice self) -> bool
-
         bool InterferenceFunctionFinite3DLattice::supportsMultilayer() const override final
 
         Indicates if this interference function can be used with a multilayer (DWBA mode) 
@@ -22720,11 +18106,9 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_supportsMultilayer(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunctionFinite3DLattice self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunctionFinite3DLattice::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -22732,11 +18116,11 @@ class InterferenceFunctionFinite3DLattice(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionFinite3DLattice_getChildren(self)
 
-InterferenceFunctionFinite3DLattice_swigregister = _libBornAgainCore.InterferenceFunctionFinite3DLattice_swigregister
-InterferenceFunctionFinite3DLattice_swigregister(InterferenceFunctionFinite3DLattice)
+# Register InterferenceFunctionFinite3DLattice in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionFinite3DLattice_swigregister(InterferenceFunctionFinite3DLattice)
 
 class InterferenceFunctionHardDisk(IInterferenceFunction):
-    """
+    r"""
 
 
     Percus-Yevick hard disk interference function.
@@ -22747,35 +18131,21 @@ class InterferenceFunctionHardDisk(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionHardDisk, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionHardDisk, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, radius, density):
-        """
+        r"""
         __init__(InterferenceFunctionHardDisk self, double radius, double density) -> InterferenceFunctionHardDisk
-
         InterferenceFunctionHardDisk::InterferenceFunctionHardDisk(double radius, double density)
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionHardDisk(radius, density)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionHardDisk_swiginit(self, _libBornAgainCore.new_InterferenceFunctionHardDisk(radius, density))
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionHardDisk
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionHardDisk self) -> InterferenceFunctionHardDisk
-
         InterferenceFunctionHardDisk * InterferenceFunctionHardDisk::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22783,11 +18153,9 @@ class InterferenceFunctionHardDisk(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionHardDisk_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionHardDisk self, INodeVisitor visitor)
-
         void InterferenceFunctionHardDisk::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22795,11 +18163,9 @@ class InterferenceFunctionHardDisk(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionHardDisk_accept(self, visitor)
 
-
     def getParticleDensity(self):
-        """
+        r"""
         getParticleDensity(InterferenceFunctionHardDisk self) -> double
-
         double InterferenceFunctionHardDisk::getParticleDensity() const override final
 
         If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value 
@@ -22807,31 +18173,27 @@ class InterferenceFunctionHardDisk(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionHardDisk_getParticleDensity(self)
 
-
     def radius(self):
-        """
+        r"""
         radius(InterferenceFunctionHardDisk self) -> double
-
         double InterferenceFunctionHardDisk::radius() const
 
         """
         return _libBornAgainCore.InterferenceFunctionHardDisk_radius(self)
 
-
     def density(self):
-        """
+        r"""
         density(InterferenceFunctionHardDisk self) -> double
-
         double InterferenceFunctionHardDisk::density() const
 
         """
         return _libBornAgainCore.InterferenceFunctionHardDisk_density(self)
 
-InterferenceFunctionHardDisk_swigregister = _libBornAgainCore.InterferenceFunctionHardDisk_swigregister
-InterferenceFunctionHardDisk_swigregister(InterferenceFunctionHardDisk)
+# Register InterferenceFunctionHardDisk in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionHardDisk_swigregister(InterferenceFunctionHardDisk)
 
 class InterferenceFunctionNone(IInterferenceFunction):
-    """
+    r"""
 
 
     Default interference function (i.e. absence of any interference).
@@ -22840,33 +18202,20 @@ class InterferenceFunctionNone(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionNone, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionNone, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(InterferenceFunctionNone self) -> InterferenceFunctionNone
-
         InterferenceFunctionNone::InterferenceFunctionNone()
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionNone()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionNone_swiginit(self, _libBornAgainCore.new_InterferenceFunctionNone())
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionNone self) -> InterferenceFunctionNone
-
         InterferenceFunctionNone * InterferenceFunctionNone::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22874,25 +18223,22 @@ class InterferenceFunctionNone(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionNone_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionNone self, INodeVisitor visitor)
-
         void InterferenceFunctionNone::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
 
         """
         return _libBornAgainCore.InterferenceFunctionNone_accept(self, visitor)
-
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionNone
-    __del__ = lambda self: None
-InterferenceFunctionNone_swigregister = _libBornAgainCore.InterferenceFunctionNone_swigregister
-InterferenceFunctionNone_swigregister(InterferenceFunctionNone)
+
+# Register InterferenceFunctionNone in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionNone_swigregister(InterferenceFunctionNone)
 
 class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function of radial paracrystal.
@@ -22901,21 +18247,12 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionRadialParaCrystal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionRadialParaCrystal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, peak_distance, damping_length=0.0):
-        """
+        r"""
         __init__(InterferenceFunctionRadialParaCrystal self, double peak_distance, double damping_length=0.0) -> InterferenceFunctionRadialParaCrystal
-        __init__(InterferenceFunctionRadialParaCrystal self, double peak_distance) -> InterferenceFunctionRadialParaCrystal
-
         InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(double peak_distance, double damping_length=0.0)
 
         Constructor of interference function of radial paracrystal.
@@ -22930,16 +18267,11 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         the damping (coherence) length of the paracrystal in nanometers 
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionRadialParaCrystal(peak_distance, damping_length)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionRadialParaCrystal_swiginit(self, _libBornAgainCore.new_InterferenceFunctionRadialParaCrystal(peak_distance, damping_length))
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionRadialParaCrystal self) -> InterferenceFunctionRadialParaCrystal
-
         InterferenceFunctionRadialParaCrystal * InterferenceFunctionRadialParaCrystal::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -22947,11 +18279,9 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionRadialParaCrystal self, INodeVisitor visitor)
-
         void InterferenceFunctionRadialParaCrystal::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -22959,11 +18289,9 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_accept(self, visitor)
 
-
     def setKappa(self, kappa):
-        """
+        r"""
         setKappa(InterferenceFunctionRadialParaCrystal self, double kappa)
-
         void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)
 
         Sets size spacing coupling parameter of the Size Spacing Correlation Approximation.
@@ -22977,21 +18305,17 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setKappa(self, kappa)
 
-
     def kappa(self):
-        """
+        r"""
         kappa(InterferenceFunctionRadialParaCrystal self) -> double
-
         double InterferenceFunctionRadialParaCrystal::kappa() const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_kappa(self)
 
-
     def setDomainSize(self, size):
-        """
+        r"""
         setDomainSize(InterferenceFunctionRadialParaCrystal self, double size)
-
         void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)
 
         Sets domain size (finite size corrections).
@@ -23005,31 +18329,25 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setDomainSize(self, size)
 
-
     def domainSize(self):
-        """
+        r"""
         domainSize(InterferenceFunctionRadialParaCrystal self) -> double
-
         double InterferenceFunctionRadialParaCrystal::domainSize() const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_domainSize(self)
 
-
     def FTPDF(self, qpar):
-        """
+        r"""
         FTPDF(InterferenceFunctionRadialParaCrystal self, double qpar) -> complex_t
-
         complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_FTPDF(self, qpar)
 
-
     def setProbabilityDistribution(self, pdf):
-        """
+        r"""
         setProbabilityDistribution(InterferenceFunctionRadialParaCrystal self, IFTDistribution1D pdf)
-
         void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)
 
         Sets one-dimensional probability distribution.
@@ -23043,31 +18361,25 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setProbabilityDistribution(self, pdf)
 
-
     def peakDistance(self):
-        """
+        r"""
         peakDistance(InterferenceFunctionRadialParaCrystal self) -> double
-
         double InterferenceFunctionRadialParaCrystal::peakDistance() const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_peakDistance(self)
 
-
     def dampingLength(self):
-        """
+        r"""
         dampingLength(InterferenceFunctionRadialParaCrystal self) -> double
-
         double InterferenceFunctionRadialParaCrystal::dampingLength() const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_dampingLength(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(InterferenceFunctionRadialParaCrystal self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > InterferenceFunctionRadialParaCrystal::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -23075,23 +18387,20 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_getChildren(self)
 
-
     def randomSample(self):
-        """
+        r"""
         randomSample(InterferenceFunctionRadialParaCrystal self) -> double
-
         double InterferenceFunctionRadialParaCrystal::randomSample() const
 
         """
         return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_randomSample(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionRadialParaCrystal
-    __del__ = lambda self: None
-InterferenceFunctionRadialParaCrystal_swigregister = _libBornAgainCore.InterferenceFunctionRadialParaCrystal_swigregister
-InterferenceFunctionRadialParaCrystal_swigregister(InterferenceFunctionRadialParaCrystal)
+
+# Register InterferenceFunctionRadialParaCrystal in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionRadialParaCrystal_swigregister(InterferenceFunctionRadialParaCrystal)
 
 class InterferenceFunctionTwin(IInterferenceFunction):
-    """
+    r"""
 
 
     Interference function for two particles at a mean distance and given standard deviation from each other in a given direction.
@@ -23100,33 +18409,20 @@ class InterferenceFunctionTwin(IInterferenceFunction):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InterferenceFunctionTwin, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IInterferenceFunction]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InterferenceFunctionTwin, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, direction, mean_distance, std_dev):
-        """
+        r"""
         __init__(InterferenceFunctionTwin self, kvector_t direction, double mean_distance, double std_dev) -> InterferenceFunctionTwin
-
         InterferenceFunctionTwin::InterferenceFunctionTwin(const kvector_t &direction, double mean_distance, double std_dev)
 
         """
-        this = _libBornAgainCore.new_InterferenceFunctionTwin(direction, mean_distance, std_dev)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.InterferenceFunctionTwin_swiginit(self, _libBornAgainCore.new_InterferenceFunctionTwin(direction, mean_distance, std_dev))
 
     def clone(self):
-        """
+        r"""
         clone(InterferenceFunctionTwin self) -> InterferenceFunctionTwin
-
         InterferenceFunctionTwin * InterferenceFunctionTwin::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -23134,11 +18430,9 @@ class InterferenceFunctionTwin(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionTwin_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(InterferenceFunctionTwin self, INodeVisitor visitor)
-
         void InterferenceFunctionTwin::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -23146,43 +18440,36 @@ class InterferenceFunctionTwin(IInterferenceFunction):
         """
         return _libBornAgainCore.InterferenceFunctionTwin_accept(self, visitor)
 
-
     def direction(self):
-        """
+        r"""
         direction(InterferenceFunctionTwin self) -> kvector_t
-
         kvector_t InterferenceFunctionTwin::direction() const
 
         """
         return _libBornAgainCore.InterferenceFunctionTwin_direction(self)
 
-
     def meanDistance(self):
-        """
+        r"""
         meanDistance(InterferenceFunctionTwin self) -> double
-
         double InterferenceFunctionTwin::meanDistance() const
 
         """
         return _libBornAgainCore.InterferenceFunctionTwin_meanDistance(self)
 
-
     def stdDev(self):
-        """
+        r"""
         stdDev(InterferenceFunctionTwin self) -> double
-
         double InterferenceFunctionTwin::stdDev() const
 
         """
         return _libBornAgainCore.InterferenceFunctionTwin_stdDev(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionTwin
-    __del__ = lambda self: None
-InterferenceFunctionTwin_swigregister = _libBornAgainCore.InterferenceFunctionTwin_swigregister
-InterferenceFunctionTwin_swigregister(InterferenceFunctionTwin)
 
-class IPixel(_object):
-    """
+# Register InterferenceFunctionTwin in _libBornAgainCore:
+_libBornAgainCore.InterferenceFunctionTwin_swigregister(InterferenceFunctionTwin)
+
+class IPixel(object):
+    r"""
 
 
     Interface for a function that maps [0,1]x[0,1] to the kvectors in a pixel.
@@ -23191,71 +18478,58 @@ class IPixel(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IPixel, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IPixel, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IPixel
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IPixel self) -> IPixel
-
         virtual IPixel* IPixel::clone() const =0
 
         """
         return _libBornAgainCore.IPixel_clone(self)
 
-
     def createZeroSizePixel(self, x, y):
-        """
+        r"""
         createZeroSizePixel(IPixel self, double x, double y) -> IPixel
-
         virtual IPixel* IPixel::createZeroSizePixel(double x, double y) const =0
 
         """
         return _libBornAgainCore.IPixel_createZeroSizePixel(self, x, y)
 
-
     def getK(self, x, y, wavelength):
-        """
+        r"""
         getK(IPixel self, double x, double y, double wavelength) -> kvector_t
-
         virtual kvector_t IPixel::getK(double x, double y, double wavelength) const =0
 
         """
         return _libBornAgainCore.IPixel_getK(self, x, y, wavelength)
 
-
     def getIntegrationFactor(self, x, y):
-        """
+        r"""
         getIntegrationFactor(IPixel self, double x, double y) -> double
-
         virtual double IPixel::getIntegrationFactor(double x, double y) const =0
 
         """
         return _libBornAgainCore.IPixel_getIntegrationFactor(self, x, y)
 
-
     def getSolidAngle(self):
-        """
+        r"""
         getSolidAngle(IPixel self) -> double
-
         virtual double IPixel::getSolidAngle() const =0
 
         """
         return _libBornAgainCore.IPixel_getSolidAngle(self)
 
-IPixel_swigregister = _libBornAgainCore.IPixel_swigregister
-IPixel_swigregister(IPixel)
+# Register IPixel in _libBornAgainCore:
+_libBornAgainCore.IPixel_swigregister(IPixel)
 
 class SphericalDetector(IDetector2D):
-    """
+    r"""
 
 
     A spherical detector with axes and resolution function.  SphericalDetector
@@ -23264,59 +18538,41 @@ class SphericalDetector(IDetector2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDetector2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SphericalDetector, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDetector2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SphericalDetector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(SphericalDetector self) -> SphericalDetector
         __init__(SphericalDetector self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max) -> SphericalDetector
         __init__(SphericalDetector self, SphericalDetector other) -> SphericalDetector
-
         SphericalDetector::SphericalDetector(const SphericalDetector &other)
 
         """
-        this = _libBornAgainCore.new_SphericalDetector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SphericalDetector_swiginit(self, _libBornAgainCore.new_SphericalDetector(*args))
 
     def clone(self):
-        """
+        r"""
         clone(SphericalDetector self) -> SphericalDetector
-
         SphericalDetector * SphericalDetector::clone() const override
 
         """
         return _libBornAgainCore.SphericalDetector_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(SphericalDetector self, INodeVisitor visitor)
-
         void SphericalDetector::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
 
         """
         return _libBornAgainCore.SphericalDetector_accept(self, visitor)
-
     __swig_destroy__ = _libBornAgainCore.delete_SphericalDetector
-    __del__ = lambda self: None
 
     def defaultAxesUnits(self):
-        """
+        r"""
         defaultAxesUnits(SphericalDetector self) -> AxesUnits
-
         AxesUnits SphericalDetector::defaultAxesUnits() const override
 
         return default axes units 
@@ -23324,91 +18580,69 @@ class SphericalDetector(IDetector2D):
         """
         return _libBornAgainCore.SphericalDetector_defaultAxesUnits(self)
 
-SphericalDetector_swigregister = _libBornAgainCore.SphericalDetector_swigregister
-SphericalDetector_swigregister(SphericalDetector)
+# Register SphericalDetector in _libBornAgainCore:
+_libBornAgainCore.SphericalDetector_swigregister(SphericalDetector)
 
 class SphericalPixel(IPixel):
-    """Proxy of C++ SphericalPixel class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IPixel]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SphericalPixel, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPixel]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SphericalPixel, name)
+    r"""Proxy of C++ SphericalPixel class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, alpha_bin, phi_bin):
-        """
+        r"""
         __init__(SphericalPixel self, Bin1D alpha_bin, Bin1D phi_bin) -> SphericalPixel
-
         SphericalPixel::SphericalPixel(const Bin1D &alpha_bin, const Bin1D &phi_bin)
 
         """
-        this = _libBornAgainCore.new_SphericalPixel(alpha_bin, phi_bin)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SphericalPixel_swiginit(self, _libBornAgainCore.new_SphericalPixel(alpha_bin, phi_bin))
 
     def clone(self):
-        """
+        r"""
         clone(SphericalPixel self) -> SphericalPixel
-
         SphericalPixel * SphericalPixel::clone() const override
 
         """
         return _libBornAgainCore.SphericalPixel_clone(self)
 
-
     def createZeroSizePixel(self, x, y):
-        """
+        r"""
         createZeroSizePixel(SphericalPixel self, double x, double y) -> SphericalPixel
-
         SphericalPixel * SphericalPixel::createZeroSizePixel(double x, double y) const override
 
         """
         return _libBornAgainCore.SphericalPixel_createZeroSizePixel(self, x, y)
 
-
     def getK(self, x, y, wavelength):
-        """
+        r"""
         getK(SphericalPixel self, double x, double y, double wavelength) -> kvector_t
-
         kvector_t SphericalPixel::getK(double x, double y, double wavelength) const override
 
         """
         return _libBornAgainCore.SphericalPixel_getK(self, x, y, wavelength)
 
-
     def getIntegrationFactor(self, x, y):
-        """
+        r"""
         getIntegrationFactor(SphericalPixel self, double x, double y) -> double
-
         double SphericalPixel::getIntegrationFactor(double x, double y) const override
 
         """
         return _libBornAgainCore.SphericalPixel_getIntegrationFactor(self, x, y)
 
-
     def getSolidAngle(self):
-        """
+        r"""
         getSolidAngle(SphericalPixel self) -> double
-
         double SphericalPixel::getSolidAngle() const override
 
         """
         return _libBornAgainCore.SphericalPixel_getSolidAngle(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_SphericalPixel
-    __del__ = lambda self: None
-SphericalPixel_swigregister = _libBornAgainCore.SphericalPixel_swigregister
-SphericalPixel_swigregister(SphericalPixel)
+
+# Register SphericalPixel in _libBornAgainCore:
+_libBornAgainCore.SphericalPixel_swigregister(SphericalPixel)
 
 class IsGISAXSDetector(SphericalDetector):
-    """
+    r"""
 
 
     A spherical detector used for validation with IsGISAXS results.
@@ -23417,105 +18651,80 @@ class IsGISAXSDetector(SphericalDetector):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [SphericalDetector]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IsGISAXSDetector, name, value)
-    __swig_getmethods__ = {}
-    for _s in [SphericalDetector]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IsGISAXSDetector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(IsGISAXSDetector self) -> IsGISAXSDetector
         __init__(IsGISAXSDetector self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max) -> IsGISAXSDetector
         __init__(IsGISAXSDetector self, IsGISAXSDetector other) -> IsGISAXSDetector
-
         IsGISAXSDetector::IsGISAXSDetector(const IsGISAXSDetector &other)
 
         """
-        this = _libBornAgainCore.new_IsGISAXSDetector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IsGISAXSDetector_swiginit(self, _libBornAgainCore.new_IsGISAXSDetector(*args))
 
     def clone(self):
-        """
+        r"""
         clone(IsGISAXSDetector self) -> IsGISAXSDetector
-
         IsGISAXSDetector * IsGISAXSDetector::clone() const override
 
         """
         return _libBornAgainCore.IsGISAXSDetector_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(IsGISAXSDetector self, INodeVisitor visitor)
-
         void IsGISAXSDetector::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
 
         """
         return _libBornAgainCore.IsGISAXSDetector_accept(self, visitor)
-
     __swig_destroy__ = _libBornAgainCore.delete_IsGISAXSDetector
-    __del__ = lambda self: None
-IsGISAXSDetector_swigregister = _libBornAgainCore.IsGISAXSDetector_swigregister
-IsGISAXSDetector_swigregister(IsGISAXSDetector)
 
-class ILatticeOrientation(_object):
-    """Proxy of C++ ILatticeOrientation class."""
+# Register IsGISAXSDetector in _libBornAgainCore:
+_libBornAgainCore.IsGISAXSDetector_swigregister(IsGISAXSDetector)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ILatticeOrientation, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ILatticeOrientation, name)
+class ILatticeOrientation(object):
+    r"""Proxy of C++ ILatticeOrientation class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_ILatticeOrientation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ILatticeOrientation self) -> ILatticeOrientation
-
         virtual ILatticeOrientation* ILatticeOrientation::clone() const =0
 
         """
         return _libBornAgainCore.ILatticeOrientation_clone(self)
 
-
     def usePrimitiveLattice(self, lattice):
-        """
+        r"""
         usePrimitiveLattice(ILatticeOrientation self, Lattice lattice)
-
         virtual void ILatticeOrientation::usePrimitiveLattice(const Lattice &lattice)=0
 
         """
         return _libBornAgainCore.ILatticeOrientation_usePrimitiveLattice(self, lattice)
 
-
     def transformationMatrix(self):
-        """
+        r"""
         transformationMatrix(ILatticeOrientation self) -> Transform3D
-
         virtual Transform3D ILatticeOrientation::transformationMatrix() const =0
 
         """
         return _libBornAgainCore.ILatticeOrientation_transformationMatrix(self)
 
-ILatticeOrientation_swigregister = _libBornAgainCore.ILatticeOrientation_swigregister
-ILatticeOrientation_swigregister(ILatticeOrientation)
+# Register ILatticeOrientation in _libBornAgainCore:
+_libBornAgainCore.ILatticeOrientation_swigregister(ILatticeOrientation)
 
-class MillerIndex(_object):
-    """
+class MillerIndex(object):
+    r"""
 
 
     A direction in reciprocal space, specified by double-valued indices hkl.
@@ -23524,43 +18733,26 @@ class MillerIndex(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MillerIndex, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, MillerIndex, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, h_, k_, l_):
-        """
+        r"""
         __init__(MillerIndex self, double h_, double k_, double l_) -> MillerIndex
-
         MillerIndex::MillerIndex(double h_, double k_, double l_)
 
         """
-        this = _libBornAgainCore.new_MillerIndex(h_, k_, l_)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["h"] = _libBornAgainCore.MillerIndex_h_set
-    __swig_getmethods__["h"] = _libBornAgainCore.MillerIndex_h_get
-    if _newclass:
-        h = _swig_property(_libBornAgainCore.MillerIndex_h_get, _libBornAgainCore.MillerIndex_h_set)
-    __swig_setmethods__["k"] = _libBornAgainCore.MillerIndex_k_set
-    __swig_getmethods__["k"] = _libBornAgainCore.MillerIndex_k_get
-    if _newclass:
-        k = _swig_property(_libBornAgainCore.MillerIndex_k_get, _libBornAgainCore.MillerIndex_k_set)
-    __swig_setmethods__["l"] = _libBornAgainCore.MillerIndex_l_set
-    __swig_getmethods__["l"] = _libBornAgainCore.MillerIndex_l_get
-    if _newclass:
-        l = _swig_property(_libBornAgainCore.MillerIndex_l_get, _libBornAgainCore.MillerIndex_l_set)
+        _libBornAgainCore.MillerIndex_swiginit(self, _libBornAgainCore.new_MillerIndex(h_, k_, l_))
+    h = property(_libBornAgainCore.MillerIndex_h_get, _libBornAgainCore.MillerIndex_h_set, doc=r"""h : double""")
+    k = property(_libBornAgainCore.MillerIndex_k_get, _libBornAgainCore.MillerIndex_k_set, doc=r"""k : double""")
+    l = property(_libBornAgainCore.MillerIndex_l_get, _libBornAgainCore.MillerIndex_l_set, doc=r"""l : double""")
     __swig_destroy__ = _libBornAgainCore.delete_MillerIndex
-    __del__ = lambda self: None
-MillerIndex_swigregister = _libBornAgainCore.MillerIndex_swigregister
-MillerIndex_swigregister(MillerIndex)
+
+# Register MillerIndex in _libBornAgainCore:
+_libBornAgainCore.MillerIndex_swigregister(MillerIndex)
 
 class MillerIndexOrientation(ILatticeOrientation):
-    """
+    r"""
 
 
     Specifies a rotation of a lattice through the Miller indices of two coordinate axes.
@@ -23569,70 +18761,55 @@ class MillerIndexOrientation(ILatticeOrientation):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ILatticeOrientation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MillerIndexOrientation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ILatticeOrientation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, MillerIndexOrientation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
     QX = _libBornAgainCore.MillerIndexOrientation_QX
+    
     QY = _libBornAgainCore.MillerIndexOrientation_QY
+    
     QZ = _libBornAgainCore.MillerIndexOrientation_QZ
+    
 
     def __init__(self, q1, index1, q2, index2):
-        """
+        r"""
         __init__(MillerIndexOrientation self, MillerIndexOrientation::QComponent q1, MillerIndex index1, MillerIndexOrientation::QComponent q2, MillerIndex index2) -> MillerIndexOrientation
-
         MillerIndexOrientation::MillerIndexOrientation(QComponent q1, MillerIndex index1, QComponent q2, MillerIndex index2)
 
         This constructor is best explained by an example. Arguments QX, (1,1,0), QY, (0,2,1) mean: Rotate the lattice such that the axis [110] points into x direction, and the axis [021], projected into the yz plane, points into z direction. 
 
         """
-        this = _libBornAgainCore.new_MillerIndexOrientation(q1, index1, q2, index2)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.MillerIndexOrientation_swiginit(self, _libBornAgainCore.new_MillerIndexOrientation(q1, index1, q2, index2))
     __swig_destroy__ = _libBornAgainCore.delete_MillerIndexOrientation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(MillerIndexOrientation self) -> MillerIndexOrientation
-
         MillerIndexOrientation * MillerIndexOrientation::clone() const override
 
         """
         return _libBornAgainCore.MillerIndexOrientation_clone(self)
 
-
     def usePrimitiveLattice(self, lattice):
-        """
+        r"""
         usePrimitiveLattice(MillerIndexOrientation self, Lattice lattice)
-
         void MillerIndexOrientation::usePrimitiveLattice(const Lattice &lattice) override
 
         """
         return _libBornAgainCore.MillerIndexOrientation_usePrimitiveLattice(self, lattice)
 
-
     def transformationMatrix(self):
-        """
+        r"""
         transformationMatrix(MillerIndexOrientation self) -> Transform3D
-
         Transform3D MillerIndexOrientation::transformationMatrix() const override
 
         """
         return _libBornAgainCore.MillerIndexOrientation_transformationMatrix(self)
 
-MillerIndexOrientation_swigregister = _libBornAgainCore.MillerIndexOrientation_swigregister
-MillerIndexOrientation_swigregister(MillerIndexOrientation)
+# Register MillerIndexOrientation in _libBornAgainCore:
+_libBornAgainCore.MillerIndexOrientation_swigregister(MillerIndexOrientation)
 
 class Lattice(INode):
-    """
+    r"""
 
 
     A lattice with three basis vectors.
@@ -23641,37 +18818,23 @@ class Lattice(INode):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Lattice, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Lattice self) -> Lattice
         __init__(Lattice self, kvector_t a1, kvector_t a2, kvector_t a3) -> Lattice
         __init__(Lattice self, Lattice lattice) -> Lattice
-
         Lattice::Lattice(const Lattice &lattice)
 
         """
-        this = _libBornAgainCore.new_Lattice(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Lattice_swiginit(self, _libBornAgainCore.new_Lattice(*args))
     __swig_destroy__ = _libBornAgainCore.delete_Lattice
-    __del__ = lambda self: None
 
     def accept(self, visitor):
-        """
+        r"""
         accept(Lattice self, INodeVisitor visitor)
-
         void Lattice::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -23679,11 +18842,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_accept(self, visitor)
 
-
     def createTransformedLattice(self, transform):
-        """
+        r"""
         createTransformedLattice(Lattice self, Transform3D const & transform) -> Lattice
-
         Lattice Lattice::createTransformedLattice(const Transform3D &transform) const
 
         Create transformed lattice. 
@@ -23691,11 +18852,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_createTransformedLattice(self, transform)
 
-
     def initialize(self):
-        """
+        r"""
         initialize(Lattice self)
-
         void Lattice::initialize() const
 
         Initializes cached data. 
@@ -23703,11 +18862,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_initialize(self)
 
-
     def getBasisVectorA(self):
-        """
+        r"""
         getBasisVectorA(Lattice self) -> kvector_t
-
         kvector_t Lattice::getBasisVectorA() const
 
         Returns basis vector a. 
@@ -23715,11 +18872,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getBasisVectorA(self)
 
-
     def getBasisVectorB(self):
-        """
+        r"""
         getBasisVectorB(Lattice self) -> kvector_t
-
         kvector_t Lattice::getBasisVectorB() const
 
         Returns basis vector b. 
@@ -23727,11 +18882,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getBasisVectorB(self)
 
-
     def getBasisVectorC(self):
-        """
+        r"""
         getBasisVectorC(Lattice self) -> kvector_t
-
         kvector_t Lattice::getBasisVectorC() const
 
         Returns basis vector c. 
@@ -23739,11 +18892,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getBasisVectorC(self)
 
-
     def resetBasis(self, a1, a2, a3):
-        """
+        r"""
         resetBasis(Lattice self, kvector_t a1, kvector_t a2, kvector_t a3)
-
         void Lattice::resetBasis(const kvector_t a1, const kvector_t a2, const kvector_t a3)
 
         Resets the basis vectors. 
@@ -23751,11 +18902,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_resetBasis(self, a1, a2, a3)
 
-
     def getMillerDirection(self, h, k, l):
-        """
+        r"""
         getMillerDirection(Lattice self, double h, double k, double l) -> kvector_t
-
         kvector_t Lattice::getMillerDirection(double h, double k, double l) const
 
         Returns normalized direction corresponding to the given Miller indices. 
@@ -23763,11 +18912,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getMillerDirection(self, h, k, l)
 
-
     def volume(self):
-        """
+        r"""
         volume(Lattice self) -> double
-
         double Lattice::volume() const
 
         Returns the volume of the unit cell. 
@@ -23775,11 +18922,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_volume(self)
 
-
     def getReciprocalLatticeBasis(self, b1, b2, b3):
-        """
+        r"""
         getReciprocalLatticeBasis(Lattice self, kvector_t b1, kvector_t b2, kvector_t b3)
-
         void Lattice::getReciprocalLatticeBasis(kvector_t &b1, kvector_t &b2, kvector_t &b3) const
 
         Returns the reciprocal basis vectors. 
@@ -23787,11 +18932,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getReciprocalLatticeBasis(self, b1, b2, b3)
 
-
     def getNearestLatticeVectorCoordinates(self, vector_in):
-        """
+        r"""
         getNearestLatticeVectorCoordinates(Lattice self, kvector_t vector_in) -> ivector_t
-
         ivector_t Lattice::getNearestLatticeVectorCoordinates(const kvector_t vector_in) const
 
         Returns the nearest lattice point from a given vector. 
@@ -23799,11 +18942,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getNearestLatticeVectorCoordinates(self, vector_in)
 
-
     def getNearestReciprocalLatticeVectorCoordinates(self, vector_in):
-        """
+        r"""
         getNearestReciprocalLatticeVectorCoordinates(Lattice self, kvector_t vector_in) -> ivector_t
-
         ivector_t Lattice::getNearestReciprocalLatticeVectorCoordinates(const kvector_t vector_in) const
 
         Returns the nearest reciprocal lattice point from a given vector. 
@@ -23811,11 +18952,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_getNearestReciprocalLatticeVectorCoordinates(self, vector_in)
 
-
     def reciprocalLatticeVectorsWithinRadius(self, input_vector, radius):
-        """
+        r"""
         reciprocalLatticeVectorsWithinRadius(Lattice self, kvector_t input_vector, double radius) -> vector_kvector_t
-
         std::vector< kvector_t > Lattice::reciprocalLatticeVectorsWithinRadius(const kvector_t input_vector, double radius) const
 
         Computes a list of reciprocal lattice vectors within a specified distance of a given vector. 
@@ -23823,11 +18962,9 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_reciprocalLatticeVectorsWithinRadius(self, input_vector, radius)
 
-
     def setSelectionRule(self, p_selection_rule):
-        """
+        r"""
         setSelectionRule(Lattice self, ISelectionRule p_selection_rule)
-
         void Lattice::setSelectionRule(const ISelectionRule &p_selection_rule)
 
         Sets a selection rule for the reciprocal vectors. 
@@ -23835,47 +18972,39 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_setSelectionRule(self, p_selection_rule)
 
-
+    @staticmethod
     def createCubicLattice(a):
-        """createCubicLattice(double a) -> Lattice"""
+        r"""createCubicLattice(double a) -> Lattice"""
         return _libBornAgainCore.Lattice_createCubicLattice(a)
 
-    createCubicLattice = staticmethod(createCubicLattice)
-
+    @staticmethod
     def createFCCLattice(a):
-        """createFCCLattice(double a) -> Lattice"""
+        r"""createFCCLattice(double a) -> Lattice"""
         return _libBornAgainCore.Lattice_createFCCLattice(a)
 
-    createFCCLattice = staticmethod(createFCCLattice)
-
+    @staticmethod
     def createHexagonalLattice(a, c):
-        """createHexagonalLattice(double a, double c) -> Lattice"""
+        r"""createHexagonalLattice(double a, double c) -> Lattice"""
         return _libBornAgainCore.Lattice_createHexagonalLattice(a, c)
 
-    createHexagonalLattice = staticmethod(createHexagonalLattice)
-
+    @staticmethod
     def createHCPLattice(a, c):
-        """createHCPLattice(double a, double c) -> Lattice"""
+        r"""createHCPLattice(double a, double c) -> Lattice"""
         return _libBornAgainCore.Lattice_createHCPLattice(a, c)
 
-    createHCPLattice = staticmethod(createHCPLattice)
-
+    @staticmethod
     def createTetragonalLattice(a, c):
-        """createTetragonalLattice(double a, double c) -> Lattice"""
+        r"""createTetragonalLattice(double a, double c) -> Lattice"""
         return _libBornAgainCore.Lattice_createTetragonalLattice(a, c)
 
-    createTetragonalLattice = staticmethod(createTetragonalLattice)
-
+    @staticmethod
     def createBCTLattice(a, c):
-        """createBCTLattice(double a, double c) -> Lattice"""
+        r"""createBCTLattice(double a, double c) -> Lattice"""
         return _libBornAgainCore.Lattice_createBCTLattice(a, c)
 
-    createBCTLattice = staticmethod(createBCTLattice)
-
     def onChange(self):
-        """
+        r"""
         onChange(Lattice self)
-
         void Lattice::onChange() override
 
         Action to be taken in inherited class when a parameter has changed. 
@@ -23883,62 +19012,59 @@ class Lattice(INode):
         """
         return _libBornAgainCore.Lattice_onChange(self)
 
-Lattice_swigregister = _libBornAgainCore.Lattice_swigregister
-Lattice_swigregister(Lattice)
+# Register Lattice in _libBornAgainCore:
+_libBornAgainCore.Lattice_swigregister(Lattice)
 
 def Lattice_createCubicLattice(a):
-    """Lattice_createCubicLattice(double a) -> Lattice"""
+    r"""Lattice_createCubicLattice(double a) -> Lattice"""
     return _libBornAgainCore.Lattice_createCubicLattice(a)
 
 def Lattice_createFCCLattice(a):
-    """Lattice_createFCCLattice(double a) -> Lattice"""
+    r"""Lattice_createFCCLattice(double a) -> Lattice"""
     return _libBornAgainCore.Lattice_createFCCLattice(a)
 
 def Lattice_createHexagonalLattice(a, c):
-    """Lattice_createHexagonalLattice(double a, double c) -> Lattice"""
+    r"""Lattice_createHexagonalLattice(double a, double c) -> Lattice"""
     return _libBornAgainCore.Lattice_createHexagonalLattice(a, c)
 
 def Lattice_createHCPLattice(a, c):
-    """Lattice_createHCPLattice(double a, double c) -> Lattice"""
+    r"""Lattice_createHCPLattice(double a, double c) -> Lattice"""
     return _libBornAgainCore.Lattice_createHCPLattice(a, c)
 
 def Lattice_createTetragonalLattice(a, c):
-    """Lattice_createTetragonalLattice(double a, double c) -> Lattice"""
+    r"""Lattice_createTetragonalLattice(double a, double c) -> Lattice"""
     return _libBornAgainCore.Lattice_createTetragonalLattice(a, c)
 
 def Lattice_createBCTLattice(a, c):
-    """Lattice_createBCTLattice(double a, double c) -> Lattice"""
+    r"""Lattice_createBCTLattice(double a, double c) -> Lattice"""
     return _libBornAgainCore.Lattice_createBCTLattice(a, c)
 
 
 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 CreateBCTLattice(a, c, orientation):
-    """
+    r"""
     CreateBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice
-
     Lattice LatticeUtils::CreateBCTLattice(double a, double c, const ILatticeOrientation &orientation)
 
     """
     return _libBornAgainCore.CreateBCTLattice(a, c, orientation)
-class Lattice1DParameters(_object):
-    """
+class Lattice1DParameters(object):
+    r"""
 
 
     Basic parameters of a one-dimensional lattice.
@@ -23947,17 +19073,13 @@ class Lattice1DParameters(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice1DParameters, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Lattice1DParameters, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Lattice1DParameters self) -> Lattice1DParameters
         __init__(Lattice1DParameters self, double length, double xi) -> Lattice1DParameters
-
         Lattice1DParameters::Lattice1DParameters(double length, double xi)
 
         Parameters:
@@ -23970,165 +19092,116 @@ class Lattice1DParameters(_object):
          Lattice rotation angle. 
 
         """
-        this = _libBornAgainCore.new_Lattice1DParameters(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_set
-    __swig_getmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_get
-    if _newclass:
-        m_length = _swig_property(_libBornAgainCore.Lattice1DParameters_m_length_get, _libBornAgainCore.Lattice1DParameters_m_length_set)
-    __swig_setmethods__["m_xi"] = _libBornAgainCore.Lattice1DParameters_m_xi_set
-    __swig_getmethods__["m_xi"] = _libBornAgainCore.Lattice1DParameters_m_xi_get
-    if _newclass:
-        m_xi = _swig_property(_libBornAgainCore.Lattice1DParameters_m_xi_get, _libBornAgainCore.Lattice1DParameters_m_xi_set)
+        _libBornAgainCore.Lattice1DParameters_swiginit(self, _libBornAgainCore.new_Lattice1DParameters(*args))
+    m_length = property(_libBornAgainCore.Lattice1DParameters_m_length_get, _libBornAgainCore.Lattice1DParameters_m_length_set, doc=r"""m_length : double""")
+    m_xi = property(_libBornAgainCore.Lattice1DParameters_m_xi_get, _libBornAgainCore.Lattice1DParameters_m_xi_set, doc=r"""m_xi : double""")
     __swig_destroy__ = _libBornAgainCore.delete_Lattice1DParameters
-    __del__ = lambda self: None
-Lattice1DParameters_swigregister = _libBornAgainCore.Lattice1DParameters_swigregister
-Lattice1DParameters_swigregister(Lattice1DParameters)
+
+# Register Lattice1DParameters in _libBornAgainCore:
+_libBornAgainCore.Lattice1DParameters_swigregister(Lattice1DParameters)
 
 class Lattice2D(ICloneable, INode):
-    """Proxy of C++ Lattice2D class."""
+    r"""Proxy of C++ Lattice2D class."""
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice2D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable, INode]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Lattice2D, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
 
     def clone(self):
-        """
+        r"""
         clone(Lattice2D self) -> Lattice2D
-
         Lattice2D* Lattice2D::clone() const =0
 
         """
         return _libBornAgainCore.Lattice2D_clone(self)
 
-
     def length1(self):
-        """
+        r"""
         length1(Lattice2D self) -> double
-
         virtual double Lattice2D::length1() const =0
 
         """
         return _libBornAgainCore.Lattice2D_length1(self)
 
-
     def length2(self):
-        """
+        r"""
         length2(Lattice2D self) -> double
-
         virtual double Lattice2D::length2() const =0
 
         """
         return _libBornAgainCore.Lattice2D_length2(self)
 
-
     def latticeAngle(self):
-        """
+        r"""
         latticeAngle(Lattice2D self) -> double
-
         virtual double Lattice2D::latticeAngle() const =0
 
         """
         return _libBornAgainCore.Lattice2D_latticeAngle(self)
 
-
     def unitCellArea(self):
-        """
+        r"""
         unitCellArea(Lattice2D self) -> double
-
         virtual double Lattice2D::unitCellArea() const =0
 
         """
         return _libBornAgainCore.Lattice2D_unitCellArea(self)
 
-
     def rotationAngle(self):
-        """
+        r"""
         rotationAngle(Lattice2D self) -> double
-
         double Lattice2D::rotationAngle() const
 
         """
         return _libBornAgainCore.Lattice2D_rotationAngle(self)
 
-
     def reciprocalBases(self):
-        """
+        r"""
         reciprocalBases(Lattice2D self) -> Lattice2D::ReciprocalBases
-
         Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
 
         """
         return _libBornAgainCore.Lattice2D_reciprocalBases(self)
 
-
     def setRotationEnabled(self, enabled):
-        """
+        r"""
         setRotationEnabled(Lattice2D self, bool enabled)
-
         void Lattice2D::setRotationEnabled(bool enabled)
 
         """
         return _libBornAgainCore.Lattice2D_setRotationEnabled(self, enabled)
-
     __swig_destroy__ = _libBornAgainCore.delete_Lattice2D
-    __del__ = lambda self: None
-Lattice2D_swigregister = _libBornAgainCore.Lattice2D_swigregister
-Lattice2D_swigregister(Lattice2D)
+
+# Register Lattice2D in _libBornAgainCore:
+_libBornAgainCore.Lattice2D_swigregister(Lattice2D)
 
 class BasicLattice(Lattice2D):
-    """Proxy of C++ BasicLattice class."""
-
-    __swig_setmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BasicLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, BasicLattice, name)
+    r"""Proxy of C++ BasicLattice class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length1, length2, angle, rotation_angle=0.0):
-        """
+        r"""
         __init__(BasicLattice self, double length1, double length2, double angle, double rotation_angle=0.0) -> BasicLattice
-        __init__(BasicLattice self, double length1, double length2, double angle) -> BasicLattice
-
         BasicLattice::BasicLattice(double length1, double length2, double angle, double rotation_angle=0.0)
 
         """
-        this = _libBornAgainCore.new_BasicLattice(length1, length2, angle, rotation_angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.BasicLattice_swiginit(self, _libBornAgainCore.new_BasicLattice(length1, length2, angle, rotation_angle))
 
     def clone(self):
-        """
+        r"""
         clone(BasicLattice self) -> BasicLattice
-
         BasicLattice * BasicLattice::clone() const
 
         """
         return _libBornAgainCore.BasicLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(BasicLattice self, INodeVisitor visitor)
-
         void BasicLattice::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -24136,92 +19209,67 @@ class BasicLattice(Lattice2D):
         """
         return _libBornAgainCore.BasicLattice_accept(self, visitor)
 
-
     def length1(self):
-        """
+        r"""
         length1(BasicLattice self) -> double
-
         virtual double BasicLattice::length1() const
 
         """
         return _libBornAgainCore.BasicLattice_length1(self)
 
-
     def length2(self):
-        """
+        r"""
         length2(BasicLattice self) -> double
-
         virtual double BasicLattice::length2() const
 
         """
         return _libBornAgainCore.BasicLattice_length2(self)
 
-
     def latticeAngle(self):
-        """
+        r"""
         latticeAngle(BasicLattice self) -> double
-
         virtual double BasicLattice::latticeAngle() const
 
         """
         return _libBornAgainCore.BasicLattice_latticeAngle(self)
 
-
     def unitCellArea(self):
-        """
+        r"""
         unitCellArea(BasicLattice self) -> double
-
         double BasicLattice::unitCellArea() const
 
         """
         return _libBornAgainCore.BasicLattice_unitCellArea(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_BasicLattice
-    __del__ = lambda self: None
-BasicLattice_swigregister = _libBornAgainCore.BasicLattice_swigregister
-BasicLattice_swigregister(BasicLattice)
+
+# Register BasicLattice in _libBornAgainCore:
+_libBornAgainCore.BasicLattice_swigregister(BasicLattice)
 
 class SquareLattice(Lattice2D):
-    """Proxy of C++ SquareLattice class."""
-
-    __swig_setmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SquareLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SquareLattice, name)
+    r"""Proxy of C++ SquareLattice class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, rotation_angle=0.0):
-        """
+        r"""
         __init__(SquareLattice self, double length, double rotation_angle=0.0) -> SquareLattice
-        __init__(SquareLattice self, double length) -> SquareLattice
-
         SquareLattice::SquareLattice(double length, double rotation_angle=0.0)
 
         """
-        this = _libBornAgainCore.new_SquareLattice(length, rotation_angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SquareLattice_swiginit(self, _libBornAgainCore.new_SquareLattice(length, rotation_angle))
 
     def clone(self):
-        """
+        r"""
         clone(SquareLattice self) -> SquareLattice
-
         SquareLattice * SquareLattice::clone() const
 
         """
         return _libBornAgainCore.SquareLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(SquareLattice self, INodeVisitor visitor)
-
         void SquareLattice::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -24229,92 +19277,67 @@ class SquareLattice(Lattice2D):
         """
         return _libBornAgainCore.SquareLattice_accept(self, visitor)
 
-
     def length1(self):
-        """
+        r"""
         length1(SquareLattice self) -> double
-
         virtual double SquareLattice::length1() const
 
         """
         return _libBornAgainCore.SquareLattice_length1(self)
 
-
     def length2(self):
-        """
+        r"""
         length2(SquareLattice self) -> double
-
         virtual double SquareLattice::length2() const
 
         """
         return _libBornAgainCore.SquareLattice_length2(self)
 
-
     def latticeAngle(self):
-        """
+        r"""
         latticeAngle(SquareLattice self) -> double
-
         double SquareLattice::latticeAngle() const
 
         """
         return _libBornAgainCore.SquareLattice_latticeAngle(self)
 
-
     def unitCellArea(self):
-        """
+        r"""
         unitCellArea(SquareLattice self) -> double
-
         double SquareLattice::unitCellArea() const
 
         """
         return _libBornAgainCore.SquareLattice_unitCellArea(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_SquareLattice
-    __del__ = lambda self: None
-SquareLattice_swigregister = _libBornAgainCore.SquareLattice_swigregister
-SquareLattice_swigregister(SquareLattice)
+
+# Register SquareLattice in _libBornAgainCore:
+_libBornAgainCore.SquareLattice_swigregister(SquareLattice)
 
 class HexagonalLattice(Lattice2D):
-    """Proxy of C++ HexagonalLattice class."""
-
-    __swig_setmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, HexagonalLattice, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Lattice2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, HexagonalLattice, name)
+    r"""Proxy of C++ HexagonalLattice class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, length, rotation_angle=0.0):
-        """
+        r"""
         __init__(HexagonalLattice self, double length, double rotation_angle=0.0) -> HexagonalLattice
-        __init__(HexagonalLattice self, double length) -> HexagonalLattice
-
         HexagonalLattice::HexagonalLattice(double length, double rotation_angle=0.0)
 
         """
-        this = _libBornAgainCore.new_HexagonalLattice(length, rotation_angle)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.HexagonalLattice_swiginit(self, _libBornAgainCore.new_HexagonalLattice(length, rotation_angle))
 
     def clone(self):
-        """
+        r"""
         clone(HexagonalLattice self) -> HexagonalLattice
-
         HexagonalLattice * HexagonalLattice::clone() const
 
         """
         return _libBornAgainCore.HexagonalLattice_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(HexagonalLattice self, INodeVisitor visitor)
-
         void HexagonalLattice::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -24322,53 +19345,44 @@ class HexagonalLattice(Lattice2D):
         """
         return _libBornAgainCore.HexagonalLattice_accept(self, visitor)
 
-
     def length1(self):
-        """
+        r"""
         length1(HexagonalLattice self) -> double
-
         virtual double HexagonalLattice::length1() const
 
         """
         return _libBornAgainCore.HexagonalLattice_length1(self)
 
-
     def length2(self):
-        """
+        r"""
         length2(HexagonalLattice self) -> double
-
         virtual double HexagonalLattice::length2() const
 
         """
         return _libBornAgainCore.HexagonalLattice_length2(self)
 
-
     def latticeAngle(self):
-        """
+        r"""
         latticeAngle(HexagonalLattice self) -> double
-
         double HexagonalLattice::latticeAngle() const
 
         """
         return _libBornAgainCore.HexagonalLattice_latticeAngle(self)
 
-
     def unitCellArea(self):
-        """
+        r"""
         unitCellArea(HexagonalLattice self) -> double
-
         double HexagonalLattice::unitCellArea() const
 
         """
         return _libBornAgainCore.HexagonalLattice_unitCellArea(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_HexagonalLattice
-    __del__ = lambda self: None
-HexagonalLattice_swigregister = _libBornAgainCore.HexagonalLattice_swigregister
-HexagonalLattice_swigregister(HexagonalLattice)
+
+# Register HexagonalLattice in _libBornAgainCore:
+_libBornAgainCore.HexagonalLattice_swigregister(HexagonalLattice)
 
 class Layer(ISample):
-    """
+    r"""
 
 
     A layer, with thickness (in nanometer) and material.
@@ -24377,21 +19391,12 @@ class Layer(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Layer, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Layer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, material, thickness=0):
-        """
+        r"""
         __init__(Layer self, Material material, double thickness=0) -> Layer
-        __init__(Layer self, Material material) -> Layer
-
         Layer::Layer(Material material, double thickness=0)
 
         Constructor of a layer with thickness and material
@@ -24406,18 +19411,12 @@ class Layer(ISample):
         thickness of a layer in nanometers 
 
         """
-        this = _libBornAgainCore.new_Layer(material, thickness)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Layer_swiginit(self, _libBornAgainCore.new_Layer(material, thickness))
     __swig_destroy__ = _libBornAgainCore.delete_Layer
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(Layer self) -> Layer
-
         Layer * Layer::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -24425,11 +19424,9 @@ class Layer(ISample):
         """
         return _libBornAgainCore.Layer_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(Layer self, INodeVisitor visitor)
-
         void Layer::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -24437,11 +19434,9 @@ class Layer(ISample):
         """
         return _libBornAgainCore.Layer_accept(self, visitor)
 
-
     def setThickness(self, thickness):
-        """
+        r"""
         setThickness(Layer self, double thickness)
-
         void Layer::setThickness(double thickness)
 
         Sets layer thickness in nanometers. 
@@ -24449,21 +19444,17 @@ class Layer(ISample):
         """
         return _libBornAgainCore.Layer_setThickness(self, thickness)
 
-
     def thickness(self):
-        """
+        r"""
         thickness(Layer self) -> double
-
         double Layer::thickness() const
 
         """
         return _libBornAgainCore.Layer_thickness(self)
 
-
     def material(self):
-        """
+        r"""
         material(Layer self) -> Material
-
         const Material* Layer::material() const override final
 
         Returns nullptr, unless overwritten to return a specific material. 
@@ -24471,51 +19462,41 @@ class Layer(ISample):
         """
         return _libBornAgainCore.Layer_material(self)
 
-
     def setMaterial(self, material):
-        """
+        r"""
         setMaterial(Layer self, Material material)
-
         void Layer::setMaterial(Material material)
 
         """
         return _libBornAgainCore.Layer_setMaterial(self, material)
 
-
     def addLayout(self, decoration):
-        """
+        r"""
         addLayout(Layer self, ILayout decoration)
-
         void Layer::addLayout(const ILayout &decoration)
 
         """
         return _libBornAgainCore.Layer_addLayout(self, decoration)
 
-
     def numberOfLayouts(self):
-        """
+        r"""
         numberOfLayouts(Layer self) -> size_t
-
         size_t Layer::numberOfLayouts() const
 
         """
         return _libBornAgainCore.Layer_numberOfLayouts(self)
 
-
     def layouts(self):
-        """
+        r"""
         layouts(Layer self) -> std::vector< ILayout const *,std::allocator< ILayout const * > >
-
         std::vector< const ILayout * > Layer::layouts() const
 
         """
         return _libBornAgainCore.Layer_layouts(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Layer self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Layer::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -24523,42 +19504,35 @@ class Layer(ISample):
         """
         return _libBornAgainCore.Layer_getChildren(self)
 
-
     def registerThickness(self, make_registered=True):
-        """
+        r"""
         registerThickness(Layer self, bool make_registered=True)
-        registerThickness(Layer self)
-
         void Layer::registerThickness(bool make_registered=true)
 
         """
         return _libBornAgainCore.Layer_registerThickness(self, make_registered)
 
-
     def setNumberOfSlices(self, n_slices):
-        """
+        r"""
         setNumberOfSlices(Layer self, unsigned int n_slices)
-
         void Layer::setNumberOfSlices(unsigned int n_slices)
 
         """
         return _libBornAgainCore.Layer_setNumberOfSlices(self, n_slices)
 
-
     def numberOfSlices(self):
-        """
+        r"""
         numberOfSlices(Layer self) -> unsigned int
-
         unsigned int Layer::numberOfSlices() const
 
         """
         return _libBornAgainCore.Layer_numberOfSlices(self)
 
-Layer_swigregister = _libBornAgainCore.Layer_swigregister
-Layer_swigregister(Layer)
+# Register Layer in _libBornAgainCore:
+_libBornAgainCore.Layer_swigregister(Layer)
 
 class LayerRoughness(ISample):
-    """
+    r"""
 
 
     A roughness of interface between two layers.
@@ -24569,21 +19543,13 @@ class LayerRoughness(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, LayerRoughness, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, LayerRoughness, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(LayerRoughness self) -> LayerRoughness
         __init__(LayerRoughness self, double sigma, double hurstParameter, double lateralCorrLength) -> LayerRoughness
-
         LayerRoughness::LayerRoughness(double sigma, double hurstParameter, double lateralCorrLength)
 
         Constructor of layer roughness.
@@ -24601,16 +19567,11 @@ class LayerRoughness(ISample):
         lateral correlation length of the roughness in nanometers 
 
         """
-        this = _libBornAgainCore.new_LayerRoughness(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.LayerRoughness_swiginit(self, _libBornAgainCore.new_LayerRoughness(*args))
 
     def clone(self):
-        """
+        r"""
         clone(LayerRoughness self) -> LayerRoughness
-
         LayerRoughness* LayerRoughness::clone() const
 
         Returns a clone of this  ISample object. 
@@ -24618,11 +19579,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(LayerRoughness self, INodeVisitor visitor)
-
         virtual void LayerRoughness::accept(INodeVisitor *visitor) const
 
         Calls the  INodeVisitor's visit method. 
@@ -24630,11 +19589,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_accept(self, visitor)
 
-
     def getSpectralFun(self, kvec):
-        """
+        r"""
         getSpectralFun(LayerRoughness self, kvector_t kvec) -> double
-
         double LayerRoughness::getSpectralFun(const kvector_t kvec) const
 
         Returns power spectral density of the surface roughness.
@@ -24646,11 +19603,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_getSpectralFun(self, kvec)
 
-
     def getCorrFun(self, k):
-        """
+        r"""
         getCorrFun(LayerRoughness self, kvector_t k) -> double
-
         double LayerRoughness::getCorrFun(const kvector_t k) const
 
         Correlation function of the roughness profile. 
@@ -24658,11 +19613,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_getCorrFun(self, k)
 
-
     def setSigma(self, sigma):
-        """
+        r"""
         setSigma(LayerRoughness self, double sigma)
-
         void LayerRoughness::setSigma(double sigma)
 
         Sets rms of roughness. 
@@ -24670,11 +19623,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_setSigma(self, sigma)
 
-
     def getSigma(self):
-        """
+        r"""
         getSigma(LayerRoughness self) -> double
-
         double LayerRoughness::getSigma() const
 
         Returns rms of roughness. 
@@ -24682,11 +19633,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_getSigma(self)
 
-
     def setHurstParameter(self, hurstParameter):
-        """
+        r"""
         setHurstParameter(LayerRoughness self, double hurstParameter)
-
         void LayerRoughness::setHurstParameter(double hurstParameter)
 
         Sets hurst parameter. It describes how jagged the surface is. 
@@ -24694,11 +19643,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_setHurstParameter(self, hurstParameter)
 
-
     def getHurstParameter(self):
-        """
+        r"""
         getHurstParameter(LayerRoughness self) -> double
-
         double LayerRoughness::getHurstParameter() const
 
         Returns hurst parameter. 
@@ -24706,11 +19653,9 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_getHurstParameter(self)
 
-
     def setLatteralCorrLength(self, lateralCorrLength):
-        """
+        r"""
         setLatteralCorrLength(LayerRoughness self, double lateralCorrLength)
-
         void LayerRoughness::setLatteralCorrLength(double lateralCorrLength)
 
         Sets lateral correlation length. 
@@ -24718,25 +19663,22 @@ class LayerRoughness(ISample):
         """
         return _libBornAgainCore.LayerRoughness_setLatteralCorrLength(self, lateralCorrLength)
 
-
     def getLatteralCorrLength(self):
-        """
+        r"""
         getLatteralCorrLength(LayerRoughness self) -> double
-
         double LayerRoughness::getLatteralCorrLength() const
 
         Returns lateral correlation length. 
 
         """
         return _libBornAgainCore.LayerRoughness_getLatteralCorrLength(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_LayerRoughness
-    __del__ = lambda self: None
-LayerRoughness_swigregister = _libBornAgainCore.LayerRoughness_swigregister
-LayerRoughness_swigregister(LayerRoughness)
+
+# Register LayerRoughness in _libBornAgainCore:
+_libBornAgainCore.LayerRoughness_swigregister(LayerRoughness)
 
 class Line(IShape2D):
-    """
+    r"""
 
 
     A line segment.
@@ -24745,58 +19687,42 @@ class Line(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Line, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Line, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, x1, y1, x2, y2):
-        """
+        r"""
         __init__(Line self, double x1, double y1, double x2, double y2) -> Line
-
         Line::Line(double x1, double y1, double x2, double y2)
 
         """
-        this = _libBornAgainCore.new_Line(x1, y1, x2, y2)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Line_swiginit(self, _libBornAgainCore.new_Line(x1, y1, x2, y2))
 
     def clone(self):
-        """
+        r"""
         clone(Line self) -> Line
-
         Line* Line::clone() const
 
         """
         return _libBornAgainCore.Line_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(Line self, double x, double y) -> bool
         contains(Line self, Bin1D binx, Bin1D biny) -> bool
-
         bool Line::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
 
         """
         return _libBornAgainCore.Line_contains(self, *args)
-
     __swig_destroy__ = _libBornAgainCore.delete_Line
-    __del__ = lambda self: None
-Line_swigregister = _libBornAgainCore.Line_swigregister
-Line_swigregister(Line)
+
+# Register Line in _libBornAgainCore:
+_libBornAgainCore.Line_swigregister(Line)
 
 class VerticalLine(IShape2D):
-    """
+    r"""
 
 
     An infinite vertical line.
@@ -24805,20 +19731,12 @@ class VerticalLine(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VerticalLine, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VerticalLine, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, x):
-        """
+        r"""
         __init__(VerticalLine self, double x) -> VerticalLine
-
         VerticalLine::VerticalLine(double x)
 
         Parameters:
@@ -24828,27 +19746,20 @@ class VerticalLine(IShape2D):
         The value at which it crosses x-axes 
 
         """
-        this = _libBornAgainCore.new_VerticalLine(x)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.VerticalLine_swiginit(self, _libBornAgainCore.new_VerticalLine(x))
 
     def clone(self):
-        """
+        r"""
         clone(VerticalLine self) -> VerticalLine
-
         VerticalLine* VerticalLine::clone() const
 
         """
         return _libBornAgainCore.VerticalLine_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(VerticalLine self, double x, double y) -> bool
         contains(VerticalLine self, Bin1D binx, Bin1D biny) -> bool
-
         bool VerticalLine::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
@@ -24856,23 +19767,20 @@ class VerticalLine(IShape2D):
         """
         return _libBornAgainCore.VerticalLine_contains(self, *args)
 
-
     def getXpos(self):
-        """
+        r"""
         getXpos(VerticalLine self) -> double
-
         double VerticalLine::getXpos() const
 
         """
         return _libBornAgainCore.VerticalLine_getXpos(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_VerticalLine
-    __del__ = lambda self: None
-VerticalLine_swigregister = _libBornAgainCore.VerticalLine_swigregister
-VerticalLine_swigregister(VerticalLine)
+
+# Register VerticalLine in _libBornAgainCore:
+_libBornAgainCore.VerticalLine_swigregister(VerticalLine)
 
 class HorizontalLine(IShape2D):
-    """
+    r"""
 
 
     An infinite horizontal line.
@@ -24881,20 +19789,12 @@ class HorizontalLine(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, HorizontalLine, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, HorizontalLine, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, y):
-        """
+        r"""
         __init__(HorizontalLine self, double y) -> HorizontalLine
-
         HorizontalLine::HorizontalLine(double y)
 
         Parameters:
@@ -24904,27 +19804,20 @@ class HorizontalLine(IShape2D):
         The value at which it crosses y-axes 
 
         """
-        this = _libBornAgainCore.new_HorizontalLine(y)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.HorizontalLine_swiginit(self, _libBornAgainCore.new_HorizontalLine(y))
 
     def clone(self):
-        """
+        r"""
         clone(HorizontalLine self) -> HorizontalLine
-
         HorizontalLine* HorizontalLine::clone() const
 
         """
         return _libBornAgainCore.HorizontalLine_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(HorizontalLine self, double x, double y) -> bool
         contains(HorizontalLine self, Bin1D binx, Bin1D biny) -> bool
-
         bool HorizontalLine::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
@@ -24932,23 +19825,20 @@ class HorizontalLine(IShape2D):
         """
         return _libBornAgainCore.HorizontalLine_contains(self, *args)
 
-
     def getYpos(self):
-        """
+        r"""
         getYpos(HorizontalLine self) -> double
-
         double HorizontalLine::getYpos() const
 
         """
         return _libBornAgainCore.HorizontalLine_getYpos(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_HorizontalLine
-    __del__ = lambda self: None
-HorizontalLine_swigregister = _libBornAgainCore.HorizontalLine_swigregister
-HorizontalLine_swigregister(HorizontalLine)
 
-class Material(_object):
-    """
+# Register HorizontalLine in _libBornAgainCore:
+_libBornAgainCore.HorizontalLine_swigregister(HorizontalLine)
+
+class Material(object):
+    r"""
 
 
     A wrapper for underlying material implementation
@@ -24957,32 +19847,23 @@ class Material(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Material, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Material, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Material self, Material material) -> Material
         __init__(Material self, Material material) -> Material
-
         Material::Material(std::unique_ptr< BaseMaterialImpl > material_impl)
 
         Creates material with particular material implementation. 
 
         """
-        this = _libBornAgainCore.new_Material(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Material_swiginit(self, _libBornAgainCore.new_Material(*args))
 
     def inverted(self):
-        """
+        r"""
         inverted(Material self) -> Material
-
         Material Material::inverted() const
 
         Constructs a material with inverted magnetization. 
@@ -24990,11 +19871,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_inverted(self)
 
-
     def refractiveIndex(self, wavelength):
-        """
+        r"""
         refractiveIndex(Material self, double wavelength) -> complex_t
-
         complex_t Material::refractiveIndex(double wavelength) const
 
         Returns refractive index. 
@@ -25002,11 +19881,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_refractiveIndex(self, wavelength)
 
-
     def refractiveIndex2(self, wavelength):
-        """
+        r"""
         refractiveIndex2(Material self, double wavelength) -> complex_t
-
         complex_t Material::refractiveIndex2(double wavelength) const
 
         Returns squared refractive index. 
@@ -25014,11 +19891,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_refractiveIndex2(self, wavelength)
 
-
     def isScalarMaterial(self):
-        """
+        r"""
         isScalarMaterial(Material self) -> bool
-
         bool Material::isScalarMaterial() const
 
         Indicates whether the interaction with the material is scalar. This means that different polarization states will be diffracted equally 
@@ -25026,21 +19901,17 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_isScalarMaterial(self)
 
-
     def isMagneticMaterial(self):
-        """
+        r"""
         isMagneticMaterial(Material self) -> bool
-
         bool Material::isMagneticMaterial() const
 
         """
         return _libBornAgainCore.Material_isMagneticMaterial(self)
 
-
     def getName(self):
-        """
+        r"""
         getName(Material self) -> std::string
-
         std::string Material::getName() const
 
         Returns the name of material. 
@@ -25048,11 +19919,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_getName(self)
 
-
     def magnetization(self):
-        """
+        r"""
         magnetization(Material self) -> kvector_t
-
         kvector_t Material::magnetization() const
 
         Get the magnetization (in A/m) 
@@ -25060,11 +19929,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_magnetization(self)
 
-
     def materialData(self):
-        """
+        r"""
         materialData(Material self) -> complex_t
-
         complex_t Material::materialData() const
 
         Returns underlying material data. The units of returned values are the same as the ones passed to material factory functions 
@@ -25072,11 +19939,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_materialData(self)
 
-
     def isEmpty(self):
-        """
+        r"""
         isEmpty(Material self) -> bool
-
         bool Material::isEmpty() const
 
         Returns true if material underlying data is nullptr. 
@@ -25084,11 +19949,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_isEmpty(self)
 
-
     def isDefaultMaterial(self):
-        """
+        r"""
         isDefaultMaterial(Material self) -> bool
-
         bool Material::isDefaultMaterial() const
 
         Returns true if material has refractive index of (1.0, 0.0) and zero magnetization. 
@@ -25096,11 +19959,9 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_isDefaultMaterial(self)
 
-
     def scalarSubtrSLD(self, wavevectors):
-        """
+        r"""
         scalarSubtrSLD(Material self, WavevectorInfo wavevectors) -> complex_t
-
         complex_t Material::scalarSubtrSLD(const WavevectorInfo &wavevectors) const
 
         Returns (  $ \\pi/\\lambda^2 $ - sld), sld (in  $nm^{-2}$) being the scattering length density. 
@@ -25108,30 +19969,24 @@ class Material(_object):
         """
         return _libBornAgainCore.Material_scalarSubtrSLD(self, wavevectors)
 
-
     def transformedMaterial(self, transform):
-        """
+        r"""
         transformedMaterial(Material self, Transform3D const & transform) -> Material
-
         Material Material::transformedMaterial(const Transform3D &transform) const
 
         """
         return _libBornAgainCore.Material_transformedMaterial(self, transform)
-
     __swig_destroy__ = _libBornAgainCore.delete_Material
-    __del__ = lambda self: None
-Material_swigregister = _libBornAgainCore.Material_swigregister
-Material_swigregister(Material)
+
+# Register Material in _libBornAgainCore:
+_libBornAgainCore.Material_swigregister(Material)
 
 
 def HomogeneousMaterial(*args):
-    """
+    r"""
     HomogeneousMaterial() -> Material
-    HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization) -> Material
-    HomogeneousMaterial(std::string const & name, double delta, double beta) -> Material
-    HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material
-    HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material
-
+    HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization=kvector_t()) -> Material
+    HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization=kvector_t()) -> Material
     BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())
 
     Constructs a material with  name,  refractive_index and  magnetization (in A/m). Alternatively,  $\\delta$ and  $\\beta$ for refractive index  $n = 1 - \\delta + i \\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with  $n = 1$ and zero magnetization. 
@@ -25140,11 +19995,9 @@ def HomogeneousMaterial(*args):
     return _libBornAgainCore.HomogeneousMaterial(*args)
 
 def MaterialBySLD(*args):
-    """
+    r"""
     MaterialBySLD() -> Material
-    MaterialBySLD(std::string const & name, double sld_real, double sld_imag, kvector_t magnetization) -> Material
-    MaterialBySLD(std::string const & name, double sld_real, double sld_imag) -> Material
-
+    MaterialBySLD(std::string const & name, double sld_real, double sld_imag, kvector_t magnetization=kvector_t()) -> Material
     BA_CORE_API_ Material MaterialBySLD(const std::string &name, double sld_real, double sld_imag, kvector_t magnetization=kvector_t())
 
     Constructs a wavelength-independent material with a given complex-valued scattering length density (SLD). SLD values for a wide variety of materials can be found on https://sld-calculator.appspot.com/ and https://www.ncnr.nist.gov/resources/activation/ By convention, SLD imaginary part is treated as negative by default, which corresponds to attenuation of the signal. With no parameters given, MaterialBySLD constructs default (vacuum) material with zero sld and zero magnetization.
@@ -25167,7 +20020,7 @@ def MaterialBySLD(*args):
     """
     return _libBornAgainCore.MaterialBySLD(*args)
 class MesoCrystal(IParticle):
-    """
+    r"""
 
 
     A particle with an internal structure of smaller particles.
@@ -25176,35 +20029,21 @@ class MesoCrystal(IParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MesoCrystal, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, MesoCrystal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, particle_structure, form_factor):
-        """
+        r"""
         __init__(MesoCrystal self, IClusteredParticles particle_structure, IFormFactor form_factor) -> MesoCrystal
-
         MesoCrystal::MesoCrystal(const IClusteredParticles &particle_structure, const IFormFactor &form_factor)
 
         """
-        this = _libBornAgainCore.new_MesoCrystal(particle_structure, form_factor)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.MesoCrystal_swiginit(self, _libBornAgainCore.new_MesoCrystal(particle_structure, form_factor))
     __swig_destroy__ = _libBornAgainCore.delete_MesoCrystal
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(MesoCrystal self) -> MesoCrystal
-
         MesoCrystal * MesoCrystal::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -25212,11 +20051,9 @@ class MesoCrystal(IParticle):
         """
         return _libBornAgainCore.MesoCrystal_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(MesoCrystal self, INodeVisitor visitor)
-
         void MesoCrystal::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -25224,11 +20061,9 @@ class MesoCrystal(IParticle):
         """
         return _libBornAgainCore.MesoCrystal_accept(self, visitor)
 
-
     def createSlicedParticle(self, limits):
-        """
+        r"""
         createSlicedParticle(MesoCrystal self, ZLimits limits) -> SlicedParticle
-
         SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const override final
 
         Create a sliced form factor for this particle. 
@@ -25236,11 +20071,9 @@ class MesoCrystal(IParticle):
         """
         return _libBornAgainCore.MesoCrystal_createSlicedParticle(self, limits)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(MesoCrystal self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > MesoCrystal::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -25248,11 +20081,11 @@ class MesoCrystal(IParticle):
         """
         return _libBornAgainCore.MesoCrystal_getChildren(self)
 
-MesoCrystal_swigregister = _libBornAgainCore.MesoCrystal_swigregister
-MesoCrystal_swigregister(MesoCrystal)
+# Register MesoCrystal in _libBornAgainCore:
+_libBornAgainCore.MesoCrystal_swigregister(MesoCrystal)
 
 class MultiLayer(ISample):
-    """
+    r"""
 
 
     Our sample model: a stack of layers one below the other. Example of system of 4 layers (3 interfaces):
@@ -25263,35 +20096,21 @@ class MultiLayer(ISample):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ISample]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MultiLayer, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ISample]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, MultiLayer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(MultiLayer self) -> MultiLayer
-
         MultiLayer::MultiLayer()
 
         """
-        this = _libBornAgainCore.new_MultiLayer()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.MultiLayer_swiginit(self, _libBornAgainCore.new_MultiLayer())
     __swig_destroy__ = _libBornAgainCore.delete_MultiLayer
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(MultiLayer self) -> MultiLayer
-
         MultiLayer * MultiLayer::clone() const final override
 
         Returns a clone of multilayer with clones of all layers and interfaces between layers 
@@ -25299,11 +20118,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(MultiLayer self, INodeVisitor visitor)
-
         void MultiLayer::accept(INodeVisitor *visitor) const final override
 
         Calls the  INodeVisitor's visit method. 
@@ -25311,21 +20128,17 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_accept(self, visitor)
 
-
     def numberOfLayers(self):
-        """
+        r"""
         numberOfLayers(MultiLayer self) -> size_t
-
         size_t MultiLayer::numberOfLayers() const
 
         """
         return _libBornAgainCore.MultiLayer_numberOfLayers(self)
 
-
     def addLayer(self, layer):
-        """
+        r"""
         addLayer(MultiLayer self, Layer layer)
-
         void MultiLayer::addLayer(const Layer &layer)
 
         Adds object to multilayer.
@@ -25335,11 +20148,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_addLayer(self, layer)
 
-
     def addLayerWithTopRoughness(self, layer, roughness):
-        """
+        r"""
         addLayerWithTopRoughness(MultiLayer self, Layer layer, LayerRoughness roughness)
-
         void MultiLayer::addLayerWithTopRoughness(const Layer &layer, const LayerRoughness &roughness)
 
         Adds layer with top roughness. 
@@ -25347,11 +20158,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_addLayerWithTopRoughness(self, layer, roughness)
 
-
     def layer(self, i_layer):
-        """
+        r"""
         layer(MultiLayer self, size_t i_layer) -> Layer
-
         const Layer * MultiLayer::layer(size_t i_layer) const
 
         Returns layer with given index. 
@@ -25359,11 +20168,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_layer(self, i_layer)
 
-
     def layerInterface(self, i_interface):
-        """
+        r"""
         layerInterface(MultiLayer self, size_t i_interface) -> LayerInterface const *
-
         const LayerInterface * MultiLayer::layerInterface(size_t i_interface) const
 
         Returns interface with given index. 
@@ -25371,11 +20178,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_layerInterface(self, i_interface)
 
-
     def setCrossCorrLength(self, crossCorrLength):
-        """
+        r"""
         setCrossCorrLength(MultiLayer self, double crossCorrLength)
-
         void MultiLayer::setCrossCorrLength(double crossCorrLength)
 
         Sets cross correlation length of roughnesses between interfaces. 
@@ -25383,11 +20188,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_setCrossCorrLength(self, crossCorrLength)
 
-
     def crossCorrLength(self):
-        """
+        r"""
         crossCorrLength(MultiLayer self) -> double
-
         double MultiLayer::crossCorrLength() const
 
         Returns cross correlation length of roughnesses between interfaces. 
@@ -25395,11 +20198,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_crossCorrLength(self)
 
-
     def setExternalField(self, ext_field):
-        """
+        r"""
         setExternalField(MultiLayer self, kvector_t ext_field)
-
         void MultiLayer::setExternalField(kvector_t ext_field)
 
         Sets the external field applied to the multilayer (units: A/m) 
@@ -25407,11 +20208,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_setExternalField(self, ext_field)
 
-
     def externalField(self):
-        """
+        r"""
         externalField(MultiLayer self) -> kvector_t
-
         kvector_t MultiLayer::externalField() const
 
         Returns the external field applied to the multilayer (units: A/m) 
@@ -25419,11 +20218,9 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_externalField(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(MultiLayer self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > MultiLayer::getChildren() const final override
 
         Returns a vector of children (const). 
@@ -25431,34 +20228,29 @@ class MultiLayer(ISample):
         """
         return _libBornAgainCore.MultiLayer_getChildren(self)
 
-
     def setRoughnessModel(self, roughnessModel):
-        """
+        r"""
         setRoughnessModel(MultiLayer self, RoughnessModel roughnessModel)
-
         void MultiLayer::setRoughnessModel(RoughnessModel roughnessModel)
 
         """
         return _libBornAgainCore.MultiLayer_setRoughnessModel(self, roughnessModel)
 
-
     def roughnessModel(self):
-        """
+        r"""
         roughnessModel(MultiLayer self) -> RoughnessModel
-
         RoughnessModel MultiLayer::roughnessModel() const
 
         """
         return _libBornAgainCore.MultiLayer_roughnessModel(self)
 
-MultiLayer_swigregister = _libBornAgainCore.MultiLayer_swigregister
-MultiLayer_swigregister(MultiLayer)
+# Register MultiLayer in _libBornAgainCore:
+_libBornAgainCore.MultiLayer_swigregister(MultiLayer)
 
 
 def MaterialProfile_cpp(multilayer, n_points, z_min, z_max):
-    """
+    r"""
     MaterialProfile_cpp(MultiLayer multilayer, int n_points, double z_min, double z_max) -> vector_complex_t
-
     BA_CORE_API_ std::vector<complex_t> MaterialProfile(const MultiLayer &multilayer, int n_points, double z_min, double z_max)
 
     Calculate average material profile for given multilayer. 
@@ -25467,9 +20259,8 @@ def MaterialProfile_cpp(multilayer, n_points, z_min, z_max):
     return _libBornAgainCore.MaterialProfile_cpp(multilayer, n_points, z_min, z_max)
 
 def DefaultMaterialProfileLimits(multilayer):
-    """
+    r"""
     DefaultMaterialProfileLimits(MultiLayer multilayer) -> pair_double_t
-
     BA_CORE_API_ std::pair<double, double> DefaultMaterialProfileLimits(const MultiLayer &multilayer)
 
     Get default z limits for generating a material profile. 
@@ -25478,9 +20269,8 @@ def DefaultMaterialProfileLimits(multilayer):
     return _libBornAgainCore.DefaultMaterialProfileLimits(multilayer)
 
 def GenerateZValues(n_points, z_min, z_max):
-    """
+    r"""
     GenerateZValues(int n_points, double z_min, double z_max) -> vdouble1d_t
-
     BA_CORE_API_ std::vector<double> GenerateZValues(int n_points, double z_min, double z_max)
 
     Generate z values (equidistant) for use in MaterialProfile. 
@@ -25488,7 +20278,7 @@ def GenerateZValues(n_points, z_min, z_max):
     """
     return _libBornAgainCore.GenerateZValues(n_points, z_min, z_max)
 class OffSpecSimulation(Simulation2D):
-    """
+    r"""
 
 
     Main class to run an off-specular simulation.
@@ -25497,47 +20287,31 @@ class OffSpecSimulation(Simulation2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [Simulation2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, OffSpecSimulation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Simulation2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, OffSpecSimulation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(OffSpecSimulation self) -> OffSpecSimulation
         __init__(OffSpecSimulation self, MultiLayer p_sample) -> OffSpecSimulation
         __init__(OffSpecSimulation self, std::shared_ptr< IMultiLayerBuilder > const p_sample_builder) -> OffSpecSimulation
-
         OffSpecSimulation::OffSpecSimulation(const std::shared_ptr< class IMultiLayerBuilder > p_sample_builder)
 
         """
-        this = _libBornAgainCore.new_OffSpecSimulation(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.OffSpecSimulation_swiginit(self, _libBornAgainCore.new_OffSpecSimulation(*args))
     __swig_destroy__ = _libBornAgainCore.delete_OffSpecSimulation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(OffSpecSimulation self) -> OffSpecSimulation
-
         OffSpecSimulation* OffSpecSimulation::clone() const override
 
         """
         return _libBornAgainCore.OffSpecSimulation_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(OffSpecSimulation self, INodeVisitor visitor)
-
         void OffSpecSimulation::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -25545,11 +20319,9 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_accept(self, visitor)
 
-
     def prepareSimulation(self):
-        """
+        r"""
         prepareSimulation(OffSpecSimulation self)
-
         void OffSpecSimulation::prepareSimulation() final
 
         Put into a clean state for running a simulation. 
@@ -25557,11 +20329,9 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_prepareSimulation(self)
 
-
     def result(self):
-        """
+        r"""
         result(OffSpecSimulation self) -> SimulationResult
-
         SimulationResult OffSpecSimulation::result() const override
 
         Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays 
@@ -25569,11 +20339,9 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_result(self)
 
-
     def setBeamParameters(self, wavelength, alpha_axis, phi_i):
-        """
+        r"""
         setBeamParameters(OffSpecSimulation self, double wavelength, IAxis alpha_axis, double phi_i)
-
         void OffSpecSimulation::setBeamParameters(double wavelength, const IAxis &alpha_axis, double phi_i)
 
         Sets beam parameters from here (forwarded to  Instrument) 
@@ -25581,11 +20349,9 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_setBeamParameters(self, wavelength, alpha_axis, phi_i)
 
-
     def beamAxis(self):
-        """
+        r"""
         beamAxis(OffSpecSimulation self) -> IAxis
-
         const IAxis * OffSpecSimulation::beamAxis() const
 
         Returns axis of the beam. 
@@ -25593,11 +20359,9 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_beamAxis(self)
 
-
     def intensityMapSize(self):
-        """
+        r"""
         intensityMapSize(OffSpecSimulation self) -> size_t
-
         size_t OffSpecSimulation::intensityMapSize() const override
 
         Returns the total number of the intensity values in the simulation result. 
@@ -25605,11 +20369,11 @@ class OffSpecSimulation(Simulation2D):
         """
         return _libBornAgainCore.OffSpecSimulation_intensityMapSize(self)
 
-OffSpecSimulation_swigregister = _libBornAgainCore.OffSpecSimulation_swigregister
-OffSpecSimulation_swigregister(OffSpecSimulation)
+# Register OffSpecSimulation in _libBornAgainCore:
+_libBornAgainCore.OffSpecSimulation_swigregister(OffSpecSimulation)
 
-class IntensityData(_object):
-    """
+class IntensityData(object):
+    r"""
 
 
     Template class to store data of any type in multi-dimensional space.
@@ -25618,73 +20382,55 @@ class IntensityData(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityData, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IntensityData, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(OutputData<(double)> self) -> IntensityData
-
+        r"""
+        __init__(IntensityData self) -> IntensityData
         OutputData< T >::OutputData(const OutputData &)=delete
 
         """
-        this = _libBornAgainCore.new_IntensityData()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IntensityData_swiginit(self, _libBornAgainCore.new_IntensityData())
     __swig_destroy__ = _libBornAgainCore.delete_IntensityData
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IntensityData self) -> IntensityData
-
         OutputData< T > * OutputData< T >::clone() const
 
         """
         return _libBornAgainCore.IntensityData_clone(self)
 
-
     def copyFrom(self, x):
-        """
+        r"""
         copyFrom(IntensityData self, IntensityData x)
-
         void OutputData< T >::copyFrom(const OutputData< T > &x)
 
         """
         return _libBornAgainCore.IntensityData_copyFrom(self, x)
 
-
     def meanValues(self):
-        """
+        r"""
         meanValues(IntensityData self) -> IntensityData
-
         OutputData< double > * OutputData< T >::meanValues() const
 
         """
         return _libBornAgainCore.IntensityData_meanValues(self)
 
-
     def addAxis(self, *args):
-        """
+        r"""
         addAxis(IntensityData self, IAxis new_axis)
         addAxis(IntensityData self, std::string const & name, size_t size, double start, double end)
-
         void OutputData< T >::addAxis(const std::string &name, size_t size, double start, double end)
 
         """
         return _libBornAgainCore.IntensityData_addAxis(self, *args)
 
-
     def getAxis(self, *args):
-        """
+        r"""
         getAxis(IntensityData self, size_t serial_number) -> IAxis
         getAxis(IntensityData self, std::string const & axis_name) -> IAxis
-
         const IAxis & OutputData< T >::getAxis(const std::string &axis_name) const
 
         returns axis with given name 
@@ -25692,11 +20438,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxis(self, *args)
 
-
     def getRank(self):
-        """
+        r"""
         getRank(IntensityData self) -> size_t
-
         size_t OutputData< T >::getRank() const
 
         Returns number of dimensions. 
@@ -25704,11 +20448,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getRank(self)
 
-
     def getAllocatedSize(self):
-        """
+        r"""
         getAllocatedSize(IntensityData self) -> size_t
-
         size_t OutputData< T >::getAllocatedSize() const
 
         Returns total size of data buffer (product of bin number in every dimension). 
@@ -25716,11 +20458,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAllocatedSize(self)
 
-
     def getAllSizes(self):
-        """
+        r"""
         getAllSizes(IntensityData self) -> std::vector< size_t,std::allocator< size_t > >
-
         std::vector< size_t > OutputData< T >::getAllSizes() const
 
         Returns all sizes of its axes. 
@@ -25728,11 +20468,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAllSizes(self)
 
-
     def getRawDataVector(self):
-        """
+        r"""
         getRawDataVector(IntensityData self) -> vdouble1d_t
-
         std::vector< T > OutputData< T >::getRawDataVector() const
 
         Returns copy of raw data vector. 
@@ -25740,11 +20478,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getRawDataVector(self)
 
-
     def totalSum(self):
-        """
+        r"""
         totalSum(IntensityData self) -> double
-
         T OutputData< T >::totalSum() const
 
         Returns sum of all values in the data structure. 
@@ -25752,12 +20488,10 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_totalSum(self)
 
-
     def begin(self, *args):
-        """
+        r"""
         begin(IntensityData self) -> OutputData< double >::iterator
         begin(IntensityData self) -> OutputData< double >::const_iterator
-
         const_iterator OutputData< T >::begin() const
 
         Returns read-only iterator that points to the first element. 
@@ -25765,12 +20499,10 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_begin(self, *args)
 
-
     def end(self, *args):
-        """
+        r"""
         end(IntensityData self) -> OutputData< double >::iterator
         end(IntensityData self) -> OutputData< double >::const_iterator
-
         const_iterator OutputData< T >::end() const
 
         Returns read-only iterator that points to the one past last element. 
@@ -25778,11 +20510,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_end(self, *args)
 
-
     def getAxesBinIndices(self, global_index):
-        """
+        r"""
         getAxesBinIndices(IntensityData self, size_t global_index) -> vector_integer_t
-
         std::vector< int > OutputData< T >::getAxesBinIndices(size_t global_index) const
 
         Returns vector of axes indices for given global index
@@ -25798,12 +20528,10 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxesBinIndices(self, global_index)
 
-
     def getAxisBinIndex(self, *args):
-        """
+        r"""
         getAxisBinIndex(IntensityData self, size_t global_index, size_t i_selected_axis) -> size_t
         getAxisBinIndex(IntensityData self, size_t global_index, std::string const & axis_name) -> size_t
-
         size_t OutputData< T >::getAxisBinIndex(size_t global_index, const std::string &axis_name) const
 
         Returns axis bin index for given global index
@@ -25822,11 +20550,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxisBinIndex(self, *args)
 
-
     def toGlobalIndex(self, axes_indices):
-        """
+        r"""
         toGlobalIndex(IntensityData self, std::vector< unsigned int,std::allocator< unsigned int > > const & axes_indices) -> size_t
-
         size_t OutputData< T >::toGlobalIndex(const std::vector< unsigned > &axes_indices) const
 
         Returns global index for specified indices of axes
@@ -25842,11 +20568,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_toGlobalIndex(self, axes_indices)
 
-
     def findGlobalIndex(self, coordinates):
-        """
+        r"""
         findGlobalIndex(IntensityData self, vdouble1d_t coordinates) -> size_t
-
         size_t OutputData< T >::findGlobalIndex(const std::vector< double > &coordinates) const
 
         Returns global index for specified axes values
@@ -25862,12 +20586,10 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_findGlobalIndex(self, coordinates)
 
-
     def getAxisValue(self, *args):
-        """
+        r"""
         getAxisValue(IntensityData self, size_t global_index, size_t i_selected_axis) -> double
         getAxisValue(IntensityData self, size_t global_index, std::string const & axis_name) -> double
-
         double OutputData< T >::getAxisValue(size_t global_index, const std::string &axis_name) const
 
         Returns the value of selected axis for given global_index.
@@ -25886,11 +20608,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxisValue(self, *args)
 
-
     def getAxesValues(self, global_index):
-        """
+        r"""
         getAxesValues(IntensityData self, size_t global_index) -> vdouble1d_t
-
         std::vector< double > OutputData< T >::getAxesValues(size_t global_index) const
 
         Returns values on all defined axes for given globalbin number
@@ -25906,12 +20626,10 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxesValues(self, global_index)
 
-
     def getAxisBin(self, *args):
-        """
+        r"""
         getAxisBin(IntensityData self, size_t global_index, size_t i_selected_axis) -> Bin1D
         getAxisBin(IntensityData self, size_t global_index, std::string const & axis_name) -> Bin1D
-
         Bin1D OutputData< T >::getAxisBin(size_t global_index, const std::string &axis_name) const
 
         Returns bin of selected axis for given global_index.
@@ -25930,11 +20648,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getAxisBin(self, *args)
 
-
     def clear(self):
-        """
+        r"""
         clear(IntensityData self)
-
         void OutputData< T >::clear()
 
         Sets object into initial state (no dimensions, data) 
@@ -25942,11 +20658,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_clear(self)
 
-
     def setAllTo(self, value):
-        """
+        r"""
         setAllTo(IntensityData self, double const & value)
-
         void OutputData< T >::setAllTo(const T &value)
 
         Sets content of output data to specific value. 
@@ -25954,11 +20668,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_setAllTo(self, value)
 
-
     def scaleAll(self, factor):
-        """
+        r"""
         scaleAll(IntensityData self, double const & factor)
-
         void OutputData< T >::scaleAll(const T &factor)
 
         multiply every item of this output data by value 
@@ -25966,11 +20678,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_scaleAll(self, factor)
 
-
     def setAxisSizes(self, rank, n_dims):
-        """
+        r"""
         setAxisSizes(IntensityData self, size_t rank, int * n_dims)
-
         void OutputData< T >::setAxisSizes(size_t rank, int *n_dims)
 
         Adds 'rank' axes with indicated sizes. 
@@ -25978,11 +20688,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_setAxisSizes(self, rank, n_dims)
 
-
     def setRawDataVector(self, data_vector):
-        """
+        r"""
         setRawDataVector(IntensityData self, vdouble1d_t data_vector)
-
         void OutputData< T >::setRawDataVector(const std::vector< T > &data_vector)
 
         Sets new values to raw data vector. 
@@ -25990,11 +20698,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_setRawDataVector(self, data_vector)
 
-
     def setRawDataArray(self, source):
-        """
+        r"""
         setRawDataArray(IntensityData self, double const * source)
-
         void OutputData< T >::setRawDataArray(const T *source)
 
         Sets new values to raw data array. 
@@ -26002,17 +20708,14 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_setRawDataArray(self, source)
 
-
     def __iadd__(self, right):
-        """__iadd__(IntensityData self, IntensityData right) -> IntensityData"""
+        r"""__iadd__(IntensityData self, IntensityData right) -> IntensityData"""
         return _libBornAgainCore.IntensityData___iadd__(self, right)
 
-
     def __isub__(self, right):
-        """__isub__(IntensityData self, IntensityData right) -> IntensityData"""
+        r"""__isub__(IntensityData self, IntensityData right) -> IntensityData"""
         return _libBornAgainCore.IntensityData___isub__(self, right)
 
-
     def __itruediv__(self, *args):
         return _libBornAgainCore.IntensityData___itruediv__(self, *args)
     __idiv__ = __itruediv__
@@ -26020,14 +20723,12 @@ class IntensityData(_object):
 
 
     def __imul__(self, right):
-        """__imul__(IntensityData self, IntensityData right) -> IntensityData"""
+        r"""__imul__(IntensityData self, IntensityData right) -> IntensityData"""
         return _libBornAgainCore.IntensityData___imul__(self, right)
 
-
     def getValue(self, index):
-        """
+        r"""
         getValue(IntensityData self, size_t index) -> double
-
         double OutputData< T >::getValue(size_t index) const
 
         Returns value or summed value, depending on T. 
@@ -26035,11 +20736,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getValue(self, index)
 
-
     def getArray(self):
-        """
+        r"""
         getArray(IntensityData self) -> PyObject *
-
         PyObject* OutputData< T >::getArray() const
 
         returns data as Python numpy array 
@@ -26047,11 +20746,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_getArray(self)
 
-
     def isInitialized(self):
-        """
+        r"""
         isInitialized(IntensityData self) -> bool
-
         bool OutputData< T >::isInitialized() const
 
         returns true if object is correctly initialized 
@@ -26059,11 +20756,9 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_isInitialized(self)
 
-
     def allocate(self):
-        """
+        r"""
         allocate(IntensityData self)
-
         void OutputData< T >::allocate()
 
         memory allocation for current dimensions configuration 
@@ -26071,65 +20766,45 @@ class IntensityData(_object):
         """
         return _libBornAgainCore.IntensityData_allocate(self)
 
-
     def __getitem__(self, i):
-        """__getitem__(IntensityData self, unsigned int i) -> double"""
+        r"""__getitem__(IntensityData self, unsigned int i) -> double"""
         return _libBornAgainCore.IntensityData___getitem__(self, i)
 
-
     def __setitem__(self, i, value):
-        """__setitem__(IntensityData self, unsigned int i, double value) -> double"""
+        r"""__setitem__(IntensityData self, unsigned int i, double value) -> double"""
         return _libBornAgainCore.IntensityData___setitem__(self, i, value)
 
-IntensityData_swigregister = _libBornAgainCore.IntensityData_swigregister
-IntensityData_swigregister(IntensityData)
+# Register IntensityData in _libBornAgainCore:
+_libBornAgainCore.IntensityData_swigregister(IntensityData)
 
 class ParameterDistribution(IParameterized):
-    """Proxy of C++ ParameterDistribution class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParameterDistribution, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParameterized]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParameterDistribution, name)
+    r"""Proxy of C++ ParameterDistribution class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(ParameterDistribution self, std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits) -> ParameterDistribution
-        __init__(ParameterDistribution self, std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0) -> ParameterDistribution
-        __init__(ParameterDistribution self, std::string const & par_name, IDistribution1D distribution, size_t nbr_samples) -> ParameterDistribution
+        r"""
+        __init__(ParameterDistribution self, std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits=RealLimits()) -> ParameterDistribution
         __init__(ParameterDistribution self, std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double xmin, double xmax) -> ParameterDistribution
         __init__(ParameterDistribution self, ParameterDistribution other) -> ParameterDistribution
-
         ParameterDistribution::ParameterDistribution(const ParameterDistribution &other)
 
         """
-        this = _libBornAgainCore.new_ParameterDistribution(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParameterDistribution_swiginit(self, _libBornAgainCore.new_ParameterDistribution(*args))
     __swig_destroy__ = _libBornAgainCore.delete_ParameterDistribution
-    __del__ = lambda self: None
 
     def linkParameter(self, par_name):
-        """
+        r"""
         linkParameter(ParameterDistribution self, std::string par_name) -> ParameterDistribution
-
         ParameterDistribution & ParameterDistribution::linkParameter(std::string par_name)
 
         """
         return _libBornAgainCore.ParameterDistribution_linkParameter(self, par_name)
 
-
     def getMainParameterName(self):
-        """
+        r"""
         getMainParameterName(ParameterDistribution self) -> std::string
-
         std::string ParameterDistribution::getMainParameterName() const
 
         get the main parameter's name 
@@ -26137,11 +20812,9 @@ class ParameterDistribution(IParameterized):
         """
         return _libBornAgainCore.ParameterDistribution_getMainParameterName(self)
 
-
     def getNbrSamples(self):
-        """
+        r"""
         getNbrSamples(ParameterDistribution self) -> size_t
-
         size_t ParameterDistribution::getNbrSamples() const
 
         get number of samples for this distribution 
@@ -26149,11 +20822,9 @@ class ParameterDistribution(IParameterized):
         """
         return _libBornAgainCore.ParameterDistribution_getNbrSamples(self)
 
-
     def getSigmaFactor(self):
-        """
+        r"""
         getSigmaFactor(ParameterDistribution self) -> double
-
         double ParameterDistribution::getSigmaFactor() const
 
         get the sigma factor 
@@ -26161,22 +20832,18 @@ class ParameterDistribution(IParameterized):
         """
         return _libBornAgainCore.ParameterDistribution_getSigmaFactor(self)
 
-
     def getDistribution(self, *args):
-        """
+        r"""
         getDistribution(ParameterDistribution self) -> IDistribution1D
         getDistribution(ParameterDistribution self) -> IDistribution1D
-
         IDistribution1D* ParameterDistribution::getDistribution()
 
         """
         return _libBornAgainCore.ParameterDistribution_getDistribution(self, *args)
 
-
     def generateSamples(self):
-        """
+        r"""
         generateSamples(ParameterDistribution self) -> ParameterSampleVector
-
         std::vector< ParameterSample > ParameterDistribution::generateSamples() const
 
         generate list of sampled values with their weight 
@@ -26184,11 +20851,9 @@ class ParameterDistribution(IParameterized):
         """
         return _libBornAgainCore.ParameterDistribution_generateSamples(self)
 
-
     def getLinkedParameterNames(self):
-        """
+        r"""
         getLinkedParameterNames(ParameterDistribution self) -> vector_string_t
-
         std::vector<std::string> ParameterDistribution::getLinkedParameterNames() const
 
         get list of linked parameter names 
@@ -26196,41 +20861,35 @@ class ParameterDistribution(IParameterized):
         """
         return _libBornAgainCore.ParameterDistribution_getLinkedParameterNames(self)
 
-
     def getLimits(self):
-        """
+        r"""
         getLimits(ParameterDistribution self) -> RealLimits
-
         RealLimits ParameterDistribution::getLimits() const
 
         """
         return _libBornAgainCore.ParameterDistribution_getLimits(self)
 
-
     def getMinValue(self):
-        """
+        r"""
         getMinValue(ParameterDistribution self) -> double
-
         double ParameterDistribution::getMinValue() const
 
         """
         return _libBornAgainCore.ParameterDistribution_getMinValue(self)
 
-
     def getMaxValue(self):
-        """
+        r"""
         getMaxValue(ParameterDistribution self) -> double
-
         double ParameterDistribution::getMaxValue() const
 
         """
         return _libBornAgainCore.ParameterDistribution_getMaxValue(self)
 
-ParameterDistribution_swigregister = _libBornAgainCore.ParameterDistribution_swigregister
-ParameterDistribution_swigregister(ParameterDistribution)
+# Register ParameterDistribution in _libBornAgainCore:
+_libBornAgainCore.ParameterDistribution_swigregister(ParameterDistribution)
 
 class ParameterPool(ICloneable):
-    """
+    r"""
 
 
     Container with parameters for  IParameterized object.
@@ -26239,37 +20898,23 @@ class ParameterPool(ICloneable):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParameterPool, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParameterPool, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(ParameterPool self) -> ParameterPool
-
         ParameterPool::ParameterPool()
 
         Constructs an empty parameter pool. 
 
         """
-        this = _libBornAgainCore.new_ParameterPool()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParameterPool_swiginit(self, _libBornAgainCore.new_ParameterPool())
     __swig_destroy__ = _libBornAgainCore.delete_ParameterPool
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ParameterPool self) -> ParameterPool
-
         ParameterPool * ParameterPool::clone() const
 
         Returns a literal clone. 
@@ -26277,11 +20922,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_clone(self)
 
-
     def copyToExternalPool(self, prefix, other_pool):
-        """
+        r"""
         copyToExternalPool(ParameterPool self, std::string const & prefix, ParameterPool other_pool)
-
         void ParameterPool::copyToExternalPool(const std::string &prefix, ParameterPool *other_pool) const
 
         Copies parameters of given pool to  other pool, prepeding  prefix to the parameter names. 
@@ -26289,11 +20932,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_copyToExternalPool(self, prefix, other_pool)
 
-
     def clear(self):
-        """
+        r"""
         clear(ParameterPool self)
-
         void ParameterPool::clear()
 
         Clears the parameter map. 
@@ -26301,11 +20942,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_clear(self)
 
-
     def size(self):
-        """
+        r"""
         size(ParameterPool self) -> size_t
-
         size_t ParameterPool::size() const
 
         Returns number of parameters in the pool. 
@@ -26313,11 +20952,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_size(self)
 
-
     def addParameter(self, newPar):
-        """
+        r"""
         addParameter(ParameterPool self, RealParameter newPar) -> RealParameter
-
         RealParameter & ParameterPool::addParameter(RealParameter *newPar)
 
         Adds parameter to the pool, and returns reference to the input pointer.
@@ -26327,12 +20964,10 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_addParameter(self, newPar)
 
-
     def parameter(self, *args):
-        """
+        r"""
         parameter(ParameterPool self, std::string const & name) -> RealParameter
         parameter(ParameterPool self, std::string const & name) -> RealParameter
-
         const RealParameter * ParameterPool::parameter(const std::string &name) const
 
         Returns parameter with given  name. 
@@ -26340,11 +20975,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_parameter(self, *args)
 
-
     def parameters(self):
-        """
+        r"""
         parameters(ParameterPool self) -> std::vector< RealParameter *,std::allocator< RealParameter * > > const
-
         const std::vector<RealParameter*> ParameterPool::parameters() const
 
         Returns full vector of parameters. 
@@ -26352,11 +20985,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_parameters(self)
 
-
     def getMatchedParameters(self, pattern):
-        """
+        r"""
         getMatchedParameters(ParameterPool self, std::string const & pattern) -> std::vector< RealParameter *,std::allocator< RealParameter * > >
-
         std::vector< RealParameter * > ParameterPool::getMatchedParameters(const std::string &pattern) const
 
         Returns nonempty vector of parameters that match the  pattern ('*' allowed), or throws. 
@@ -26364,11 +20995,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_getMatchedParameters(self, pattern)
 
-
     def getUniqueMatch(self, pattern):
-        """
+        r"""
         getUniqueMatch(ParameterPool self, std::string const & pattern) -> RealParameter
-
         RealParameter * ParameterPool::getUniqueMatch(const std::string &pattern) const
 
         Returns the one parameter that matches the  pattern (wildcards '*' allowed), or throws. 
@@ -26376,11 +21005,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_getUniqueMatch(self, pattern)
 
-
     def setParameterValue(self, name, value):
-        """
+        r"""
         setParameterValue(ParameterPool self, std::string const & name, double value)
-
         void ParameterPool::setParameterValue(const std::string &name, double value)
 
         Sets parameter value. 
@@ -26388,11 +21015,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_setParameterValue(self, name, value)
 
-
     def setMatchedParametersValue(self, wildcards, value):
-        """
+        r"""
         setMatchedParametersValue(ParameterPool self, std::string const & wildcards, double value) -> int
-
         int ParameterPool::setMatchedParametersValue(const std::string &wildcards, double value)
 
         Sets value of the nonzero parameters that match  pattern ('*' allowed), or throws. 
@@ -26400,11 +21025,9 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_setMatchedParametersValue(self, wildcards, value)
 
-
     def setUniqueMatchValue(self, pattern, value):
-        """
+        r"""
         setUniqueMatchValue(ParameterPool self, std::string const & pattern, double value)
-
         void ParameterPool::setUniqueMatchValue(const std::string &pattern, double value)
 
         Sets value of the one parameter that matches  pattern ('*' allowed), or throws. 
@@ -26412,21 +21035,17 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_setUniqueMatchValue(self, pattern, value)
 
-
     def parameterNames(self):
-        """
+        r"""
         parameterNames(ParameterPool self) -> vector_string_t
-
         std::vector< std::string > ParameterPool::parameterNames() const
 
         """
         return _libBornAgainCore.ParameterPool_parameterNames(self)
 
-
     def removeParameter(self, name):
-        """
+        r"""
         removeParameter(ParameterPool self, std::string const & name)
-
         void ParameterPool::removeParameter(const std::string &name)
 
         Removes parameter with given name from the pool. 
@@ -26434,20 +21053,19 @@ class ParameterPool(ICloneable):
         """
         return _libBornAgainCore.ParameterPool_removeParameter(self, name)
 
-
     def __getitem__(self, index):
-        """__getitem__(ParameterPool self, size_t index) -> RealParameter"""
+        r"""__getitem__(ParameterPool self, size_t index) -> RealParameter"""
         return _libBornAgainCore.ParameterPool___getitem__(self, index)
 
-
     def __iter__(self):
         return ParameterPoolIterator(self)
 
-ParameterPool_swigregister = _libBornAgainCore.ParameterPool_swigregister
-ParameterPool_swigregister(ParameterPool)
 
-class ParameterSample(_object):
-    """
+# Register ParameterPool in _libBornAgainCore:
+_libBornAgainCore.ParameterPool_swigregister(ParameterPool)
+
+class ParameterSample(object):
+    r"""
 
 
     A parameter value with a weight, as obtained when sampling from a distribution.
@@ -26456,137 +21074,103 @@ class ParameterSample(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParameterSample, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ParameterSample, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, _value=0., _weight=1.):
-        """
+        r"""
         __init__(ParameterSample self, double _value=0., double _weight=1.) -> ParameterSample
-        __init__(ParameterSample self, double _value=0.) -> ParameterSample
-        __init__(ParameterSample self) -> ParameterSample
-
         ParameterSample::ParameterSample(double _value=0., double _weight=1.)
 
         """
-        this = _libBornAgainCore.new_ParameterSample(_value, _weight)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["value"] = _libBornAgainCore.ParameterSample_value_set
-    __swig_getmethods__["value"] = _libBornAgainCore.ParameterSample_value_get
-    if _newclass:
-        value = _swig_property(_libBornAgainCore.ParameterSample_value_get, _libBornAgainCore.ParameterSample_value_set)
-    __swig_setmethods__["weight"] = _libBornAgainCore.ParameterSample_weight_set
-    __swig_getmethods__["weight"] = _libBornAgainCore.ParameterSample_weight_get
-    if _newclass:
-        weight = _swig_property(_libBornAgainCore.ParameterSample_weight_get, _libBornAgainCore.ParameterSample_weight_set)
+        _libBornAgainCore.ParameterSample_swiginit(self, _libBornAgainCore.new_ParameterSample(_value, _weight))
+    value = property(_libBornAgainCore.ParameterSample_value_get, _libBornAgainCore.ParameterSample_value_set, doc=r"""value : double""")
+    weight = property(_libBornAgainCore.ParameterSample_weight_get, _libBornAgainCore.ParameterSample_weight_set, doc=r"""weight : double""")
     __swig_destroy__ = _libBornAgainCore.delete_ParameterSample
-    __del__ = lambda self: None
-ParameterSample_swigregister = _libBornAgainCore.ParameterSample_swigregister
-ParameterSample_swigregister(ParameterSample)
 
-class ParameterSampleVector(_object):
-    """Proxy of C++ std::vector<(ParameterSample)> class."""
+# Register ParameterSample in _libBornAgainCore:
+_libBornAgainCore.ParameterSample_swigregister(ParameterSample)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParameterSampleVector, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ParameterSampleVector, name)
+class ParameterSampleVector(object):
+    r"""Proxy of C++ std::vector< ParameterSample > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(ParameterSampleVector self) -> SwigPyIterator"""
+        r"""iterator(ParameterSampleVector self) -> SwigPyIterator"""
         return _libBornAgainCore.ParameterSampleVector_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(ParameterSampleVector self) -> bool"""
+        r"""__nonzero__(ParameterSampleVector self) -> bool"""
         return _libBornAgainCore.ParameterSampleVector___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(ParameterSampleVector self) -> bool"""
+        r"""__bool__(ParameterSampleVector self) -> bool"""
         return _libBornAgainCore.ParameterSampleVector___bool__(self)
 
-
     def __len__(self):
-        """__len__(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
+        r"""__len__(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
         return _libBornAgainCore.ParameterSampleVector___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j) -> ParameterSampleVector"""
+        r"""__getslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j) -> ParameterSampleVector"""
         return _libBornAgainCore.ParameterSampleVector___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)
         __setslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j, ParameterSampleVector v)
         """
         return _libBornAgainCore.ParameterSampleVector___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)"""
+        r"""__delslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)"""
         return _libBornAgainCore.ParameterSampleVector___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i)
         __delitem__(ParameterSampleVector self, PySliceObject * slice)
         """
         return _libBornAgainCore.ParameterSampleVector___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(ParameterSampleVector self, PySliceObject * slice) -> ParameterSampleVector
         __getitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i) -> ParameterSample
         """
         return _libBornAgainCore.ParameterSampleVector___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(ParameterSampleVector self, PySliceObject * slice, ParameterSampleVector v)
         __setitem__(ParameterSampleVector self, PySliceObject * slice)
         __setitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, ParameterSample x)
         """
         return _libBornAgainCore.ParameterSampleVector___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(ParameterSampleVector self) -> ParameterSample"""
+        r"""pop(ParameterSampleVector self) -> ParameterSample"""
         return _libBornAgainCore.ParameterSampleVector_pop(self)
 
-
     def append(self, x):
-        """append(ParameterSampleVector self, ParameterSample x)"""
+        r"""append(ParameterSampleVector self, ParameterSample x)"""
         return _libBornAgainCore.ParameterSampleVector_append(self, x)
 
-
     def empty(self):
-        """empty(ParameterSampleVector self) -> bool"""
+        r"""empty(ParameterSampleVector self) -> bool"""
         return _libBornAgainCore.ParameterSampleVector_empty(self)
 
-
     def size(self):
-        """size(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
+        r"""size(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
         return _libBornAgainCore.ParameterSampleVector_size(self)
 
-
     def swap(self, v):
-        """
+        r"""
         swap(ParameterSampleVector self, ParameterSampleVector v)
-
         void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)
 
         make Swappable 
@@ -26594,115 +21178,94 @@ class ParameterSampleVector(_object):
         """
         return _libBornAgainCore.ParameterSampleVector_swap(self, v)
 
-
     def begin(self):
-        """begin(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"""
+        r"""begin(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"""
         return _libBornAgainCore.ParameterSampleVector_begin(self)
 
-
     def end(self):
-        """end(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"""
+        r"""end(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"""
         return _libBornAgainCore.ParameterSampleVector_end(self)
 
-
     def rbegin(self):
-        """rbegin(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"""
+        r"""rbegin(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"""
         return _libBornAgainCore.ParameterSampleVector_rbegin(self)
 
-
     def rend(self):
-        """rend(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"""
+        r"""rend(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"""
         return _libBornAgainCore.ParameterSampleVector_rend(self)
 
-
     def clear(self):
-        """clear(ParameterSampleVector self)"""
+        r"""clear(ParameterSampleVector self)"""
         return _libBornAgainCore.ParameterSampleVector_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(ParameterSampleVector self) -> std::vector< ParameterSample >::allocator_type"""
+        r"""get_allocator(ParameterSampleVector self) -> std::vector< ParameterSample >::allocator_type"""
         return _libBornAgainCore.ParameterSampleVector_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(ParameterSampleVector self)"""
+        r"""pop_back(ParameterSampleVector self)"""
         return _libBornAgainCore.ParameterSampleVector_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos) -> std::vector< ParameterSample >::iterator
         erase(ParameterSampleVector self, std::vector< ParameterSample >::iterator first, std::vector< ParameterSample >::iterator last) -> std::vector< ParameterSample >::iterator
         """
         return _libBornAgainCore.ParameterSampleVector_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(ParameterSampleVector self) -> ParameterSampleVector
+        __init__(ParameterSampleVector self, ParameterSampleVector other) -> ParameterSampleVector
+        __init__(ParameterSampleVector self, std::vector< ParameterSample >::size_type size) -> ParameterSampleVector
+        __init__(ParameterSampleVector self, std::vector< ParameterSample >::size_type size, ParameterSample value) -> ParameterSampleVector
         """
-        __init__(std::vector<(ParameterSample)> self) -> ParameterSampleVector
-        __init__(std::vector<(ParameterSample)> self, ParameterSampleVector arg2) -> ParameterSampleVector
-        __init__(std::vector<(ParameterSample)> self, std::vector< ParameterSample >::size_type size) -> ParameterSampleVector
-        __init__(std::vector<(ParameterSample)> self, std::vector< ParameterSample >::size_type size, ParameterSample value) -> ParameterSampleVector
-        """
-        this = _libBornAgainCore.new_ParameterSampleVector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParameterSampleVector_swiginit(self, _libBornAgainCore.new_ParameterSampleVector(*args))
 
     def push_back(self, x):
-        """push_back(ParameterSampleVector self, ParameterSample x)"""
+        r"""push_back(ParameterSampleVector self, ParameterSample x)"""
         return _libBornAgainCore.ParameterSampleVector_push_back(self, x)
 
-
     def front(self):
-        """front(ParameterSampleVector self) -> ParameterSample"""
+        r"""front(ParameterSampleVector self) -> ParameterSample"""
         return _libBornAgainCore.ParameterSampleVector_front(self)
 
-
     def back(self):
-        """back(ParameterSampleVector self) -> ParameterSample"""
+        r"""back(ParameterSampleVector self) -> ParameterSample"""
         return _libBornAgainCore.ParameterSampleVector_back(self)
 
-
     def assign(self, n, x):
-        """assign(ParameterSampleVector self, std::vector< ParameterSample >::size_type n, ParameterSample x)"""
+        r"""assign(ParameterSampleVector self, std::vector< ParameterSample >::size_type n, ParameterSample x)"""
         return _libBornAgainCore.ParameterSampleVector_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(ParameterSampleVector self, std::vector< ParameterSample >::size_type new_size)
         resize(ParameterSampleVector self, std::vector< ParameterSample >::size_type new_size, ParameterSample x)
         """
         return _libBornAgainCore.ParameterSampleVector_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos, ParameterSample x) -> std::vector< ParameterSample >::iterator
         insert(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos, std::vector< ParameterSample >::size_type n, ParameterSample x)
         """
         return _libBornAgainCore.ParameterSampleVector_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(ParameterSampleVector self, std::vector< ParameterSample >::size_type n)"""
+        r"""reserve(ParameterSampleVector self, std::vector< ParameterSample >::size_type n)"""
         return _libBornAgainCore.ParameterSampleVector_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
+        r"""capacity(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"""
         return _libBornAgainCore.ParameterSampleVector_capacity(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_ParameterSampleVector
-    __del__ = lambda self: None
-ParameterSampleVector_swigregister = _libBornAgainCore.ParameterSampleVector_swigregister
-ParameterSampleVector_swigregister(ParameterSampleVector)
+
+# Register ParameterSampleVector in _libBornAgainCore:
+_libBornAgainCore.ParameterSampleVector_swigregister(ParameterSampleVector)
 
 class Particle(IParticle):
-    """
+    r"""
 
 
     A particle with a form factor and refractive index.
@@ -26711,36 +21274,23 @@ class Particle(IParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Particle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Particle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Particle self) -> Particle
         __init__(Particle self, Material material) -> Particle
         __init__(Particle self, Material material, IFormFactor form_factor) -> Particle
         __init__(Particle self, Material material, IFormFactor form_factor, IRotation rotation) -> Particle
-
         Particle::Particle(Material material, const IFormFactor &form_factor, const IRotation &rotation)
 
         """
-        this = _libBornAgainCore.new_Particle(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Particle_swiginit(self, _libBornAgainCore.new_Particle(*args))
 
     def clone(self):
-        """
+        r"""
         clone(Particle self) -> Particle
-
         Particle * Particle::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -26748,11 +21298,9 @@ class Particle(IParticle):
         """
         return _libBornAgainCore.Particle_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(Particle self, INodeVisitor visitor)
-
         void Particle::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -26760,11 +21308,9 @@ class Particle(IParticle):
         """
         return _libBornAgainCore.Particle_accept(self, visitor)
 
-
     def createSlicedParticle(self, limits):
-        """
+        r"""
         createSlicedParticle(Particle self, ZLimits limits) -> SlicedParticle
-
         SlicedParticle Particle::createSlicedParticle(ZLimits limits) const override final
 
         Create a sliced form factor for this particle. 
@@ -26772,21 +21318,17 @@ class Particle(IParticle):
         """
         return _libBornAgainCore.Particle_createSlicedParticle(self, limits)
 
-
     def setMaterial(self, material):
-        """
+        r"""
         setMaterial(Particle self, Material material)
-
         void Particle::setMaterial(Material material)
 
         """
         return _libBornAgainCore.Particle_setMaterial(self, material)
 
-
     def material(self):
-        """
+        r"""
         material(Particle self) -> Material
-
         const Material* Particle::material() const override final
 
         Returns nullptr, unless overwritten to return a specific material. 
@@ -26794,35 +21336,30 @@ class Particle(IParticle):
         """
         return _libBornAgainCore.Particle_material(self)
 
-
     def setFormFactor(self, form_factor):
-        """
+        r"""
         setFormFactor(Particle self, IFormFactor form_factor)
-
         void Particle::setFormFactor(const IFormFactor &form_factor)
 
         """
         return _libBornAgainCore.Particle_setFormFactor(self, form_factor)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(Particle self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > Particle::getChildren() const override final
 
         Returns a vector of children (const). 
 
         """
         return _libBornAgainCore.Particle_getChildren(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_Particle
-    __del__ = lambda self: None
-Particle_swigregister = _libBornAgainCore.Particle_swigregister
-Particle_swigregister(Particle)
+
+# Register Particle in _libBornAgainCore:
+_libBornAgainCore.Particle_swigregister(Particle)
 
 class ParticleComposition(IParticle):
-    """
+    r"""
 
 
     A composition of particles at fixed positions
@@ -26831,36 +21368,22 @@ class ParticleComposition(IParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParticleComposition, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParticleComposition, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(ParticleComposition self) -> ParticleComposition
         __init__(ParticleComposition self, IParticle particle, vector_kvector_t positions) -> ParticleComposition
-
         ParticleComposition::ParticleComposition(const IParticle &particle, std::vector< kvector_t > positions)
 
         """
-        this = _libBornAgainCore.new_ParticleComposition(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParticleComposition_swiginit(self, _libBornAgainCore.new_ParticleComposition(*args))
     __swig_destroy__ = _libBornAgainCore.delete_ParticleComposition
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ParticleComposition self) -> ParticleComposition
-
         ParticleComposition * ParticleComposition::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -26868,11 +21391,9 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ParticleComposition self, INodeVisitor visitor)
-
         void ParticleComposition::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -26880,11 +21401,9 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_accept(self, visitor)
 
-
     def createFormFactor(self):
-        """
+        r"""
         createFormFactor(ParticleComposition self) -> IFormFactor
-
         IFormFactor * ParticleComposition::createFormFactor() const override final
 
         Create a form factor for this particle. 
@@ -26892,32 +21411,26 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_createFormFactor(self)
 
-
     def addParticle(self, *args):
-        """
+        r"""
         addParticle(ParticleComposition self, IParticle particle)
         addParticle(ParticleComposition self, IParticle particle, kvector_t position)
-
         void ParticleComposition::addParticle(const IParticle &particle, kvector_t position)
 
         """
         return _libBornAgainCore.ParticleComposition_addParticle(self, *args)
 
-
     def addParticles(self, particle, positions):
-        """
+        r"""
         addParticles(ParticleComposition self, IParticle particle, vector_kvector_t positions)
-
         void ParticleComposition::addParticles(const IParticle &particle, std::vector< kvector_t > positions)
 
         """
         return _libBornAgainCore.ParticleComposition_addParticles(self, particle, positions)
 
-
     def nbrParticles(self):
-        """
+        r"""
         nbrParticles(ParticleComposition self) -> size_t
-
         size_t ParticleComposition::nbrParticles() const
 
         Returns number of different particles. 
@@ -26925,11 +21438,9 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_nbrParticles(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(ParticleComposition self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > ParticleComposition::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -26937,11 +21448,9 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_getChildren(self)
 
-
     def decompose(self):
-        """
+        r"""
         decompose(ParticleComposition self) -> SafePointerVector< IParticle >
-
         SafePointerVector< IParticle > ParticleComposition::decompose() const override final
 
         Decompose in constituent  IParticle objects. 
@@ -26949,11 +21458,9 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_decompose(self)
 
-
     def bottomTopZ(self):
-        """
+        r"""
         bottomTopZ(ParticleComposition self) -> ParticleLimits
-
         ParticleLimits ParticleComposition::bottomTopZ() const override final
 
         Top and bottom z-coordinate. 
@@ -26961,11 +21468,11 @@ class ParticleComposition(IParticle):
         """
         return _libBornAgainCore.ParticleComposition_bottomTopZ(self)
 
-ParticleComposition_swigregister = _libBornAgainCore.ParticleComposition_swigregister
-ParticleComposition_swigregister(ParticleComposition)
+# Register ParticleComposition in _libBornAgainCore:
+_libBornAgainCore.ParticleComposition_swigregister(ParticleComposition)
 
 class ParticleCoreShell(IParticle):
-    """
+    r"""
 
 
     A particle with a core/shell geometry.
@@ -26974,36 +21481,21 @@ class ParticleCoreShell(IParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParticleCoreShell, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParticleCoreShell, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(ParticleCoreShell self, Particle shell, Particle core, kvector_t relative_core_position) -> ParticleCoreShell
-        __init__(ParticleCoreShell self, Particle shell, Particle core) -> ParticleCoreShell
-
+        r"""
+        __init__(ParticleCoreShell self, Particle shell, Particle core, kvector_t relative_core_position=kvector_t(0.0, 0.0, 0.0)) -> ParticleCoreShell
         ParticleCoreShell::ParticleCoreShell(const Particle &shell, const Particle &core, kvector_t relative_core_position=kvector_t(0.0, 0.0, 0.0))
 
         """
-        this = _libBornAgainCore.new_ParticleCoreShell(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParticleCoreShell_swiginit(self, _libBornAgainCore.new_ParticleCoreShell(*args))
     __swig_destroy__ = _libBornAgainCore.delete_ParticleCoreShell
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ParticleCoreShell self) -> ParticleCoreShell
-
         ParticleCoreShell * ParticleCoreShell::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -27011,11 +21503,9 @@ class ParticleCoreShell(IParticle):
         """
         return _libBornAgainCore.ParticleCoreShell_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ParticleCoreShell self, INodeVisitor visitor)
-
         void ParticleCoreShell::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -27023,11 +21513,9 @@ class ParticleCoreShell(IParticle):
         """
         return _libBornAgainCore.ParticleCoreShell_accept(self, visitor)
 
-
     def createSlicedParticle(self, limits):
-        """
+        r"""
         createSlicedParticle(ParticleCoreShell self, ZLimits limits) -> SlicedParticle
-
         SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const override final
 
         Create a sliced form factor for this particle. 
@@ -27035,31 +21523,25 @@ class ParticleCoreShell(IParticle):
         """
         return _libBornAgainCore.ParticleCoreShell_createSlicedParticle(self, limits)
 
-
     def coreParticle(self):
-        """
+        r"""
         coreParticle(ParticleCoreShell self) -> Particle
-
         const Particle * ParticleCoreShell::coreParticle() const
 
         """
         return _libBornAgainCore.ParticleCoreShell_coreParticle(self)
 
-
     def shellParticle(self):
-        """
+        r"""
         shellParticle(ParticleCoreShell self) -> Particle
-
         const Particle * ParticleCoreShell::shellParticle() const
 
         """
         return _libBornAgainCore.ParticleCoreShell_shellParticle(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(ParticleCoreShell self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > ParticleCoreShell::getChildren() const override final
 
         Returns a vector of children (const). 
@@ -27067,11 +21549,11 @@ class ParticleCoreShell(IParticle):
         """
         return _libBornAgainCore.ParticleCoreShell_getChildren(self)
 
-ParticleCoreShell_swigregister = _libBornAgainCore.ParticleCoreShell_swigregister
-ParticleCoreShell_swigregister(ParticleCoreShell)
+# Register ParticleCoreShell in _libBornAgainCore:
+_libBornAgainCore.ParticleCoreShell_swigregister(ParticleCoreShell)
 
 class ParticleDistribution(IAbstractParticle):
-    """
+    r"""
 
 
     A particle type that is a parametric distribution of  IParticle's.
@@ -27080,33 +21562,20 @@ class ParticleDistribution(IAbstractParticle):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IAbstractParticle]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParticleDistribution, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IAbstractParticle]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParticleDistribution, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, prototype, par_distr):
-        """
+        r"""
         __init__(ParticleDistribution self, IParticle prototype, ParameterDistribution par_distr) -> ParticleDistribution
-
         ParticleDistribution::ParticleDistribution(const IParticle &prototype, const ParameterDistribution &par_distr)
 
         """
-        this = _libBornAgainCore.new_ParticleDistribution(prototype, par_distr)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParticleDistribution_swiginit(self, _libBornAgainCore.new_ParticleDistribution(prototype, par_distr))
 
     def clone(self):
-        """
+        r"""
         clone(ParticleDistribution self) -> ParticleDistribution
-
         ParticleDistribution * ParticleDistribution::clone() const override final
 
         Returns a clone of this  ISample object. 
@@ -27114,11 +21583,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ParticleDistribution self, INodeVisitor visitor)
-
         void ParticleDistribution::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -27126,11 +21593,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_accept(self, visitor)
 
-
     def translate(self, translation):
-        """
+        r"""
         translate(ParticleDistribution self, kvector_t translation)
-
         void ParticleDistribution::translate(kvector_t translation) override final
 
         Translates the particle with the given vector. 
@@ -27138,11 +21603,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_translate(self, translation)
 
-
     def rotate(self, rotation):
-        """
+        r"""
         rotate(ParticleDistribution self, IRotation rotation)
-
         void ParticleDistribution::rotate(const IRotation &rotation) override final
 
         Applies the given rotation to the particle. 
@@ -27150,11 +21613,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_rotate(self, rotation)
 
-
     def generateParticles(self):
-        """
+        r"""
         generateParticles(ParticleDistribution self) -> SafePointerVector< IParticle >
-
         SafePointerVector< IParticle > ParticleDistribution::generateParticles() const
 
         Returns list of new particles generated according to a distribution.
@@ -27164,11 +21625,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_generateParticles(self)
 
-
     def prototype(self):
-        """
+        r"""
         prototype(ParticleDistribution self) -> IParticle
-
         const IParticle& ParticleDistribution::prototype() const
 
         Returns the prototype particle, used for generating multiple ones. 
@@ -27176,11 +21635,9 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_prototype(self)
 
-
     def parameterDistribution(self):
-        """
+        r"""
         parameterDistribution(ParticleDistribution self) -> ParameterDistribution
-
         ParameterDistribution ParticleDistribution::parameterDistribution() const
 
         Returns the distributed parameter data. 
@@ -27188,25 +21645,22 @@ class ParticleDistribution(IAbstractParticle):
         """
         return _libBornAgainCore.ParticleDistribution_parameterDistribution(self)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(ParticleDistribution self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > ParticleDistribution::getChildren() const override final
 
         Returns a vector of children (const). 
 
         """
         return _libBornAgainCore.ParticleDistribution_getChildren(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_ParticleDistribution
-    __del__ = lambda self: None
-ParticleDistribution_swigregister = _libBornAgainCore.ParticleDistribution_swigregister
-ParticleDistribution_swigregister(ParticleDistribution)
+
+# Register ParticleDistribution in _libBornAgainCore:
+_libBornAgainCore.ParticleDistribution_swigregister(ParticleDistribution)
 
 class ParticleLayout(ILayout):
-    """
+    r"""
 
 
     Decorator class that adds particles to  ISample objects.
@@ -27215,37 +21669,22 @@ class ParticleLayout(ILayout):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ILayout]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ParticleLayout, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ILayout]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ParticleLayout, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(ParticleLayout self) -> ParticleLayout
         __init__(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0) -> ParticleLayout
-        __init__(ParticleLayout self, IAbstractParticle particle) -> ParticleLayout
-
         ParticleLayout::ParticleLayout(const IAbstractParticle &particle, double abundance=-1.0)
 
         """
-        this = _libBornAgainCore.new_ParticleLayout(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ParticleLayout_swiginit(self, _libBornAgainCore.new_ParticleLayout(*args))
     __swig_destroy__ = _libBornAgainCore.delete_ParticleLayout
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(ParticleLayout self) -> ParticleLayout
-
         ParticleLayout * ParticleLayout::clone() const final override
 
         Returns a clone of this  ISample object. 
@@ -27253,11 +21692,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ParticleLayout self, INodeVisitor visitor)
-
         void ParticleLayout::accept(INodeVisitor *visitor) const final override
 
         Calls the  INodeVisitor's visit method. 
@@ -27265,14 +21702,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_accept(self, visitor)
 
-
     def addParticle(self, *args):
-        """
-        addParticle(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0, kvector_t position, IRotation rotation)
-        addParticle(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0, kvector_t position)
-        addParticle(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0)
-        addParticle(ParticleLayout self, IAbstractParticle particle)
-
+        r"""
+        addParticle(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0, kvector_t position=kvector_t(), IRotation rotation=IdentityRotation())
         void ParticleLayout::addParticle(const IAbstractParticle &particle, double abundance=-1.0, const kvector_t position=kvector_t(), const IRotation &rotation=IdentityRotation())
 
         Adds particle to the layout with abundance, position and the rotation defined.
@@ -27295,11 +21727,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_addParticle(self, *args)
 
-
     def particles(self):
-        """
+        r"""
         particles(ParticleLayout self) -> SafePointerVector< IParticle >
-
         SafePointerVector< IParticle > ParticleLayout::particles() const final override
 
         Returns information on all particles (type and abundance) and generates new particles if an  IAbstractParticle denotes a collection 
@@ -27307,11 +21737,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_particles(self)
 
-
     def interferenceFunction(self):
-        """
+        r"""
         interferenceFunction(ParticleLayout self) -> IInterferenceFunction
-
         const IInterferenceFunction * ParticleLayout::interferenceFunction() const final override
 
         Returns the interference function. 
@@ -27319,11 +21747,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_interferenceFunction(self)
 
-
     def getTotalAbundance(self):
-        """
+        r"""
         getTotalAbundance(ParticleLayout self) -> double
-
         double ParticleLayout::getTotalAbundance() const final override
 
         Get total abundance of all particles. 
@@ -27331,11 +21757,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_getTotalAbundance(self)
 
-
     def setInterferenceFunction(self, interference_function):
-        """
+        r"""
         setInterferenceFunction(ParticleLayout self, IInterferenceFunction interference_function)
-
         void ParticleLayout::setInterferenceFunction(const IInterferenceFunction &interference_function)
 
         Adds interference functions. 
@@ -27343,11 +21767,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_setInterferenceFunction(self, interference_function)
 
-
     def totalParticleSurfaceDensity(self):
-        """
+        r"""
         totalParticleSurfaceDensity(ParticleLayout self) -> double
-
         double ParticleLayout::totalParticleSurfaceDensity() const final override
 
         Returns surface density of all particles. 
@@ -27355,11 +21777,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_totalParticleSurfaceDensity(self)
 
-
     def setTotalParticleSurfaceDensity(self, particle_density):
-        """
+        r"""
         setTotalParticleSurfaceDensity(ParticleLayout self, double particle_density)
-
         void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) final override
 
         Sets total particle surface density.
@@ -27373,11 +21793,9 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_setTotalParticleSurfaceDensity(self, particle_density)
 
-
     def getChildren(self):
-        """
+        r"""
         getChildren(ParticleLayout self) -> swig_dummy_type_const_inode_vector
-
         std::vector< const INode * > ParticleLayout::getChildren() const final override
 
         Returns a vector of children (const). 
@@ -27385,15 +21803,14 @@ class ParticleLayout(ILayout):
         """
         return _libBornAgainCore.ParticleLayout_getChildren(self)
 
-ParticleLayout_swigregister = _libBornAgainCore.ParticleLayout_swigregister
-ParticleLayout_swigregister(ParticleLayout)
+# Register ParticleLayout in _libBornAgainCore:
+_libBornAgainCore.ParticleLayout_swigregister(ParticleLayout)
 
 
 def importArrayToOutputData(*args):
-    """
+    r"""
     importArrayToOutputData(vdouble1d_t vec) -> IntensityData
     importArrayToOutputData(vdouble2d_t vec) -> IntensityData
-
     OutputData< double > * PyArrayImport::importArrayToOutputData(const std::vector< std::vector< double >> &vec)
 
     for importing 2D array of doubles from python into  OutputData
@@ -27401,7 +21818,7 @@ def importArrayToOutputData(*args):
     """
     return _libBornAgainCore.importArrayToOutputData(*args)
 class PoissonNoiseBackground(IBackground):
-    """
+    r"""
 
 
     Class representing Poisson noise on top of the scattered intensity
@@ -27410,45 +21827,29 @@ class PoissonNoiseBackground(IBackground):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IBackground]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PoissonNoiseBackground, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IBackground]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, PoissonNoiseBackground, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(PoissonNoiseBackground self) -> PoissonNoiseBackground
-
         PoissonNoiseBackground::PoissonNoiseBackground()
 
         """
-        this = _libBornAgainCore.new_PoissonNoiseBackground()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.PoissonNoiseBackground_swiginit(self, _libBornAgainCore.new_PoissonNoiseBackground())
     __swig_destroy__ = _libBornAgainCore.delete_PoissonNoiseBackground
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(PoissonNoiseBackground self) -> PoissonNoiseBackground
-
         PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final
 
         """
         return _libBornAgainCore.PoissonNoiseBackground_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(PoissonNoiseBackground self, INodeVisitor visitor)
-
         void PoissonNoiseBackground::accept(INodeVisitor *visitor) const override
 
         Calls the  INodeVisitor's visit method. 
@@ -27456,21 +21857,19 @@ class PoissonNoiseBackground(IBackground):
         """
         return _libBornAgainCore.PoissonNoiseBackground_accept(self, visitor)
 
-
     def addBackGround(self, intensity):
-        """
+        r"""
         addBackGround(PoissonNoiseBackground self, double intensity) -> double
-
         double PoissonNoiseBackground::addBackGround(double intensity) const override final
 
         """
         return _libBornAgainCore.PoissonNoiseBackground_addBackGround(self, intensity)
 
-PoissonNoiseBackground_swigregister = _libBornAgainCore.PoissonNoiseBackground_swigregister
-PoissonNoiseBackground_swigregister(PoissonNoiseBackground)
+# Register PoissonNoiseBackground in _libBornAgainCore:
+_libBornAgainCore.PoissonNoiseBackground_swigregister(PoissonNoiseBackground)
 
 class Polygon(IShape2D):
-    """
+    r"""
 
 
     A polygon in 2D space.  Polygon defined by two arrays with x and y coordinates of points. Sizes of arrays should coincide. If polygon is unclosed (the last point doesn't repeat the first one), it will be closed automatically.
@@ -27479,48 +21878,32 @@ class Polygon(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Polygon, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Polygon, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(Polygon self, vdouble1d_t x, vdouble1d_t y) -> Polygon
         __init__(Polygon self, vdouble2d_t points) -> Polygon
         __init__(Polygon self, PolygonPrivate const * d) -> Polygon
-
         Polygon::Polygon(const PolygonPrivate *d)
 
         """
-        this = _libBornAgainCore.new_Polygon(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Polygon_swiginit(self, _libBornAgainCore.new_Polygon(*args))
     __swig_destroy__ = _libBornAgainCore.delete_Polygon
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(Polygon self) -> Polygon
-
         virtual Polygon* Polygon::clone() const
 
         """
         return _libBornAgainCore.Polygon_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(Polygon self, double x, double y) -> bool
         contains(Polygon self, Bin1D binx, Bin1D biny) -> bool
-
         bool Polygon::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
@@ -27528,31 +21911,27 @@ class Polygon(IShape2D):
         """
         return _libBornAgainCore.Polygon_contains(self, *args)
 
-
     def getArea(self):
-        """
+        r"""
         getArea(Polygon self) -> double
-
         double Polygon::getArea() const
 
         """
         return _libBornAgainCore.Polygon_getArea(self)
 
-
     def getPoints(self, xpos, ypos):
-        """
+        r"""
         getPoints(Polygon self, vdouble1d_t xpos, vdouble1d_t ypos)
-
         void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const
 
         """
         return _libBornAgainCore.Polygon_getPoints(self, xpos, ypos)
 
-Polygon_swigregister = _libBornAgainCore.Polygon_swigregister
-Polygon_swigregister(Polygon)
+# Register Polygon in _libBornAgainCore:
+_libBornAgainCore.Polygon_swigregister(Polygon)
 
-class RangedDistributionGate(_object):
-    """
+class RangedDistributionGate(object):
+    r"""
 
 
     Uniform distribution function.
@@ -27561,46 +21940,35 @@ class RangedDistributionGate(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RangedDistributionGate, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RangedDistributionGate, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RangedDistributionGate self) -> RangedDistributionGate
-        __init__(RangedDistributionGate self, size_t n_samples, double sigma_factor, RealLimits limits) -> RangedDistributionGate
-        __init__(RangedDistributionGate self, size_t n_samples, double sigma_factor) -> RangedDistributionGate
+        __init__(RangedDistributionGate self, size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless()) -> RangedDistributionGate
         __init__(RangedDistributionGate self, size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionGate
-
         RangedDistributionGate::RangedDistributionGate(size_t n_samples, double sigma_factor, double min, double max)
 
         Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). 
 
         """
-        this = _libBornAgainCore.new_RangedDistributionGate(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RangedDistributionGate_swiginit(self, _libBornAgainCore.new_RangedDistributionGate(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RangedDistributionGate self) -> RangedDistributionGate
-
         RangedDistributionGate * RangedDistributionGate::clone() const override
 
         """
         return _libBornAgainCore.RangedDistributionGate_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RangedDistributionGate
-    __del__ = lambda self: None
-RangedDistributionGate_swigregister = _libBornAgainCore.RangedDistributionGate_swigregister
-RangedDistributionGate_swigregister(RangedDistributionGate)
 
-class RangedDistributionLorentz(_object):
-    """
+# Register RangedDistributionGate in _libBornAgainCore:
+_libBornAgainCore.RangedDistributionGate_swigregister(RangedDistributionGate)
+
+class RangedDistributionLorentz(object):
+    r"""
 
 
     Lorentz distribution with median and hwhm.
@@ -27609,46 +21977,35 @@ class RangedDistributionLorentz(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RangedDistributionLorentz, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RangedDistributionLorentz, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RangedDistributionLorentz self) -> RangedDistributionLorentz
-        __init__(RangedDistributionLorentz self, size_t n_samples, double hwhm_factor, RealLimits limits) -> RangedDistributionLorentz
-        __init__(RangedDistributionLorentz self, size_t n_samples, double hwhm_factor) -> RangedDistributionLorentz
+        __init__(RangedDistributionLorentz self, size_t n_samples, double hwhm_factor, RealLimits limits=RealLimits::limitless()) -> RangedDistributionLorentz
         __init__(RangedDistributionLorentz self, size_t n_samples, double hwhm_factor, double min, double max) -> RangedDistributionLorentz
-
         RangedDistributionLorentz::RangedDistributionLorentz(size_t n_samples, double hwhm_factor, double min, double max)
 
         Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  hwhm_factor = 2.0, while the limits are (-inf, +inf). 
 
         """
-        this = _libBornAgainCore.new_RangedDistributionLorentz(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RangedDistributionLorentz_swiginit(self, _libBornAgainCore.new_RangedDistributionLorentz(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RangedDistributionLorentz self) -> RangedDistributionLorentz
-
         RangedDistributionLorentz * RangedDistributionLorentz::clone() const override
 
         """
         return _libBornAgainCore.RangedDistributionLorentz_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RangedDistributionLorentz
-    __del__ = lambda self: None
-RangedDistributionLorentz_swigregister = _libBornAgainCore.RangedDistributionLorentz_swigregister
-RangedDistributionLorentz_swigregister(RangedDistributionLorentz)
 
-class RangedDistributionGaussian(_object):
-    """
+# Register RangedDistributionLorentz in _libBornAgainCore:
+_libBornAgainCore.RangedDistributionLorentz_swigregister(RangedDistributionLorentz)
+
+class RangedDistributionGaussian(object):
+    r"""
 
 
     Gaussian distribution with standard deviation std_dev.
@@ -27657,46 +22014,35 @@ class RangedDistributionGaussian(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RangedDistributionGaussian, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RangedDistributionGaussian, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RangedDistributionGaussian self) -> RangedDistributionGaussian
-        __init__(RangedDistributionGaussian self, size_t n_samples, double sigma_factor, RealLimits limits) -> RangedDistributionGaussian
-        __init__(RangedDistributionGaussian self, size_t n_samples, double sigma_factor) -> RangedDistributionGaussian
+        __init__(RangedDistributionGaussian self, size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless()) -> RangedDistributionGaussian
         __init__(RangedDistributionGaussian self, size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionGaussian
-
         RangedDistributionGaussian::RangedDistributionGaussian(size_t n_samples, double sigma_factor, double min, double max)
 
         Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). 
 
         """
-        this = _libBornAgainCore.new_RangedDistributionGaussian(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RangedDistributionGaussian_swiginit(self, _libBornAgainCore.new_RangedDistributionGaussian(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RangedDistributionGaussian self) -> RangedDistributionGaussian
-
         RangedDistributionGaussian * RangedDistributionGaussian::clone() const override
 
         """
         return _libBornAgainCore.RangedDistributionGaussian_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RangedDistributionGaussian
-    __del__ = lambda self: None
-RangedDistributionGaussian_swigregister = _libBornAgainCore.RangedDistributionGaussian_swigregister
-RangedDistributionGaussian_swigregister(RangedDistributionGaussian)
 
-class RangedDistributionLogNormal(_object):
-    """
+# Register RangedDistributionGaussian in _libBornAgainCore:
+_libBornAgainCore.RangedDistributionGaussian_swigregister(RangedDistributionGaussian)
+
+class RangedDistributionLogNormal(object):
+    r"""
 
 
     Log-normal distribution.
@@ -27705,46 +22051,35 @@ class RangedDistributionLogNormal(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RangedDistributionLogNormal, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RangedDistributionLogNormal, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RangedDistributionLogNormal self) -> RangedDistributionLogNormal
-        __init__(RangedDistributionLogNormal self, size_t n_samples, double sigma_factor, RealLimits limits) -> RangedDistributionLogNormal
-        __init__(RangedDistributionLogNormal self, size_t n_samples, double sigma_factor) -> RangedDistributionLogNormal
+        __init__(RangedDistributionLogNormal self, size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless()) -> RangedDistributionLogNormal
         __init__(RangedDistributionLogNormal self, size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionLogNormal
-
         RangedDistributionLogNormal::RangedDistributionLogNormal(size_t n_samples, double sigma_factor, double min, double max)
 
         Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). 
 
         """
-        this = _libBornAgainCore.new_RangedDistributionLogNormal(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RangedDistributionLogNormal_swiginit(self, _libBornAgainCore.new_RangedDistributionLogNormal(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RangedDistributionLogNormal self) -> RangedDistributionLogNormal
-
         RangedDistributionLogNormal * RangedDistributionLogNormal::clone() const override
 
         """
         return _libBornAgainCore.RangedDistributionLogNormal_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RangedDistributionLogNormal
-    __del__ = lambda self: None
-RangedDistributionLogNormal_swigregister = _libBornAgainCore.RangedDistributionLogNormal_swigregister
-RangedDistributionLogNormal_swigregister(RangedDistributionLogNormal)
 
-class RangedDistributionCosine(_object):
-    """
+# Register RangedDistributionLogNormal in _libBornAgainCore:
+_libBornAgainCore.RangedDistributionLogNormal_swigregister(RangedDistributionLogNormal)
+
+class RangedDistributionCosine(object):
+    r"""
 
 
     Cosine distribution.
@@ -27753,46 +22088,35 @@ class RangedDistributionCosine(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RangedDistributionCosine, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RangedDistributionCosine, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RangedDistributionCosine self) -> RangedDistributionCosine
-        __init__(RangedDistributionCosine self, size_t n_samples, double sigma_factor, RealLimits limits) -> RangedDistributionCosine
-        __init__(RangedDistributionCosine self, size_t n_samples, double sigma_factor) -> RangedDistributionCosine
+        __init__(RangedDistributionCosine self, size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless()) -> RangedDistributionCosine
         __init__(RangedDistributionCosine self, size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionCosine
-
         RangedDistributionCosine::RangedDistributionCosine(size_t n_samples, double sigma_factor, double min, double max)
 
         Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). 
 
         """
-        this = _libBornAgainCore.new_RangedDistributionCosine(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RangedDistributionCosine_swiginit(self, _libBornAgainCore.new_RangedDistributionCosine(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RangedDistributionCosine self) -> RangedDistributionCosine
-
         RangedDistributionCosine * RangedDistributionCosine::clone() const override
 
         """
         return _libBornAgainCore.RangedDistributionCosine_clone(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RangedDistributionCosine
-    __del__ = lambda self: None
-RangedDistributionCosine_swigregister = _libBornAgainCore.RangedDistributionCosine_swigregister
-RangedDistributionCosine_swigregister(RangedDistributionCosine)
+
+# Register RangedDistributionCosine in _libBornAgainCore:
+_libBornAgainCore.RangedDistributionCosine_swigregister(RangedDistributionCosine)
 
 class RealParameter(IParameterReal):
-    """
+    r"""
 
 
     Wraps a parameter of type double. In addition to name and on-change callback held by the parent class  IParameter, this class holds Limits, Attributes (currently only fixed or not), and a  Unit.
@@ -27801,48 +22125,28 @@ class RealParameter(IParameterReal):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IParameterReal]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RealParameter, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IParameterReal]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RealParameter, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(RealParameter self, std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange, RealLimits limits, Attributes attr) -> RealParameter
-        __init__(RealParameter self, std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange, RealLimits limits) -> RealParameter
-        __init__(RealParameter self, std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange) -> RealParameter
-        __init__(RealParameter self, std::string const & name, double * par, std::string const & parent_name) -> RealParameter
-        __init__(RealParameter self, std::string const & name, double * par) -> RealParameter
-
+        r"""
+        __init__(RealParameter self, std::string const & name, double * par, std::string const & parent_name=std::string(), std::function< void () > const & onChange=std::function< void () >(), RealLimits limits=RealLimits::limitless(), Attributes attr=Attributes::free()) -> RealParameter
         RealParameter::RealParameter(const std::string &name, double *par, const std::string &parent_name=std::string(), const std::function< void()> &onChange=std::function< void()>(), const RealLimits &limits=RealLimits::limitless(), const Attributes &attr=Attributes::free())
 
         """
-        this = _libBornAgainCore.new_RealParameter(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RealParameter_swiginit(self, _libBornAgainCore.new_RealParameter(*args))
 
     def clone(self, *args):
-        """
-        clone(RealParameter self, std::string const & new_name) -> RealParameter
-        clone(RealParameter self) -> RealParameter
-
+        r"""
+        clone(RealParameter self, std::string const & new_name="") -> RealParameter
         RealParameter * RealParameter::clone(const std::string &new_name="") const
 
         """
         return _libBornAgainCore.RealParameter_clone(self, *args)
 
-
     def setValue(self, value):
-        """
+        r"""
         setValue(RealParameter self, double value)
-
         void RealParameter::setValue(double value)
 
         Sets value of wrapped parameter and emit signal. 
@@ -27850,11 +22154,9 @@ class RealParameter(IParameterReal):
         """
         return _libBornAgainCore.RealParameter_setValue(self, value)
 
-
     def value(self):
-        """
+        r"""
         value(RealParameter self) -> double
-
         double RealParameter::value() const
 
         Returns value of wrapped parameter. 
@@ -27862,83 +22164,68 @@ class RealParameter(IParameterReal):
         """
         return _libBornAgainCore.RealParameter_value(self)
 
-
     def setLimits(self, limits):
-        """
+        r"""
         setLimits(RealParameter self, RealLimits limits) -> RealParameter
-
         RealParameter & RealParameter::setLimits(const RealLimits &limits)
 
         """
         return _libBornAgainCore.RealParameter_setLimits(self, limits)
 
-
     def limits(self):
-        """
+        r"""
         limits(RealParameter self) -> RealLimits
-
         RealLimits RealParameter::limits() const
 
         """
         return _libBornAgainCore.RealParameter_limits(self)
 
-
     def setLimited(self, lower, upper):
-        """
+        r"""
         setLimited(RealParameter self, double lower, double upper) -> RealParameter
-
         RealParameter & RealParameter::setLimited(double lower, double upper)
 
         """
         return _libBornAgainCore.RealParameter_setLimited(self, lower, upper)
 
-
     def setPositive(self):
-        """
+        r"""
         setPositive(RealParameter self) -> RealParameter
-
         RealParameter & RealParameter::setPositive()
 
         """
         return _libBornAgainCore.RealParameter_setPositive(self)
 
-
     def setNonnegative(self):
-        """
+        r"""
         setNonnegative(RealParameter self) -> RealParameter
-
         RealParameter & RealParameter::setNonnegative()
 
         """
         return _libBornAgainCore.RealParameter_setNonnegative(self)
 
-
     def setUnit(self, name):
-        """
+        r"""
         setUnit(RealParameter self, std::string const & name) -> RealParameter
-
         RealParameter & RealParameter::setUnit(const std::string &name)
 
         """
         return _libBornAgainCore.RealParameter_setUnit(self, name)
 
-
     def unit(self):
-        """
+        r"""
         unit(RealParameter self) -> std::string
-
         std::string RealParameter::unit() const
 
         """
         return _libBornAgainCore.RealParameter_unit(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RealParameter
-    __del__ = lambda self: None
-RealParameter_swigregister = _libBornAgainCore.RealParameter_swigregister
-RealParameter_swigregister(RealParameter)
+
+# Register RealParameter in _libBornAgainCore:
+_libBornAgainCore.RealParameter_swigregister(RealParameter)
 
 class Rectangle(IShape2D):
-    """
+    r"""
 
 
     The rectangle shape having its axis aligned to the (non-rotated) coordinate system.
@@ -27947,20 +22234,12 @@ class Rectangle(IShape2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Rectangle, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IShape2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Rectangle, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, xlow, ylow, xup, yup):
-        """
+        r"""
         __init__(Rectangle self, double xlow, double ylow, double xup, double yup) -> Rectangle
-
         Rectangle::Rectangle(double xlow, double ylow, double xup, double yup)
 
         Parameters:
@@ -27979,27 +22258,20 @@ class Rectangle(IShape2D):
         y-coordinate of upper right corner 
 
         """
-        this = _libBornAgainCore.new_Rectangle(xlow, ylow, xup, yup)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.Rectangle_swiginit(self, _libBornAgainCore.new_Rectangle(xlow, ylow, xup, yup))
 
     def clone(self):
-        """
+        r"""
         clone(Rectangle self) -> Rectangle
-
         Rectangle* Rectangle::clone() const
 
         """
         return _libBornAgainCore.Rectangle_clone(self)
 
-
     def contains(self, *args):
-        """
+        r"""
         contains(Rectangle self, double x, double y) -> bool
         contains(Rectangle self, Bin1D binx, Bin1D biny) -> bool
-
         bool Rectangle::contains(const Bin1D &binx, const Bin1D &biny) const
 
         Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). 
@@ -28007,63 +22279,52 @@ class Rectangle(IShape2D):
         """
         return _libBornAgainCore.Rectangle_contains(self, *args)
 
-
     def getArea(self):
-        """
+        r"""
         getArea(Rectangle self) -> double
-
         double Rectangle::getArea() const
 
         """
         return _libBornAgainCore.Rectangle_getArea(self)
 
-
     def getXlow(self):
-        """
+        r"""
         getXlow(Rectangle self) -> double
-
         double Rectangle::getXlow() const
 
         """
         return _libBornAgainCore.Rectangle_getXlow(self)
 
-
     def getYlow(self):
-        """
+        r"""
         getYlow(Rectangle self) -> double
-
         double Rectangle::getYlow() const
 
         """
         return _libBornAgainCore.Rectangle_getYlow(self)
 
-
     def getXup(self):
-        """
+        r"""
         getXup(Rectangle self) -> double
-
         double Rectangle::getXup() const
 
         """
         return _libBornAgainCore.Rectangle_getXup(self)
 
-
     def getYup(self):
-        """
+        r"""
         getYup(Rectangle self) -> double
-
         double Rectangle::getYup() const
 
         """
         return _libBornAgainCore.Rectangle_getYup(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_Rectangle
-    __del__ = lambda self: None
-Rectangle_swigregister = _libBornAgainCore.Rectangle_swigregister
-Rectangle_swigregister(Rectangle)
+
+# Register Rectangle in _libBornAgainCore:
+_libBornAgainCore.Rectangle_swigregister(Rectangle)
 
 class RectangularDetector(IDetector2D):
-    """
+    r"""
 
 
     A flat rectangular detector with axes and resolution function.
@@ -28072,63 +22333,50 @@ class RectangularDetector(IDetector2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IDetector2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RectangularDetector, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IDetector2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RectangularDetector, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
     GENERIC = _libBornAgainCore.RectangularDetector_GENERIC
+    
     PERPENDICULAR_TO_SAMPLE = _libBornAgainCore.RectangularDetector_PERPENDICULAR_TO_SAMPLE
+    
     PERPENDICULAR_TO_DIRECT_BEAM = _libBornAgainCore.RectangularDetector_PERPENDICULAR_TO_DIRECT_BEAM
+    
     PERPENDICULAR_TO_REFLECTED_BEAM = _libBornAgainCore.RectangularDetector_PERPENDICULAR_TO_REFLECTED_BEAM
+    
     PERPENDICULAR_TO_REFLECTED_BEAM_DPOS = _libBornAgainCore.RectangularDetector_PERPENDICULAR_TO_REFLECTED_BEAM_DPOS
+    
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(RectangularDetector self, size_t nxbins, double width, size_t nybins, double height) -> RectangularDetector
         __init__(RectangularDetector self, RectangularDetector other) -> RectangularDetector
-
         RectangularDetector::RectangularDetector(const RectangularDetector &other)
 
         """
-        this = _libBornAgainCore.new_RectangularDetector(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RectangularDetector_swiginit(self, _libBornAgainCore.new_RectangularDetector(*args))
 
     def clone(self):
-        """
+        r"""
         clone(RectangularDetector self) -> RectangularDetector
-
         RectangularDetector * RectangularDetector::clone() const override
 
         """
         return _libBornAgainCore.RectangularDetector_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(RectangularDetector self, INodeVisitor visitor)
-
         void RectangularDetector::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
 
         """
         return _libBornAgainCore.RectangularDetector_accept(self, visitor)
-
     __swig_destroy__ = _libBornAgainCore.delete_RectangularDetector
-    __del__ = lambda self: None
 
     def init(self, beam):
-        """
+        r"""
         init(RectangularDetector self, Beam beam)
-
         void RectangularDetector::init(const Beam &beam) override
 
         Inits detector with the beam settings. 
@@ -28136,184 +22384,145 @@ class RectangularDetector(IDetector2D):
         """
         return _libBornAgainCore.RectangularDetector_init(self, beam)
 
-
     def setPosition(self, *args):
-        """
-        setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0, kvector_t direction)
-        setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0)
-
+        r"""
+        setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0, kvector_t direction=kvector_t(0.0, -1.0, 0.0))
         void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0, -1.0, 0.0))
 
         """
         return _libBornAgainCore.RectangularDetector_setPosition(self, *args)
 
-
     def setPerpendicularToSampleX(self, distance, u0, v0):
-        """
+        r"""
         setPerpendicularToSampleX(RectangularDetector self, double distance, double u0, double v0)
-
         void RectangularDetector::setPerpendicularToSampleX(double distance, double u0, double v0)
 
         """
         return _libBornAgainCore.RectangularDetector_setPerpendicularToSampleX(self, distance, u0, v0)
 
-
     def setPerpendicularToDirectBeam(self, distance, u0, v0):
-        """
+        r"""
         setPerpendicularToDirectBeam(RectangularDetector self, double distance, double u0, double v0)
-
         void RectangularDetector::setPerpendicularToDirectBeam(double distance, double u0, double v0)
 
         """
         return _libBornAgainCore.RectangularDetector_setPerpendicularToDirectBeam(self, distance, u0, v0)
 
-
     def setPerpendicularToReflectedBeam(self, distance, u0=0.0, v0=0.0):
-        """
+        r"""
         setPerpendicularToReflectedBeam(RectangularDetector self, double distance, double u0=0.0, double v0=0.0)
-        setPerpendicularToReflectedBeam(RectangularDetector self, double distance, double u0=0.0)
-        setPerpendicularToReflectedBeam(RectangularDetector self, double distance)
-
         void RectangularDetector::setPerpendicularToReflectedBeam(double distance, double u0=0.0, double v0=0.0)
 
         """
         return _libBornAgainCore.RectangularDetector_setPerpendicularToReflectedBeam(self, distance, u0, v0)
 
-
     def setDirectBeamPosition(self, u0, v0):
-        """
+        r"""
         setDirectBeamPosition(RectangularDetector self, double u0, double v0)
-
         void RectangularDetector::setDirectBeamPosition(double u0, double v0)
 
         """
         return _libBornAgainCore.RectangularDetector_setDirectBeamPosition(self, u0, v0)
 
-
     def getWidth(self):
-        """
+        r"""
         getWidth(RectangularDetector self) -> double
-
         double RectangularDetector::getWidth() const
 
         """
         return _libBornAgainCore.RectangularDetector_getWidth(self)
 
-
     def getHeight(self):
-        """
+        r"""
         getHeight(RectangularDetector self) -> double
-
         double RectangularDetector::getHeight() const
 
         """
         return _libBornAgainCore.RectangularDetector_getHeight(self)
 
-
     def getNbinsX(self):
-        """
+        r"""
         getNbinsX(RectangularDetector self) -> size_t
-
         size_t RectangularDetector::getNbinsX() const
 
         """
         return _libBornAgainCore.RectangularDetector_getNbinsX(self)
 
-
     def getNbinsY(self):
-        """
+        r"""
         getNbinsY(RectangularDetector self) -> size_t
-
         size_t RectangularDetector::getNbinsY() const
 
         """
         return _libBornAgainCore.RectangularDetector_getNbinsY(self)
 
-
     def getNormalVector(self):
-        """
+        r"""
         getNormalVector(RectangularDetector self) -> kvector_t
-
         kvector_t RectangularDetector::getNormalVector() const
 
         """
         return _libBornAgainCore.RectangularDetector_getNormalVector(self)
 
-
     def getU0(self):
-        """
+        r"""
         getU0(RectangularDetector self) -> double
-
         double RectangularDetector::getU0() const
 
         """
         return _libBornAgainCore.RectangularDetector_getU0(self)
 
-
     def getV0(self):
-        """
+        r"""
         getV0(RectangularDetector self) -> double
-
         double RectangularDetector::getV0() const
 
         """
         return _libBornAgainCore.RectangularDetector_getV0(self)
 
-
     def getDirectionVector(self):
-        """
+        r"""
         getDirectionVector(RectangularDetector self) -> kvector_t
-
         kvector_t RectangularDetector::getDirectionVector() const
 
         """
         return _libBornAgainCore.RectangularDetector_getDirectionVector(self)
 
-
     def getDistance(self):
-        """
+        r"""
         getDistance(RectangularDetector self) -> double
-
         double RectangularDetector::getDistance() const
 
         """
         return _libBornAgainCore.RectangularDetector_getDistance(self)
 
-
     def getDirectBeamU0(self):
-        """
+        r"""
         getDirectBeamU0(RectangularDetector self) -> double
-
         double RectangularDetector::getDirectBeamU0() const
 
         """
         return _libBornAgainCore.RectangularDetector_getDirectBeamU0(self)
 
-
     def getDirectBeamV0(self):
-        """
+        r"""
         getDirectBeamV0(RectangularDetector self) -> double
-
         double RectangularDetector::getDirectBeamV0() const
 
         """
         return _libBornAgainCore.RectangularDetector_getDirectBeamV0(self)
 
-
     def getDetectorArrangment(self):
-        """
+        r"""
         getDetectorArrangment(RectangularDetector self) -> RectangularDetector::EDetectorArrangement
-
         RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const
 
         """
         return _libBornAgainCore.RectangularDetector_getDetectorArrangment(self)
 
-
     def defaultAxesUnits(self):
-        """
+        r"""
         defaultAxesUnits(RectangularDetector self) -> AxesUnits
-
         AxesUnits RectangularDetector::defaultAxesUnits() const override
 
         return default axes units 
@@ -28321,111 +22530,85 @@ class RectangularDetector(IDetector2D):
         """
         return _libBornAgainCore.RectangularDetector_defaultAxesUnits(self)
 
-
     def regionOfInterestPixel(self):
-        """
+        r"""
         regionOfInterestPixel(RectangularDetector self) -> RectangularPixel
-
         RectangularPixel * RectangularDetector::regionOfInterestPixel() const
 
         """
         return _libBornAgainCore.RectangularDetector_regionOfInterestPixel(self)
 
-RectangularDetector_swigregister = _libBornAgainCore.RectangularDetector_swigregister
-RectangularDetector_swigregister(RectangularDetector)
+# Register RectangularDetector in _libBornAgainCore:
+_libBornAgainCore.RectangularDetector_swigregister(RectangularDetector)
 
 class RectangularPixel(IPixel):
-    """Proxy of C++ RectangularPixel class."""
-
-    __swig_setmethods__ = {}
-    for _s in [IPixel]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RectangularPixel, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IPixel]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, RectangularPixel, name)
+    r"""Proxy of C++ RectangularPixel class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, corner_pos, width, height):
-        """
+        r"""
         __init__(RectangularPixel self, kvector_t corner_pos, kvector_t width, kvector_t height) -> RectangularPixel
-
         RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)
 
         """
-        this = _libBornAgainCore.new_RectangularPixel(corner_pos, width, height)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.RectangularPixel_swiginit(self, _libBornAgainCore.new_RectangularPixel(corner_pos, width, height))
 
     def clone(self):
-        """
+        r"""
         clone(RectangularPixel self) -> RectangularPixel
-
         RectangularPixel * RectangularPixel::clone() const override
 
         """
         return _libBornAgainCore.RectangularPixel_clone(self)
 
-
     def createZeroSizePixel(self, x, y):
-        """
+        r"""
         createZeroSizePixel(RectangularPixel self, double x, double y) -> RectangularPixel
-
         RectangularPixel * RectangularPixel::createZeroSizePixel(double x, double y) const override
 
         """
         return _libBornAgainCore.RectangularPixel_createZeroSizePixel(self, x, y)
 
-
     def getK(self, x, y, wavelength):
-        """
+        r"""
         getK(RectangularPixel self, double x, double y, double wavelength) -> kvector_t
-
         kvector_t RectangularPixel::getK(double x, double y, double wavelength) const override
 
         """
         return _libBornAgainCore.RectangularPixel_getK(self, x, y, wavelength)
 
-
     def getPosition(self, x, y):
-        """
+        r"""
         getPosition(RectangularPixel self, double x, double y) -> kvector_t
-
         kvector_t RectangularPixel::getPosition(double x, double y) const
 
         """
         return _libBornAgainCore.RectangularPixel_getPosition(self, x, y)
 
-
     def getIntegrationFactor(self, x, y):
-        """
+        r"""
         getIntegrationFactor(RectangularPixel self, double x, double y) -> double
-
         double RectangularPixel::getIntegrationFactor(double x, double y) const override
 
         """
         return _libBornAgainCore.RectangularPixel_getIntegrationFactor(self, x, y)
 
-
     def getSolidAngle(self):
-        """
+        r"""
         getSolidAngle(RectangularPixel self) -> double
-
         double RectangularPixel::getSolidAngle() const override
 
         """
         return _libBornAgainCore.RectangularPixel_getSolidAngle(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_RectangularPixel
-    __del__ = lambda self: None
-RectangularPixel_swigregister = _libBornAgainCore.RectangularPixel_swigregister
-RectangularPixel_swigregister(RectangularPixel)
+
+# Register RectangularPixel in _libBornAgainCore:
+_libBornAgainCore.RectangularPixel_swigregister(RectangularPixel)
 
 class ResolutionFunction2DGaussian(IResolutionFunction2D):
-    """
+    r"""
 
 
     Simple gaussian two-dimensional resolution function.
@@ -28434,53 +22617,36 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [IResolutionFunction2D]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ResolutionFunction2DGaussian, name, value)
-    __swig_getmethods__ = {}
-    for _s in [IResolutionFunction2D]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ResolutionFunction2DGaussian, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, sigma_x, sigma_y):
-        """
+        r"""
         __init__(ResolutionFunction2DGaussian self, double sigma_x, double sigma_y) -> ResolutionFunction2DGaussian
-
         ResolutionFunction2DGaussian::ResolutionFunction2DGaussian(double sigma_x, double sigma_y)
 
         """
-        this = _libBornAgainCore.new_ResolutionFunction2DGaussian(sigma_x, sigma_y)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.ResolutionFunction2DGaussian_swiginit(self, _libBornAgainCore.new_ResolutionFunction2DGaussian(sigma_x, sigma_y))
 
     def evaluateCDF(self, x, y):
-        """
+        r"""
         evaluateCDF(ResolutionFunction2DGaussian self, double x, double y) -> double
-
         double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const
 
         """
         return _libBornAgainCore.ResolutionFunction2DGaussian_evaluateCDF(self, x, y)
 
-
     def clone(self):
-        """
+        r"""
         clone(ResolutionFunction2DGaussian self) -> ResolutionFunction2DGaussian
-
         ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const
 
         """
         return _libBornAgainCore.ResolutionFunction2DGaussian_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(ResolutionFunction2DGaussian self, INodeVisitor visitor)
-
         void ResolutionFunction2DGaussian::accept(INodeVisitor *visitor) const final
 
         Calls the  INodeVisitor's visit method. 
@@ -28488,94 +22654,73 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
         """
         return _libBornAgainCore.ResolutionFunction2DGaussian_accept(self, visitor)
 
-
     def getSigmaX(self):
-        """
+        r"""
         getSigmaX(ResolutionFunction2DGaussian self) -> double
-
         double ResolutionFunction2DGaussian::getSigmaX() const
 
         """
         return _libBornAgainCore.ResolutionFunction2DGaussian_getSigmaX(self)
 
-
     def getSigmaY(self):
-        """
+        r"""
         getSigmaY(ResolutionFunction2DGaussian self) -> double
-
         double ResolutionFunction2DGaussian::getSigmaY() const
 
         """
         return _libBornAgainCore.ResolutionFunction2DGaussian_getSigmaY(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_ResolutionFunction2DGaussian
-    __del__ = lambda self: None
-ResolutionFunction2DGaussian_swigregister = _libBornAgainCore.ResolutionFunction2DGaussian_swigregister
-ResolutionFunction2DGaussian_swigregister(ResolutionFunction2DGaussian)
 
-class RoughnessModel(_object):
-    """Proxy of C++ RoughnessModelWrap class."""
+# Register ResolutionFunction2DGaussian in _libBornAgainCore:
+_libBornAgainCore.ResolutionFunction2DGaussian_swigregister(ResolutionFunction2DGaussian)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RoughnessModel, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RoughnessModel, name)
+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")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     DEFAULT = _libBornAgainCore.RoughnessModel_DEFAULT
+    
     TANH = _libBornAgainCore.RoughnessModel_TANH
+    
     NEVOT_CROCE = _libBornAgainCore.RoughnessModel_NEVOT_CROCE
+    
     __swig_destroy__ = _libBornAgainCore.delete_RoughnessModel
-    __del__ = lambda self: None
-RoughnessModel_swigregister = _libBornAgainCore.RoughnessModel_swigregister
-RoughnessModel_swigregister(RoughnessModel)
+
+# Register RoughnessModel in _libBornAgainCore:
+_libBornAgainCore.RoughnessModel_swigregister(RoughnessModel)
 
 class DepthProbeSimulation(Simulation):
-    """Proxy of C++ DepthProbeSimulation class."""
-
-    __swig_setmethods__ = {}
-    for _s in [Simulation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DepthProbeSimulation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Simulation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DepthProbeSimulation, name)
+    r"""Proxy of C++ DepthProbeSimulation class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(DepthProbeSimulation self) -> DepthProbeSimulation
         __init__(DepthProbeSimulation self, MultiLayer sample) -> DepthProbeSimulation
         __init__(DepthProbeSimulation self, std::shared_ptr< IMultiLayerBuilder > const sample_builder) -> DepthProbeSimulation
-
         DepthProbeSimulation::DepthProbeSimulation(const std::shared_ptr< IMultiLayerBuilder > sample_builder)
 
         """
-        this = _libBornAgainCore.new_DepthProbeSimulation(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.DepthProbeSimulation_swiginit(self, _libBornAgainCore.new_DepthProbeSimulation(*args))
     __swig_destroy__ = _libBornAgainCore.delete_DepthProbeSimulation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(DepthProbeSimulation self) -> DepthProbeSimulation
-
         DepthProbeSimulation * DepthProbeSimulation::clone() const override
 
         """
         return _libBornAgainCore.DepthProbeSimulation_clone(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(DepthProbeSimulation self, INodeVisitor visitor)
-
         void DepthProbeSimulation::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -28583,11 +22728,9 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_accept(self, visitor)
 
-
     def result(self):
-        """
+        r"""
         result(DepthProbeSimulation self) -> SimulationResult
-
         SimulationResult DepthProbeSimulation::result() const override
 
         Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays 
@@ -28595,24 +22738,19 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_result(self)
 
-
-    def setBeamParameters(self, arg2, nbins, alpha_i_min, alpha_i_max, beam_shape=None):
-        """
-        setBeamParameters(DepthProbeSimulation self, double arg2, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor beam_shape=None)
-        setBeamParameters(DepthProbeSimulation self, double arg2, int nbins, double alpha_i_min, double alpha_i_max)
-
+    def setBeamParameters(self, _lambda, nbins, alpha_i_min, alpha_i_max, beam_shape=None):
+        r"""
+        setBeamParameters(DepthProbeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor beam_shape=None)
         void DepthProbeSimulation::setBeamParameters(double lambda, int nbins, double alpha_i_min, double alpha_i_max, const IFootprintFactor *beam_shape=nullptr)
 
         Sets beam parameters with alpha_i of the beam defined in the range. 
 
         """
-        return _libBornAgainCore.DepthProbeSimulation_setBeamParameters(self, arg2, nbins, alpha_i_min, alpha_i_max, beam_shape)
-
+        return _libBornAgainCore.DepthProbeSimulation_setBeamParameters(self, _lambda, nbins, alpha_i_min, alpha_i_max, beam_shape)
 
     def setZSpan(self, n_bins, z_min, z_max):
-        """
+        r"""
         setZSpan(DepthProbeSimulation self, size_t n_bins, double z_min, double z_max)
-
         void DepthProbeSimulation::setZSpan(size_t n_bins, double z_min, double z_max)
 
         Set z positions for intensity calculations. Negative z's correspond to the area under sample surface. The more negative z is, the deeper layer corresponds to it. 
@@ -28620,11 +22758,9 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_setZSpan(self, n_bins, z_min, z_max)
 
-
     def getAlphaAxis(self):
-        """
+        r"""
         getAlphaAxis(DepthProbeSimulation self) -> IAxis
-
         const IAxis * DepthProbeSimulation::getAlphaAxis() const
 
         Returns a pointer to incident angle axis. 
@@ -28632,11 +22768,9 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_getAlphaAxis(self)
 
-
     def getZAxis(self):
-        """
+        r"""
         getZAxis(DepthProbeSimulation self) -> IAxis
-
         const IAxis * DepthProbeSimulation::getZAxis() const
 
         Returns a pointer to z-position axis. 
@@ -28644,11 +22778,9 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_getZAxis(self)
 
-
     def intensityMapSize(self):
-        """
+        r"""
         intensityMapSize(DepthProbeSimulation self) -> size_t
-
         size_t DepthProbeSimulation::intensityMapSize() const override
 
         Returns the total number of the intensity values in the simulation result. 
@@ -28656,11 +22788,11 @@ class DepthProbeSimulation(Simulation):
         """
         return _libBornAgainCore.DepthProbeSimulation_intensityMapSize(self)
 
-DepthProbeSimulation_swigregister = _libBornAgainCore.DepthProbeSimulation_swigregister
-DepthProbeSimulation_swigregister(DepthProbeSimulation)
+# Register DepthProbeSimulation in _libBornAgainCore:
+_libBornAgainCore.DepthProbeSimulation_swigregister(DepthProbeSimulation)
 
 class SpecularSimulation(Simulation):
-    """
+    r"""
 
 
     Main class to run a specular simulation.
@@ -28669,47 +22801,31 @@ class SpecularSimulation(Simulation):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [Simulation]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SpecularSimulation, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Simulation]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SpecularSimulation, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(SpecularSimulation self) -> SpecularSimulation
         __init__(SpecularSimulation self, MultiLayer sample) -> SpecularSimulation
         __init__(SpecularSimulation self, std::shared_ptr< IMultiLayerBuilder > const sample_builder) -> SpecularSimulation
-
         SpecularSimulation::SpecularSimulation(const std::shared_ptr< IMultiLayerBuilder > sample_builder)
 
         """
-        this = _libBornAgainCore.new_SpecularSimulation(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SpecularSimulation_swiginit(self, _libBornAgainCore.new_SpecularSimulation(*args))
     __swig_destroy__ = _libBornAgainCore.delete_SpecularSimulation
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(SpecularSimulation self) -> SpecularSimulation
-
         SpecularSimulation * SpecularSimulation::clone() const override
 
         """
         return _libBornAgainCore.SpecularSimulation_clone(self)
 
-
     def prepareSimulation(self):
-        """
+        r"""
         prepareSimulation(SpecularSimulation self)
-
         void SpecularSimulation::prepareSimulation() override
 
         Put into a clean state for running a simulation. 
@@ -28717,11 +22833,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_prepareSimulation(self)
 
-
     def accept(self, visitor):
-        """
+        r"""
         accept(SpecularSimulation self, INodeVisitor visitor)
-
         void SpecularSimulation::accept(INodeVisitor *visitor) const override final
 
         Calls the  INodeVisitor's visit method. 
@@ -28729,11 +22843,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_accept(self, visitor)
 
-
     def result(self):
-        """
+        r"""
         result(SpecularSimulation self) -> SimulationResult
-
         SimulationResult SpecularSimulation::result() const override
 
         Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays. If simulation was not run, returns an array of proper size filled with zeros. 
@@ -28741,11 +22853,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_result(self)
 
-
     def setScan(self, scan):
-        """
+        r"""
         setScan(SpecularSimulation self, ISpecularScan const & scan)
-
         void SpecularSimulation::setScan(const ISpecularScan &scan)
 
         Sets chosen specular scan to the simulation. 
@@ -28753,11 +22863,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_setScan(self, scan)
 
-
     def coordinateAxis(self):
-        """
+        r"""
         coordinateAxis(SpecularSimulation self) -> IAxis
-
         const IAxis * SpecularSimulation::coordinateAxis() const
 
         Returns a pointer to coordinate axis. 
@@ -28765,11 +22873,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_coordinateAxis(self)
 
-
     def footprintFactor(self):
-        """
+        r"""
         footprintFactor(SpecularSimulation self) -> IFootprintFactor
-
         const IFootprintFactor * SpecularSimulation::footprintFactor() const
 
         Returns a pointer to footprint factor holder. 
@@ -28777,11 +22883,9 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_footprintFactor(self)
 
-
     def intensityMapSize(self):
-        """
+        r"""
         intensityMapSize(SpecularSimulation self) -> size_t
-
         size_t SpecularSimulation::intensityMapSize() const override
 
         Returns the total number of the intensity values in the simulation result. 
@@ -28789,16 +22893,16 @@ class SpecularSimulation(Simulation):
         """
         return _libBornAgainCore.SpecularSimulation_intensityMapSize(self)
 
-
     def setSampleBuilder(self, ptr):
         self.samplebuilder = ptr
         self.setSampleBuilderCpp(ptr)
 
-SpecularSimulation_swigregister = _libBornAgainCore.SpecularSimulation_swigregister
-SpecularSimulation_swigregister(SpecularSimulation)
 
-class ThreadInfo(_object):
-    """
+# Register SpecularSimulation in _libBornAgainCore:
+_libBornAgainCore.SpecularSimulation_swigregister(SpecularSimulation)
+
+class ThreadInfo(object):
+    r"""
 
 
     Information to run simulation with dedicated number of threads.
@@ -28807,43 +22911,26 @@ class ThreadInfo(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ThreadInfo, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ThreadInfo, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(ThreadInfo self) -> ThreadInfo
-
         ThreadInfo::ThreadInfo()
 
         """
-        this = _libBornAgainCore.new_ThreadInfo()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
-    __swig_setmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_set
-    __swig_getmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_get
-    if _newclass:
-        n_threads = _swig_property(_libBornAgainCore.ThreadInfo_n_threads_get, _libBornAgainCore.ThreadInfo_n_threads_set)
-    __swig_setmethods__["n_batches"] = _libBornAgainCore.ThreadInfo_n_batches_set
-    __swig_getmethods__["n_batches"] = _libBornAgainCore.ThreadInfo_n_batches_get
-    if _newclass:
-        n_batches = _swig_property(_libBornAgainCore.ThreadInfo_n_batches_get, _libBornAgainCore.ThreadInfo_n_batches_set)
-    __swig_setmethods__["current_batch"] = _libBornAgainCore.ThreadInfo_current_batch_set
-    __swig_getmethods__["current_batch"] = _libBornAgainCore.ThreadInfo_current_batch_get
-    if _newclass:
-        current_batch = _swig_property(_libBornAgainCore.ThreadInfo_current_batch_get, _libBornAgainCore.ThreadInfo_current_batch_set)
+        _libBornAgainCore.ThreadInfo_swiginit(self, _libBornAgainCore.new_ThreadInfo())
+    n_threads = property(_libBornAgainCore.ThreadInfo_n_threads_get, _libBornAgainCore.ThreadInfo_n_threads_set, doc=r"""n_threads : unsigned int""")
+    n_batches = property(_libBornAgainCore.ThreadInfo_n_batches_get, _libBornAgainCore.ThreadInfo_n_batches_set, doc=r"""n_batches : unsigned int""")
+    current_batch = property(_libBornAgainCore.ThreadInfo_current_batch_get, _libBornAgainCore.ThreadInfo_current_batch_set, doc=r"""current_batch : unsigned int""")
     __swig_destroy__ = _libBornAgainCore.delete_ThreadInfo
-    __del__ = lambda self: None
-ThreadInfo_swigregister = _libBornAgainCore.ThreadInfo_swigregister
-ThreadInfo_swigregister(ThreadInfo)
 
-class SampleBuilderFactoryTemp(_object):
-    """
+# Register ThreadInfo in _libBornAgainCore:
+_libBornAgainCore.ThreadInfo_swigregister(ThreadInfo)
+
+class SampleBuilderFactoryTemp(object):
+    r"""
 
 
     Base class for all factories.
@@ -28852,29 +22939,20 @@ class SampleBuilderFactoryTemp(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SampleBuilderFactoryTemp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SampleBuilderFactoryTemp, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(IFactory<(std::string,IMultiLayerBuilder)> self) -> SampleBuilderFactoryTemp
-
+        r"""
+        __init__(SampleBuilderFactoryTemp self) -> SampleBuilderFactoryTemp
         IFactory< Key, AbstractProduct >::IFactory()
 
         """
-        this = _libBornAgainCore.new_SampleBuilderFactoryTemp()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SampleBuilderFactoryTemp_swiginit(self, _libBornAgainCore.new_SampleBuilderFactoryTemp())
 
     def createItem(self, item_key):
-        """
+        r"""
         createItem(SampleBuilderFactoryTemp self, std::string const & item_key) -> IMultiLayerBuilder
-
         AbstractProduct* IFactory< Key, AbstractProduct >::createItem(const Key &item_key)
 
         Creates object by calling creation function corresponded to given identifier. 
@@ -28882,12 +22960,9 @@ class SampleBuilderFactoryTemp(_object):
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_createItem(self, item_key)
 
-
     def registerItem(self, *args):
-        """
-        registerItem(SampleBuilderFactoryTemp self, std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn, std::string const & itemDescription) -> bool
-        registerItem(SampleBuilderFactoryTemp self, std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn) -> bool
-
+        r"""
+        registerItem(SampleBuilderFactoryTemp self, std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn, std::string const & itemDescription="") -> bool
         bool IFactory< Key, AbstractProduct >::registerItem(const Key &item_key, CreateItemCallback CreateFn, const std::string &itemDescription="")
 
         Registers object's creation function and store object description. 
@@ -28895,23 +22970,18 @@ class SampleBuilderFactoryTemp(_object):
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_registerItem(self, *args)
 
-
     def contains(self, item_key):
-        """
+        r"""
         contains(SampleBuilderFactoryTemp self, std::string const & item_key) -> bool
-
         bool IFactory< Key, AbstractProduct >::contains(const Key &item_key) const
 
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_contains(self, item_key)
-
     __swig_destroy__ = _libBornAgainCore.delete_SampleBuilderFactoryTemp
-    __del__ = lambda self: None
 
     def size(self):
-        """
+        r"""
         size(SampleBuilderFactoryTemp self) -> size_t
-
         size_t IFactory< Key, AbstractProduct >::size() const
 
         Returns number of registered objects. 
@@ -28919,31 +22989,27 @@ class SampleBuilderFactoryTemp(_object):
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_size(self)
 
-
     def begin(self):
-        """
+        r"""
         begin(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator
-
         const_iterator IFactory< Key, AbstractProduct >::begin() const
 
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_begin(self)
 
-
     def end(self):
-        """
+        r"""
         end(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator
-
         const_iterator IFactory< Key, AbstractProduct >::end() const
 
         """
         return _libBornAgainCore.SampleBuilderFactoryTemp_end(self)
 
-SampleBuilderFactoryTemp_swigregister = _libBornAgainCore.SampleBuilderFactoryTemp_swigregister
-SampleBuilderFactoryTemp_swigregister(SampleBuilderFactoryTemp)
+# Register SampleBuilderFactoryTemp in _libBornAgainCore:
+_libBornAgainCore.SampleBuilderFactoryTemp_swigregister(SampleBuilderFactoryTemp)
 
 class SampleBuilderFactory(SampleBuilderFactoryTemp):
-    """
+    r"""
 
 
     Factory to create standard pre-defined samples
@@ -28952,47 +23018,33 @@ class SampleBuilderFactory(SampleBuilderFactoryTemp):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [SampleBuilderFactoryTemp]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SampleBuilderFactory, name, value)
-    __swig_getmethods__ = {}
-    for _s in [SampleBuilderFactoryTemp]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SampleBuilderFactory, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(SampleBuilderFactory self) -> SampleBuilderFactory
-
         SampleBuilderFactory::SampleBuilderFactory()
 
         """
-        this = _libBornAgainCore.new_SampleBuilderFactory()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SampleBuilderFactory_swiginit(self, _libBornAgainCore.new_SampleBuilderFactory())
 
     def createSample(self, name):
-        """
+        r"""
         createSample(SampleBuilderFactory self, std::string const & name) -> MultiLayer
-
         MultiLayer * SampleBuilderFactory::createSample(const std::string &name)
 
         Retrieves a SampleBuilder from the registry, does the build, and returns the result. 
 
         """
         return _libBornAgainCore.SampleBuilderFactory_createSample(self, name)
-
     __swig_destroy__ = _libBornAgainCore.delete_SampleBuilderFactory
-    __del__ = lambda self: None
-SampleBuilderFactory_swigregister = _libBornAgainCore.SampleBuilderFactory_swigregister
-SampleBuilderFactory_swigregister(SampleBuilderFactory)
 
-class SimulationFactoryTemp(_object):
-    """
+# Register SampleBuilderFactory in _libBornAgainCore:
+_libBornAgainCore.SampleBuilderFactory_swigregister(SampleBuilderFactory)
+
+class SimulationFactoryTemp(object):
+    r"""
 
 
     Base class for all factories.
@@ -29001,29 +23053,20 @@ class SimulationFactoryTemp(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationFactoryTemp, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SimulationFactoryTemp, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(IFactory<(std::string,Simulation)> self) -> SimulationFactoryTemp
-
+        r"""
+        __init__(SimulationFactoryTemp self) -> SimulationFactoryTemp
         IFactory< Key, AbstractProduct >::IFactory()
 
         """
-        this = _libBornAgainCore.new_SimulationFactoryTemp()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SimulationFactoryTemp_swiginit(self, _libBornAgainCore.new_SimulationFactoryTemp())
 
     def createItem(self, item_key):
-        """
+        r"""
         createItem(SimulationFactoryTemp self, std::string const & item_key) -> Simulation
-
         AbstractProduct* IFactory< Key, AbstractProduct >::createItem(const Key &item_key)
 
         Creates object by calling creation function corresponded to given identifier. 
@@ -29031,12 +23074,9 @@ class SimulationFactoryTemp(_object):
         """
         return _libBornAgainCore.SimulationFactoryTemp_createItem(self, item_key)
 
-
     def registerItem(self, *args):
-        """
-        registerItem(SimulationFactoryTemp self, std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn, std::string const & itemDescription) -> bool
-        registerItem(SimulationFactoryTemp self, std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn) -> bool
-
+        r"""
+        registerItem(SimulationFactoryTemp self, std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn, std::string const & itemDescription="") -> bool
         bool IFactory< Key, AbstractProduct >::registerItem(const Key &item_key, CreateItemCallback CreateFn, const std::string &itemDescription="")
 
         Registers object's creation function and store object description. 
@@ -29044,23 +23084,18 @@ class SimulationFactoryTemp(_object):
         """
         return _libBornAgainCore.SimulationFactoryTemp_registerItem(self, *args)
 
-
     def contains(self, item_key):
-        """
+        r"""
         contains(SimulationFactoryTemp self, std::string const & item_key) -> bool
-
         bool IFactory< Key, AbstractProduct >::contains(const Key &item_key) const
 
         """
         return _libBornAgainCore.SimulationFactoryTemp_contains(self, item_key)
-
     __swig_destroy__ = _libBornAgainCore.delete_SimulationFactoryTemp
-    __del__ = lambda self: None
 
     def size(self):
-        """
+        r"""
         size(SimulationFactoryTemp self) -> size_t
-
         size_t IFactory< Key, AbstractProduct >::size() const
 
         Returns number of registered objects. 
@@ -29068,31 +23103,27 @@ class SimulationFactoryTemp(_object):
         """
         return _libBornAgainCore.SimulationFactoryTemp_size(self)
 
-
     def begin(self):
-        """
+        r"""
         begin(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator
-
         const_iterator IFactory< Key, AbstractProduct >::begin() const
 
         """
         return _libBornAgainCore.SimulationFactoryTemp_begin(self)
 
-
     def end(self):
-        """
+        r"""
         end(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator
-
         const_iterator IFactory< Key, AbstractProduct >::end() const
 
         """
         return _libBornAgainCore.SimulationFactoryTemp_end(self)
 
-SimulationFactoryTemp_swigregister = _libBornAgainCore.SimulationFactoryTemp_swigregister
-SimulationFactoryTemp_swigregister(SimulationFactoryTemp)
+# Register SimulationFactoryTemp in _libBornAgainCore:
+_libBornAgainCore.SimulationFactoryTemp_swigregister(SimulationFactoryTemp)
 
 class SimulationFactory(SimulationFactoryTemp):
-    """
+    r"""
 
 
     Registry to create standard pre-defined simulations. Used in functional tests, performance measurements, etc.
@@ -29101,35 +23132,23 @@ class SimulationFactory(SimulationFactoryTemp):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [SimulationFactoryTemp]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationFactory, name, value)
-    __swig_getmethods__ = {}
-    for _s in [SimulationFactoryTemp]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SimulationFactory, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(SimulationFactory self) -> SimulationFactory
-
         SimulationFactory::SimulationFactory()
 
         """
-        this = _libBornAgainCore.new_SimulationFactory()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.SimulationFactory_swiginit(self, _libBornAgainCore.new_SimulationFactory())
     __swig_destroy__ = _libBornAgainCore.delete_SimulationFactory
-    __del__ = lambda self: None
-SimulationFactory_swigregister = _libBornAgainCore.SimulationFactory_swigregister
-SimulationFactory_swigregister(SimulationFactory)
 
-class AxesUnits(_object):
-    """
+# Register SimulationFactory in _libBornAgainCore:
+_libBornAgainCore.SimulationFactory_swigregister(SimulationFactory)
+
+class AxesUnits(object):
+    r"""
 
 
     Wrapper for detector axes units, required for a better representation of detector axes units in python
@@ -29138,29 +23157,34 @@ class AxesUnits(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, AxesUnits, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, AxesUnits, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     DEFAULT = _libBornAgainCore.AxesUnits_DEFAULT
+    
     NBINS = _libBornAgainCore.AxesUnits_NBINS
+    
     RADIANS = _libBornAgainCore.AxesUnits_RADIANS
+    
     DEGREES = _libBornAgainCore.AxesUnits_DEGREES
+    
     MM = _libBornAgainCore.AxesUnits_MM
+    
     QSPACE = _libBornAgainCore.AxesUnits_QSPACE
+    
     QXQY = _libBornAgainCore.AxesUnits_QXQY
+    
     RQ4 = _libBornAgainCore.AxesUnits_RQ4
+    
     __swig_destroy__ = _libBornAgainCore.delete_AxesUnits
-    __del__ = lambda self: None
-AxesUnits_swigregister = _libBornAgainCore.AxesUnits_swigregister
-AxesUnits_swigregister(AxesUnits)
+
+# Register AxesUnits in _libBornAgainCore:
+_libBornAgainCore.AxesUnits_swigregister(AxesUnits)
 
 class IUnitConverter(ICloneable):
-    """
+    r"""
 
 
     Interface to provide axis translations to different units for simulation output
@@ -29169,106 +23193,82 @@ class IUnitConverter(ICloneable):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IUnitConverter, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IUnitConverter, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_IUnitConverter
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(IUnitConverter self) -> IUnitConverter
-
         virtual IUnitConverter* IUnitConverter::clone() const =0
 
         """
         return _libBornAgainCore.IUnitConverter_clone(self)
 
-
     def dimension(self):
-        """
+        r"""
         dimension(IUnitConverter self) -> size_t
-
         virtual size_t IUnitConverter::dimension() const =0
 
         """
         return _libBornAgainCore.IUnitConverter_dimension(self)
 
-
     def calculateMin(self, i_axis, units_type):
-        """
+        r"""
         calculateMin(IUnitConverter self, size_t i_axis, AxesUnits units_type) -> double
-
         virtual double IUnitConverter::calculateMin(size_t i_axis, AxesUnits units_type) const =0
 
         """
         return _libBornAgainCore.IUnitConverter_calculateMin(self, i_axis, units_type)
 
-
     def calculateMax(self, i_axis, units_type):
-        """
+        r"""
         calculateMax(IUnitConverter self, size_t i_axis, AxesUnits units_type) -> double
-
         virtual double IUnitConverter::calculateMax(size_t i_axis, AxesUnits units_type) const =0
 
         """
         return _libBornAgainCore.IUnitConverter_calculateMax(self, i_axis, units_type)
 
-
     def axisSize(self, i_axis):
-        """
+        r"""
         axisSize(IUnitConverter self, size_t i_axis) -> size_t
-
         virtual size_t IUnitConverter::axisSize(size_t i_axis) const =0
 
         """
         return _libBornAgainCore.IUnitConverter_axisSize(self, i_axis)
 
-
     def axisName(self, *args):
-        """
-        axisName(IUnitConverter self, size_t i_axis, AxesUnits units_type) -> std::string
-        axisName(IUnitConverter self, size_t i_axis) -> std::string
-
+        r"""
+        axisName(IUnitConverter self, size_t i_axis, AxesUnits units_type=AxesUnits::DEFAULT) -> std::string
         std::string IUnitConverter::axisName(size_t i_axis, AxesUnits units_type=AxesUnits::DEFAULT) const
 
         """
         return _libBornAgainCore.IUnitConverter_axisName(self, *args)
 
-
     def availableUnits(self):
-        """
+        r"""
         availableUnits(IUnitConverter self) -> std::vector< AxesUnits,std::allocator< AxesUnits > >
-
         virtual std::vector<AxesUnits> IUnitConverter::availableUnits() const =0
 
         """
         return _libBornAgainCore.IUnitConverter_availableUnits(self)
 
-
     def defaultUnits(self):
-        """
+        r"""
         defaultUnits(IUnitConverter self) -> AxesUnits
-
         virtual AxesUnits IUnitConverter::defaultUnits() const =0
 
         """
         return _libBornAgainCore.IUnitConverter_defaultUnits(self)
 
-IUnitConverter_swigregister = _libBornAgainCore.IUnitConverter_swigregister
-IUnitConverter_swigregister(IUnitConverter)
+# Register IUnitConverter in _libBornAgainCore:
+_libBornAgainCore.IUnitConverter_swigregister(IUnitConverter)
 
-class IterationInfo(_object):
-    """
+class IterationInfo(object):
+    r"""
 
 
     Stores fit iteration info to track fit flow from various observers. Used in context of  FitObjective.
@@ -29277,39 +23277,28 @@ class IterationInfo(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IterationInfo, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IterationInfo, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(IterationInfo self) -> IterationInfo
-
         IterationInfo::IterationInfo()
 
         """
-        this = _libBornAgainCore.new_IterationInfo()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.IterationInfo_swiginit(self, _libBornAgainCore.new_IterationInfo())
 
     def update(self, params, chi2):
-        """
+        r"""
         update(IterationInfo self, Parameters params, double chi2)
-
         void IterationInfo::update(const Fit::Parameters &params, double chi2)
 
         """
         return _libBornAgainCore.IterationInfo_update(self, params, chi2)
 
-
     def iterationCount(self):
-        """
+        r"""
         iterationCount(IterationInfo self) -> unsigned int
-
         unsigned IterationInfo::iterationCount() const
 
         Returns current number of minimizer iterations. 
@@ -29317,57 +23306,46 @@ class IterationInfo(_object):
         """
         return _libBornAgainCore.IterationInfo_iterationCount(self)
 
-
     def chi2(self):
-        """
+        r"""
         chi2(IterationInfo self) -> double
-
         double IterationInfo::chi2() const
 
         """
         return _libBornAgainCore.IterationInfo_chi2(self)
 
-
     def parameters(self):
-        """
+        r"""
         parameters(IterationInfo self) -> Parameters
-
         Fit::Parameters IterationInfo::parameters() const
 
         """
         return _libBornAgainCore.IterationInfo_parameters(self)
 
-
     def parameterMap(self):
-        """
+        r"""
         parameterMap(IterationInfo self) -> map_string_double_t
-
         std::map< std::string, double > IterationInfo::parameterMap() const
 
         Returns map of fit parameter names and its current values. 
 
         """
         return _libBornAgainCore.IterationInfo_parameterMap(self)
-
     __swig_destroy__ = _libBornAgainCore.delete_IterationInfo
-    __del__ = lambda self: None
-IterationInfo_swigregister = _libBornAgainCore.IterationInfo_swigregister
-IterationInfo_swigregister(IterationInfo)
 
+# Register IterationInfo in _libBornAgainCore:
+_libBornAgainCore.IterationInfo_swigregister(IterationInfo)
 
-def FindPeaks(*args):
-    """
-    FindPeaks(Histogram2D hist, double sigma=2, std::string const & option, double threshold=0.05) -> vector_pair_double_t
-    FindPeaks(Histogram2D hist, double sigma=2, std::string const & option) -> vector_pair_double_t
-    FindPeaks(Histogram2D hist, double sigma=2) -> vector_pair_double_t
-    FindPeaks(Histogram2D hist) -> vector_pair_double_t
 
+def FindPeaks(*args):
+    r"""
+    FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pair_double_t
     std::vector< std::pair< double, double > > SpectrumUtils::FindPeaks(const Histogram2D &hist, double sigma=2, const std::string &option={}, double threshold=0.05)
 
     """
     return _libBornAgainCore.FindPeaks(*args)
 class ScanResolution(ICloneable):
-    """
+    r"""
 
 
     Container for reflectivity resolution data.
@@ -29376,57 +23354,48 @@ class ScanResolution(ICloneable):
 
     """
 
-    __swig_setmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ScanResolution, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ICloneable]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ScanResolution, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainCore.delete_ScanResolution
-    __del__ = lambda self: None
 
+    @staticmethod
     def scanRelativeResolution(*args):
-        """
+        r"""
         scanRelativeResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
         scanRelativeResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution
         """
         return _libBornAgainCore.ScanResolution_scanRelativeResolution(*args)
 
-    scanRelativeResolution = staticmethod(scanRelativeResolution)
-
+    @staticmethod
     def scanAbsoluteResolution(*args):
-        """
+        r"""
         scanAbsoluteResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
         scanAbsoluteResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution
         """
         return _libBornAgainCore.ScanResolution_scanAbsoluteResolution(*args)
 
-    scanAbsoluteResolution = staticmethod(scanAbsoluteResolution)
-ScanResolution_swigregister = _libBornAgainCore.ScanResolution_swigregister
-ScanResolution_swigregister(ScanResolution)
+# Register ScanResolution in _libBornAgainCore:
+_libBornAgainCore.ScanResolution_swigregister(ScanResolution)
 
 def ScanResolution_scanRelativeResolution(*args):
-    """
-    scanRelativeResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
+    r"""
+    ScanResolution_scanRelativeResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
     ScanResolution_scanRelativeResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution
     """
     return _libBornAgainCore.ScanResolution_scanRelativeResolution(*args)
 
 def ScanResolution_scanAbsoluteResolution(*args):
-    """
-    scanAbsoluteResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
+    r"""
+    ScanResolution_scanAbsoluteResolution(RangedDistribution const & distr, double stddev) -> ScanResolution
     ScanResolution_scanAbsoluteResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution
     """
     return _libBornAgainCore.ScanResolution_scanAbsoluteResolution(*args)
 
-class AngularSpecScan(_object):
-    """
+class AngularSpecScan(object):
+    r"""
 
 
     Scan type with inclination angles as coordinate values and a unique wavelength. Features footprint correction.
@@ -29435,45 +23404,33 @@ class AngularSpecScan(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, AngularSpecScan, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, AngularSpecScan, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(AngularSpecScan self, double wl, vdouble1d_t inc_angle) -> AngularSpecScan
         __init__(AngularSpecScan self, double wl, IAxis inc_angle) -> AngularSpecScan
         __init__(AngularSpecScan self, double wl, int nbins, double alpha_i_min, double alpha_i_max) -> AngularSpecScan
-
         AngularSpecScan::AngularSpecScan(double wl, int nbins, double alpha_i_min, double alpha_i_max)
 
         Sets angle-defined specular scan. The first parameter is always a wavelength in nm. Second parameter is either a numpy array of incident angles in radians or an  IAxis object with angle values. Alternatively an axis can be defined in-place, then the second passed parameter is the number of bins, third - minimum on-axis angle value, fourth - maximum on-axis angle value. 
 
         """
-        this = _libBornAgainCore.new_AngularSpecScan(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.AngularSpecScan_swiginit(self, _libBornAgainCore.new_AngularSpecScan(*args))
     __swig_destroy__ = _libBornAgainCore.delete_AngularSpecScan
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(AngularSpecScan self) -> AngularSpecScan
-
         AngularSpecScan * AngularSpecScan::clone() const override
 
         """
         return _libBornAgainCore.AngularSpecScan_clone(self)
 
-
     def setFootprintFactor(self, f_factor):
-        """
+        r"""
         setFootprintFactor(AngularSpecScan self, IFootprintFactor f_factor)
-
         void AngularSpecScan::setFootprintFactor(const IFootprintFactor *f_factor)
 
         Sets footprint correction factor. 
@@ -29481,11 +23438,9 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setFootprintFactor(self, f_factor)
 
-
     def setWavelengthResolution(self, resolution):
-        """
+        r"""
         setWavelengthResolution(AngularSpecScan self, ScanResolution resolution)
-
         void AngularSpecScan::setWavelengthResolution(const ScanResolution &resolution)
 
         Sets wavelength resolution values via  ScanResolution object. 
@@ -29493,12 +23448,10 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setWavelengthResolution(self, resolution)
 
-
     def setRelativeWavelengthResolution(self, *args):
-        """
+        r"""
         setRelativeWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, double rel_dev)
         setRelativeWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)
-
         void AngularSpecScan::setRelativeWavelengthResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)
 
         Sets wavelength resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. 
@@ -29506,12 +23459,10 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setRelativeWavelengthResolution(self, *args)
 
-
     def setAbsoluteWavelengthResolution(self, *args):
-        """
+        r"""
         setAbsoluteWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, double std_dev)
         setAbsoluteWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)
-
         void AngularSpecScan::setAbsoluteWavelengthResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)
 
         Sets wavelength resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. 
@@ -29519,11 +23470,9 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setAbsoluteWavelengthResolution(self, *args)
 
-
     def setAngleResolution(self, resolution):
-        """
+        r"""
         setAngleResolution(AngularSpecScan self, ScanResolution resolution)
-
         void AngularSpecScan::setAngleResolution(const ScanResolution &resolution)
 
         Sets angle resolution values via  ScanResolution object. 
@@ -29531,12 +23480,10 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setAngleResolution(self, resolution)
 
-
     def setRelativeAngularResolution(self, *args):
-        """
+        r"""
         setRelativeAngularResolution(AngularSpecScan self, RangedDistribution const & distr, double rel_dev)
         setRelativeAngularResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)
-
         void AngularSpecScan::setRelativeAngularResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)
 
         Sets angular resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. 
@@ -29544,12 +23491,10 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setRelativeAngularResolution(self, *args)
 
-
     def setAbsoluteAngularResolution(self, *args):
-        """
+        r"""
         setAbsoluteAngularResolution(AngularSpecScan self, RangedDistribution const & distr, double std_dev)
         setAbsoluteAngularResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)
-
         void AngularSpecScan::setAbsoluteAngularResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)
 
         Sets angular resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. 
@@ -29557,11 +23502,11 @@ class AngularSpecScan(_object):
         """
         return _libBornAgainCore.AngularSpecScan_setAbsoluteAngularResolution(self, *args)
 
-AngularSpecScan_swigregister = _libBornAgainCore.AngularSpecScan_swigregister
-AngularSpecScan_swigregister(AngularSpecScan)
+# Register AngularSpecScan in _libBornAgainCore:
+_libBornAgainCore.AngularSpecScan_swigregister(AngularSpecScan)
 
-class QSpecScan(_object):
-    """
+class QSpecScan(object):
+    r"""
 
 
     Scan type with z-components of scattering vector as coordinate values. Wavelength and incident angles are not accessible separately.
@@ -29570,45 +23515,33 @@ class QSpecScan(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, QSpecScan, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, QSpecScan, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
+        r"""
         __init__(QSpecScan self, vdouble1d_t qs_nm) -> QSpecScan
         __init__(QSpecScan self, IAxis qs_nm) -> QSpecScan
         __init__(QSpecScan self, int nbins, double qz_min, double qz_max) -> QSpecScan
-
         QSpecScan::QSpecScan(int nbins, double qz_min, double qz_max)
 
         Sets q-defined specular scan. Accepts either numpy array of q-values sorted in ascending order or an  IAxis object with q-values. Alternatively an axis can be defined in-place, then the first passed parameter is the number of bins, second - minimum on-axis q-value, third - maximum on-axis q_value. 
 
         """
-        this = _libBornAgainCore.new_QSpecScan(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainCore.QSpecScan_swiginit(self, _libBornAgainCore.new_QSpecScan(*args))
     __swig_destroy__ = _libBornAgainCore.delete_QSpecScan
-    __del__ = lambda self: None
 
     def clone(self):
-        """
+        r"""
         clone(QSpecScan self) -> QSpecScan
-
         QSpecScan * QSpecScan::clone() const override
 
         """
         return _libBornAgainCore.QSpecScan_clone(self)
 
-
     def setQResolution(self, resolution):
-        """
+        r"""
         setQResolution(QSpecScan self, ScanResolution resolution)
-
         void QSpecScan::setQResolution(const ScanResolution &resolution)
 
         Sets q resolution values via  ScanResolution object. 
@@ -29616,12 +23549,10 @@ class QSpecScan(_object):
         """
         return _libBornAgainCore.QSpecScan_setQResolution(self, resolution)
 
-
     def setRelativeQResolution(self, *args):
-        """
+        r"""
         setRelativeQResolution(QSpecScan self, RangedDistribution const & distr, double rel_dev)
         setRelativeQResolution(QSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)
-
         void QSpecScan::setRelativeQResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)
 
         Sets qz resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the qz-axis. 
@@ -29629,12 +23560,10 @@ class QSpecScan(_object):
         """
         return _libBornAgainCore.QSpecScan_setRelativeQResolution(self, *args)
 
-
     def setAbsoluteQResolution(self, *args):
-        """
+        r"""
         setAbsoluteQResolution(QSpecScan self, RangedDistribution const & distr, double std_dev)
         setAbsoluteQResolution(QSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)
-
         void QSpecScan::setAbsoluteQResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)
 
         Sets qz resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the qz-axis. 
@@ -29642,8 +23571,8 @@ class QSpecScan(_object):
         """
         return _libBornAgainCore.QSpecScan_setAbsoluteQResolution(self, *args)
 
-QSpecScan_swigregister = _libBornAgainCore.QSpecScan_swigregister
-QSpecScan_swigregister(QSpecScan)
+# Register QSpecScan in _libBornAgainCore:
+_libBornAgainCore.QSpecScan_swigregister(QSpecScan)
 
 
 def ScanRelativeResolution(distribution, rel_dev):
@@ -29742,5 +23671,4 @@ def MaterialProfile(multilayer, n_points=400, z_min=None, z_max=None):
     material_values = MaterialProfile_cpp(multilayer, n_points, z_min, z_max)
     return (z_points, material_values)
 
-# This file is compatible with both classic and new-style classes.
 
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 86da3d2366c17a931b67fe1b58a5ce55c219ae4a..8c3c8fa5445f797e22b0ed65ed559029280c4809 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -165,11 +165,16 @@ template <typename T> T SwigValueInit() {
 #endif
 
 
+#if defined(__GNUC__) && defined(_WIN32) && !defined(SWIG_PYTHON_NO_HYPOT_WORKAROUND)
+/* Workaround for '::hypot' has not been declared', see https://bugs.python.org/issue11566 */
+# include <math.h>
+#endif
+
 #if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
 /* Use debug wrappers with the Python release dll */
 # undef _DEBUG
 # include <Python.h>
-# define _DEBUG
+# define _DEBUG 1
 #else
 # include <Python.h>
 #endif
@@ -219,6 +224,7 @@ template <typename T> T SwigValueInit() {
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
+#define SWIG_POINTER_NO_NULL       0x4
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -804,14 +810,16 @@ SWIGINTERN char*
 SWIG_Python_str_AsChar(PyObject *str)
 {
 #if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
+  char *newstr = 0;
   str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
+  if (str) {
+    char *cstr;
+    Py_ssize_t len;
+    PyBytes_AsStringAndSize(str, &cstr, &len);
+    newstr = (char *) malloc(len+1);
+    memcpy(newstr, cstr, len+1);
+    Py_XDECREF(str);
+  }
   return newstr;
 #else
   return PyString_AsString(str);
@@ -835,144 +843,14 @@ SWIG_Python_str_FromChar(const char *c)
 #endif
 }
 
-/* Add PyOS_snprintf for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-#  define PyOS_snprintf _snprintf
-# else
-#  define PyOS_snprintf snprintf
-# endif
-#endif
-
-/* A crude PyString_FromFormat implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-
-#ifndef SWIG_PYBUFFER_SIZE
-# define SWIG_PYBUFFER_SIZE 1024
-#endif
-
-static PyObject *
-PyString_FromFormat(const char *fmt, ...) {
-  va_list ap;
-  char buf[SWIG_PYBUFFER_SIZE * 2];
-  int res;
-  va_start(ap, fmt);
-  res = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
-}
-#endif
-
 #ifndef PyObject_DEL
 # define PyObject_DEL PyObject_Del
 #endif
 
-/* A crude PyExc_StopIteration exception for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# ifndef PyExc_StopIteration
-#  define PyExc_StopIteration PyExc_RuntimeError
-# endif
-# ifndef PyObject_GenericGetAttr
-#  define PyObject_GenericGetAttr 0
-# endif
-#endif
-
-/* Py_NotImplemented is defined in 2.1 and up. */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef Py_NotImplemented
-#  define Py_NotImplemented PyExc_RuntimeError
-# endif
-#endif
-
-/* A crude PyString_AsStringAndSize implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef PyString_AsStringAndSize
-#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
-# endif
-#endif
-
-/* PySequence_Size for old Pythons */
-#if PY_VERSION_HEX < 0x02000000
-# ifndef PySequence_Size
-#  define PySequence_Size PySequence_Length
-# endif
-#endif
-
-/* PyBool_FromLong for old Pythons */
-#if PY_VERSION_HEX < 0x02030000
-static
-PyObject *PyBool_FromLong(long ok)
-{
-  PyObject *result = ok ? Py_True : Py_False;
-  Py_INCREF(result);
-  return result;
-}
-#endif
-
-/* Py_ssize_t for old Pythons */
-/* This code is as recommended by: */
-/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-# define PY_SSIZE_T_MAX INT_MAX
-# define PY_SSIZE_T_MIN INT_MIN
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intintargfunc ssizessizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-typedef intintobjargproc ssizessizeobjargproc;
-typedef getreadbufferproc readbufferproc;
-typedef getwritebufferproc writebufferproc;
-typedef getsegcountproc segcountproc;
-typedef getcharbufferproc charbufferproc;
-static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
-{
-  long result = 0;
-  PyObject *i = PyNumber_Int(x);
-  if (i) {
-    result = PyInt_AsLong(i);
-    Py_DECREF(i);
-  }
-  return result;
-}
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
-#endif
-
-#if PY_VERSION_HEX < 0x02040000
-#define Py_VISIT(op)				\
-  do { 						\
-    if (op) {					\
-      int vret = visit((op), arg);		\
-      if (vret)					\
-        return vret;				\
-    }						\
-  } while (0)
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef struct {
-  PyTypeObject type;
-  PyNumberMethods as_number;
-  PyMappingMethods as_mapping;
-  PySequenceMethods as_sequence;
-  PyBufferProcs as_buffer;
-  PyObject *name, *slots;
-} PyHeapTypeObject;
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef destructor freefunc;
-#endif
-
-#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
-     (PY_MAJOR_VERSION > 3))
+// SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user
+// interface files check for it.
 # define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-#endif
+# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
 
 #if PY_VERSION_HEX < 0x03020000
 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
@@ -1035,14 +913,17 @@ SWIG_Python_AddErrorMsg(const char* mesg)
   PyObject *value = 0;
   PyObject *traceback = 0;
 
-  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (PyErr_Occurred())
+    PyErr_Fetch(&type, &value, &traceback);
   if (value) {
-    char *tmp;
     PyObject *old_str = PyObject_Str(value);
+    const char *tmp = SWIG_Python_str_AsChar(old_str);
     PyErr_Clear();
     Py_XINCREF(type);
-
-    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    if (tmp)
+      PyErr_Format(type, "%s %s", tmp, mesg);
+    else
+      PyErr_Format(type, "%s", mesg);
     SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
@@ -1051,6 +932,37 @@ SWIG_Python_AddErrorMsg(const char* mesg)
   }
 }
 
+SWIGRUNTIME int
+SWIG_Python_TypeErrorOccurred(PyObject *obj)
+{
+  PyObject *error;
+  if (obj)
+    return 0;
+  error = PyErr_Occurred();
+  return error && PyErr_GivenExceptionMatches(error, PyExc_TypeError);
+}
+
+SWIGRUNTIME void
+SWIG_Python_RaiseOrModifyTypeError(const char *message)
+{
+  if (SWIG_Python_TypeErrorOccurred(NULL)) {
+    /* Use existing TypeError to preserve stacktrace and enhance with given message */
+    PyObject *newvalue;
+    PyObject *type = NULL, *value = NULL, *traceback = NULL;
+    PyErr_Fetch(&type, &value, &traceback);
+#if PY_VERSION_HEX >= 0x03000000
+    newvalue = PyUnicode_FromFormat("%S\nAdditional information:\n%s", value, message);
+#else
+    newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message);
+#endif
+    Py_XDECREF(value);
+    PyErr_Restore(type, newvalue, traceback);
+  } else {
+    /* Raise TypeError using given message */
+    PyErr_SetString(PyExc_TypeError, message);
+  }
+}
+
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -1058,9 +970,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 #endif
 #if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
 #  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
-#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
-#      define SWIG_PYTHON_USE_GIL
-#    endif
+#    define SWIG_PYTHON_USE_GIL
 #  endif
 #  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
 #    ifndef SWIG_PYTHON_INITIALIZE_THREADS
@@ -1137,30 +1047,13 @@ extern "C" {
 /* Constant information structure */
 typedef struct swig_const_info {
   int type;
-  char *name;
+  const char *name;
   long lvalue;
   double dvalue;
   void   *pvalue;
   swig_type_info **ptype;
 } swig_const_info;
 
-
-/* -----------------------------------------------------------------------------
- * Wrapper of PyInstanceMethod_New() used in Python 3
- * It is exported to the generated module, used for -fastproxy
- * ----------------------------------------------------------------------------- */
-#if PY_VERSION_HEX >= 0x03000000
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
-{
-  return PyInstanceMethod_New(func);
-}
-#else
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
-{
-  return NULL;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif
@@ -1175,6 +1068,14 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
  *
  * ----------------------------------------------------------------------------- */
 
+#if PY_VERSION_HEX < 0x02070000 /* 2.7.0 */
+# error "This version of SWIG only supports Python >= 2.7"
+#endif
+
+#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03020000
+# error "This version of SWIG only supports Python 3 >= 3.2"
+#endif
+
 /* Common SWIG API */
 
 /* for raw pointers */
@@ -1258,11 +1159,7 @@ SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);
   if (public_interface)
     SwigPyBuiltin_AddPublicSymbol(public_interface, name);
@@ -1272,11 +1169,7 @@ SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *nam
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);                            
 }
 
@@ -1286,7 +1179,6 @@ SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {
 
 SWIGINTERN PyObject*
 SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
-#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
   if (!result) {
     result = obj;
   } else if (result == Py_None) {
@@ -1302,29 +1194,6 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
     Py_DECREF(obj);
   }
   return result;
-#else
-  PyObject*   o2;
-  PyObject*   o3;
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyTuple_Check(result)) {
-      o2 = result;
-      result = PyTuple_New(1);
-      PyTuple_SET_ITEM(result, 0, o2);
-    }
-    o3 = PyTuple_New(1);
-    PyTuple_SET_ITEM(o3, 0, obj);
-    o2 = result;
-    result = PySequence_Concat(o2, o3);
-    Py_DECREF(o2);
-    Py_DECREF(o3);
-  }
-  return result;
-#endif
 }
 
 /* Unpack the argument tuple */
@@ -1376,11 +1245,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 }
 
 /* A functor is a function object with one single object argument */
-#if PY_VERSION_HEX >= 0x02020000
 #define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
-#else
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
-#endif
 
 /*
   Helper for static pointer initialization for both C and C++ code, for example
@@ -1409,35 +1274,6 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 extern "C" {
 #endif
 
-/*  How to access Py_None */
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  ifndef SWIG_PYTHON_NO_BUILD_NONE
-#    ifndef SWIG_PYTHON_BUILD_NONE
-#      define SWIG_PYTHON_BUILD_NONE
-#    endif
-#  endif
-#endif
-
-#ifdef SWIG_PYTHON_BUILD_NONE
-#  ifdef Py_None
-#   undef Py_None
-#   define Py_None SWIG_Py_None()
-#  endif
-SWIGRUNTIMEINLINE PyObject * 
-_SWIG_Py_None(void)
-{
-  PyObject *none = Py_BuildValue((char*)"");
-  Py_DECREF(none);
-  return none;
-}
-SWIGRUNTIME PyObject * 
-SWIG_Py_None(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
-  return none;
-}
-#endif
-
 /* The python void return value */
 
 SWIGRUNTIMEINLINE PyObject * 
@@ -1464,7 +1300,10 @@ SWIGRUNTIMEINLINE int
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
   SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
-  return data ? data->implicitconv : 0;
+  int fail = data ? data->implicitconv : 0;
+  if (fail)
+    PyErr_SetString(PyExc_TypeError, "Implicit conversion is prohibited for explicit constructors.");
+  return fail;
 }
 
 SWIGRUNTIMEINLINE PyObject *
@@ -1491,11 +1330,7 @@ SwigPyClientData_New(PyObject* obj)
       data->newargs = obj;
       Py_INCREF(obj);
     } else {
-#if (PY_VERSION_HEX < 0x02020000)
-      data->newraw = 0;
-#else
-      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
-#endif
+      data->newraw = PyObject_GetAttrString(data->klass, "__new__");
       if (data->newraw) {
 	Py_INCREF(data->newraw);
 	data->newargs = PyTuple_New(1);
@@ -1506,7 +1341,7 @@ SwigPyClientData_New(PyObject* obj)
       Py_INCREF(data->newargs);
     }
     /* the destroy method, aka as the C++ delete method */
-    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    data->destroy = PyObject_GetAttrString(data->klass, "__swig_destroy__");
     if (PyErr_Occurred()) {
       PyErr_Clear();
       data->destroy = 0;
@@ -1515,11 +1350,7 @@ SwigPyClientData_New(PyObject* obj)
       int flags;
       Py_INCREF(data->destroy);
       flags = PyCFunction_GET_FLAGS(data->destroy);
-#ifdef METH_O
       data->delargs = !(flags & (METH_O));
-#else
-      data->delargs = 0;
-#endif
     } else {
       data->delargs = 0;
     }
@@ -1607,20 +1438,12 @@ SwigPyObject_hex(SwigPyObject *v)
 }
 
 SWIGRUNTIME PyObject *
-#ifdef METH_NOARGS
 SwigPyObject_repr(SwigPyObject *v)
-#else
-SwigPyObject_repr(SwigPyObject *v, PyObject *args)
-#endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
   PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
   if (v->next) {
-# ifdef METH_NOARGS
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-# else
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-# endif
 # if PY_VERSION_HEX >= 0x03000000
     PyObject *joined = PyUnicode_Concat(repr, nrep);
     Py_DecRef(repr);
@@ -1633,6 +1456,14 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
   return repr;  
 }
 
+/* We need a version taking two PyObject* parameters so it's a valid
+ * PyCFunction to use in swigobject_methods[]. */
+SWIGRUNTIME PyObject *
+SwigPyObject_repr2(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
+{
+  return SwigPyObject_repr((SwigPyObject*)v);
+}
+
 SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
@@ -1706,14 +1537,14 @@ SwigPyObject_dealloc(PyObject *v)
       PyObject *res;
 
       /* PyObject_CallFunction() has the potential to silently drop
-         the active active exception.  In cases of unnamed temporary
+         the active exception.  In cases of unnamed temporary
          variable or where we just finished iterating over a generator
          StopIteration will be active right now, and this needs to
          remain true upon return from SwigPyObject_dealloc.  So save
          and restore. */
       
-      PyObject *val = NULL, *type = NULL, *tb = NULL;
-      PyErr_Fetch(&val, &type, &tb);
+      PyObject *type = NULL, *value = NULL, *traceback = NULL;
+      PyErr_Fetch(&type, &value, &traceback);
 
       if (data->delargs) {
         /* we need to create a temporary object to carry the destroy operation */
@@ -1728,7 +1559,7 @@ SwigPyObject_dealloc(PyObject *v)
       if (!res)
         PyErr_WriteUnraisable(destroy);
 
-      PyErr_Restore(val, type, tb);
+      PyErr_Restore(type, value, traceback);
 
       Py_XDECREF(res);
     } 
@@ -1747,11 +1578,6 @@ SWIGRUNTIME PyObject*
 SwigPyObject_append(PyObject* v, PyObject* next)
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
-#ifndef METH_O
-  PyObject *tmp = 0;
-  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
-  next = tmp;
-#endif
   if (!SwigPyObject_Check(next)) {
     PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
     return NULL;
@@ -1762,11 +1588,7 @@ SwigPyObject_append(PyObject* v, PyObject* next)
 }
 
 SWIGRUNTIME PyObject* 
-#ifdef METH_NOARGS
-SwigPyObject_next(PyObject* v)
-#else
 SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
@@ -1778,11 +1600,7 @@ SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_disown(PyObject *v)
-#else
 SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
@@ -1790,11 +1608,7 @@ SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_acquire(PyObject *v)
-#else
 SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
@@ -1805,70 +1619,32 @@ SWIGINTERN PyObject*
 SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
-#if (PY_VERSION_HEX < 0x02020000)
-  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#elif (PY_VERSION_HEX < 0x02050000)
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
-#else
-  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
-#endif
-    {
-      return NULL;
+  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) {
+    return NULL;
+  } else {
+    SwigPyObject *sobj = (SwigPyObject *)v;
+    PyObject *obj = PyBool_FromLong(sobj->own);
+    if (val) {
+      if (PyObject_IsTrue(val)) {
+        SwigPyObject_acquire(v,args);
+      } else {
+        SwigPyObject_disown(v,args);
+      }
     } 
-  else
-    {
-      SwigPyObject *sobj = (SwigPyObject *)v;
-      PyObject *obj = PyBool_FromLong(sobj->own);
-      if (val) {
-#ifdef METH_NOARGS
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v);
-	} else {
-	  SwigPyObject_disown(v);
-	}
-#else
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v,args);
-	} else {
-	  SwigPyObject_disown(v,args);
-	}
-#endif
-      } 
-      return obj;
-    }
+    return obj;
+  }
 }
 
-#ifdef METH_O
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#else
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {"disown",  SwigPyObject_disown,  METH_NOARGS,  "releases ownership of the pointer"},
+  {"acquire", SwigPyObject_acquire, METH_NOARGS,  "acquires ownership of the pointer"},
+  {"own",     SwigPyObject_own,     METH_VARARGS, "returns/sets ownership of the pointer"},
+  {"append",  SwigPyObject_append,  METH_O,       "appends another 'this' object"},
+  {"next",    SwigPyObject_next,    METH_NOARGS,  "returns the next 'this' object"},
+  {"__repr__",SwigPyObject_repr2,   METH_NOARGS,  "returns object representation"},
   {0, 0, 0, 0}  
 };
-#endif
-
-#if PY_VERSION_HEX < 0x02020000
-SWIGINTERN PyObject *
-SwigPyObject_getattr(SwigPyObject *sobj,char *name)
-{
-  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
-}
-#endif
 
 SWIGRUNTIME PyTypeObject*
 SwigPyObject_TypeOnce(void) {
@@ -1913,12 +1689,8 @@ SwigPyObject_TypeOnce(void) {
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */
 #elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
-#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+#else
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
-    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
@@ -1932,16 +1704,12 @@ SwigPyObject_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyObject",               /* tp_name */
+      "SwigPyObject",                       /* tp_name */
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
       0,                                    /* tp_print */
-#if PY_VERSION_HEX < 0x02020000
-      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
-#else
       (getattrfunc)0,                       /* tp_getattr */
-#endif
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX >= 0x03000000
       0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
@@ -1964,7 +1732,6 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_clear */
       (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       swigobject_methods,                   /* tp_methods */
@@ -1985,13 +1752,8 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -1999,20 +1761,14 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpyobject_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpyobject_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpyobject_type) < 0)
       return NULL;
-#endif
   }
   return &swigpyobject_type;
 }
@@ -2041,20 +1797,6 @@ typedef struct {
   size_t size;
 } SwigPyPacked;
 
-SWIGRUNTIME int
-SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char result[SWIG_BUFFER_SIZE];
-  fputs("<Swig Packed ", fp); 
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    fputs("at ", fp); 
-    fputs(result, fp); 
-  }
-  fputs(v->ty->name,fp); 
-  fputs(">", fp);
-  return 0; 
-}
-  
 SWIGRUNTIME PyObject *
 SwigPyPacked_repr(SwigPyPacked *v)
 {
@@ -2083,7 +1825,7 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
   size_t i = v->size;
   size_t j = w->size;
   int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
-  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+  return s ? s : strncmp((const char *)v->pack, (const char *)w->pack, 2*v->size);
 }
 
 SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
@@ -2123,11 +1865,11 @@ SwigPyPacked_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyPacked",               /* tp_name */
+      "SwigPyPacked",                       /* tp_name */
       sizeof(SwigPyPacked),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
+      0,                                    /* tp_print */
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000
@@ -2151,7 +1893,6 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_clear */
       0,                                    /* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       0,                                    /* tp_methods */
@@ -2172,13 +1913,8 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -2186,20 +1922,14 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpypacked_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpypacked_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpypacked_type) < 0)
       return NULL;
-#endif
   }
   return &swigpypacked_type;
 }
@@ -2240,20 +1970,14 @@ SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
  * pointers/data manipulation
  * ----------------------------------------------------------------------------- */
 
-SWIGRUNTIMEINLINE PyObject *
-_SWIG_This(void)
-{
-    return SWIG_Python_str_FromChar("this");
-}
-
-static PyObject *swig_this = NULL;
+static PyObject *Swig_This_global = NULL;
 
 SWIGRUNTIME PyObject *
 SWIG_This(void)
 {
-  if (swig_this == NULL)
-    swig_this = _SWIG_This();
-  return swig_this;
+  if (Swig_This_global == NULL)
+    Swig_This_global = SWIG_Python_str_FromChar("this");
+  return Swig_This_global;
 }
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
@@ -2285,7 +2009,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
   obj = 0;
 
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
   if (PyInstance_Check(pyobj)) {
     obj = _PyInstance_Lookup(pyobj, SWIG_This());      
   } else {
@@ -2355,7 +2079,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
   if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
-    return SWIG_OK;
+    return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
   }
 
   res = SWIG_ERROR;
@@ -2435,13 +2159,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
           }
         }
       }
-    }
-    if (!SWIG_IsOK(res) && obj == Py_None) {
-      if (ptr)
-        *ptr = 0;
-      if (PyErr_Occurred())
-        PyErr_Clear();
-      res = SWIG_OK;
+      if (!SWIG_IsOK(res) && obj == Py_None) {
+        if (ptr)
+          *ptr = 0;
+        if (PyErr_Occurred())
+          PyErr_Clear();
+        res = SWIG_OK;
+      }
     }
   }
   return res;
@@ -2455,31 +2179,28 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     return SWIG_ConvertPtr(obj, ptr, ty, 0);
   } else {
     void *vptr = 0;
-    
+    swig_cast_info *tc;
+
     /* here we get the method pointer for callbacks */
     const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
     if (desc)
       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
+    if (!desc)
       return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
+    tc = SWIG_TypeCheck(desc,ty);
+    if (tc) {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     } else {
-      *ptr = vptr;
+      return SWIG_ERROR;
     }
     return SWIG_OK;
   }
 }
 
-/* Convert a packed value value */
+/* Convert a packed pointer value */
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
@@ -2507,7 +2228,6 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 SWIGRUNTIME PyObject* 
 SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
-#if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
   PyObject *newraw = data->newraw;
   if (newraw) {
@@ -2530,10 +2250,18 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
     }
   } else {
 #if PY_VERSION_HEX >= 0x03000000
-    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    if (inst) {
-      PyObject_SetAttr(inst, SWIG_This(), swig_this);
-      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    PyObject *empty_args = PyTuple_New(0);
+    if (empty_args) {
+      PyObject *empty_kwargs = PyDict_New();
+      if (empty_kwargs) {
+        inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, empty_kwargs);
+        Py_DECREF(empty_kwargs);
+        if (inst) {
+          PyObject_SetAttr(inst, SWIG_This(), swig_this);
+          Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+        }
+      }
+      Py_DECREF(empty_args);
     }
 #else
     PyObject *dict = PyDict_New();
@@ -2545,45 +2273,13 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 #endif
   }
   return inst;
-#else
-#if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst = 0;
-  PyObject *dict = PyDict_New();
-  if (dict) {
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-  }
-  return (PyObject *) inst;
-#else
-  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
-  if (inst == NULL) {
-    return NULL;
-  }
-  inst->in_class = (PyClassObject *)data->newargs;
-  Py_INCREF(inst->in_class);
-  inst->in_dict = PyDict_New();
-  if (inst->in_dict == NULL) {
-    Py_DECREF(inst);
-    return NULL;
-  }
-#ifdef Py_TPFLAGS_HAVE_WEAKREFS
-  inst->in_weakreflist = NULL;
-#endif
-#ifdef Py_TPFLAGS_GC
-  PyObject_GC_Init(inst);
-#endif
-  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
-  return (PyObject *) inst;
-#endif
-#endif
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
 {
  PyObject *dict;
-#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
  PyObject **dictptr = _PyObject_GetDictPtr(inst);
  if (dictptr != NULL) {
    dict = *dictptr;
@@ -2595,7 +2291,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
    return;
  }
 #endif
- dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ dict = PyObject_GetAttrString(inst, "__dict__");
  PyDict_SetItem(dict, SWIG_This(), swig_this);
  Py_DECREF(dict);
 } 
@@ -2694,12 +2390,7 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
 #ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
 #else
-# ifdef SWIGPY_USE_CAPSULE
     type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-# else
-    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-# endif
     if (PyErr_Occurred()) {
       PyErr_Clear();
       type_pointer = (void *)0;
@@ -2709,48 +2400,10 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return (swig_module_info *) type_pointer;
 }
 
-#if PY_MAJOR_VERSION < 2
-/* PyModule_AddObject function was introduced in Python 2.0.  The following function
-   is copied out of Python/modsupport.c in python version 2.3.4 */
-SWIGINTERN int
-PyModule_AddObject(PyObject *m, char *name, PyObject *o)
-{
-  PyObject *dict;
-  if (!PyModule_Check(m)) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg");
-    return SWIG_ERROR;
-  }
-  if (!o) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value");
-    return SWIG_ERROR;
-  }
-  
-  dict = PyModule_GetDict(m);
-  if (dict == NULL) {
-    /* Internal error -- modules must have a dict! */
-    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
-		 PyModule_GetName(m));
-    return SWIG_ERROR;
-  }
-  if (PyDict_SetItemString(dict, name, o))
-    return SWIG_ERROR;
-  Py_DECREF(o);
-  return SWIG_OK;
-}
-#endif
-
 SWIGRUNTIME void
-#ifdef SWIGPY_USE_CAPSULE
 SWIG_Python_DestroyModule(PyObject *obj)
-#else
-SWIG_Python_DestroyModule(void *vptr)
-#endif
 {
-#ifdef SWIGPY_USE_CAPSULE
   swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
-#else
-  swig_module_info *swig_module = (swig_module_info *) vptr;
-#endif
   swig_type_info **types = swig_module->types;
   size_t i;
   for (i =0; i < swig_module->size; ++i) {
@@ -2761,33 +2414,24 @@ SWIG_Python_DestroyModule(void *vptr)
     }
   }
   Py_DECREF(SWIG_This());
-  swig_this = NULL;
+  Swig_This_global = NULL;
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
 #if PY_VERSION_HEX >= 0x03000000
  /* Add a dummy module object into sys.modules */
-  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+  PyObject *module = PyImport_AddModule("swig_runtime_data" SWIG_RUNTIME_VERSION);
 #else
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
+  PyObject *module = Py_InitModule("swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
 #endif
-#ifdef SWIGPY_USE_CAPSULE
   PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
   if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#else
-  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+    PyModule_AddObject(module, "type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
   } else {
     Py_XDECREF(pointer);
   }
-#endif
 }
 
 /* The python cached type query */
@@ -2805,20 +2449,12 @@ SWIG_Python_TypeQuery(const char *type)
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
-#ifdef SWIGPY_USE_CAPSULE
     descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
-#else
-    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-#endif
   } else {
     swig_module_info *swig_module = SWIG_GetModule(0);
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
-#ifdef SWIGPY_USE_CAPSULE
       obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-#else
-      obj = PyCObject_FromVoidPtr(descriptor, NULL);
-#endif
       PyDict_SetItem(cache, key, obj);
       Py_DECREF(obj);
     }
@@ -2843,14 +2479,15 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront)
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
-      char *tmp;
       PyObject *old_str = PyObject_Str(value);
+      const char *tmp = SWIG_Python_str_AsChar(old_str);
+      const char *errmesg = tmp ? tmp : "Invalid error message";
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
+	PyErr_Format(type, "%s %s", mesg, errmesg);
       } else {
-	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+	PyErr_Format(type, "%s %s", errmesg, mesg);
       }
       SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
@@ -2976,6 +2613,8 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       Py_INCREF(name);
     } else {
       encoded_name = PyUnicode_AsUTF8String(name);
+      if (!encoded_name)
+        return -1;
     }
     PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
     Py_DECREF(encoded_name);
@@ -3002,6 +2641,21 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Method creation and docstring support functions */
+
+SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name);
+SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
+SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
+
+#ifdef __cplusplus
+}
+#endif
+
+
   #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) 
 
 /* -----------------------------------------------------------------------------
@@ -3220,46 +2874,6 @@ namespace Swig {
     }
   };
 
-  /* unknown exception handler  */
-  class UnknownExceptionHandler {
-#ifdef SWIG_DIRECTOR_UEH
-    static void handler() {
-      try {
-        throw;
-      } catch (DirectorException& e) {
-        std::cerr << "SWIG Director exception caught:" << std::endl
-                  << e.what() << std::endl;
-      } catch (std::exception& e) {
-        std::cerr << "std::exception caught: "<< e.what() << std::endl;
-      } catch (...) {
-        std::cerr << "Unknown exception caught." << std::endl;
-      }
-
-      std::cerr << std::endl
-                << "Python interpreter traceback:" << std::endl;
-      PyErr_Print();
-      std::cerr << std::endl;
-
-      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
-                << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
-                << std::endl
-                << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
-      throw;
-    }
-
-  public:
-
-    std::unexpected_handler old;
-    UnknownExceptionHandler(std::unexpected_handler nh = handler) {
-      old = std::set_unexpected(nh);
-    }
-
-    ~UnknownExceptionHandler() {
-      std::set_unexpected(old);
-    }
-#endif
-  };
-
   /* type mismatch in the return value from a python method call */
   class DirectorTypeMismatchException : public DirectorException {
   public:
@@ -3718,94 +3332,91 @@ namespace Swig {
 #define SWIGTYPE_p_bool swig_types[264]
 #define SWIGTYPE_p_char swig_types[265]
 #define SWIGTYPE_p_const_iterator swig_types[266]
-#define SWIGTYPE_p_const_reference swig_types[267]
-#define SWIGTYPE_p_corr_matrix_t swig_types[268]
-#define SWIGTYPE_p_difference_type swig_types[269]
-#define SWIGTYPE_p_double swig_types[270]
-#define SWIGTYPE_p_first_type swig_types[271]
-#define SWIGTYPE_p_int swig_types[272]
-#define SWIGTYPE_p_iterator swig_types[273]
-#define SWIGTYPE_p_key_type swig_types[274]
-#define SWIGTYPE_p_long_long swig_types[275]
-#define SWIGTYPE_p_mapped_type swig_types[276]
-#define SWIGTYPE_p_observer_t swig_types[277]
-#define SWIGTYPE_p_p_PyObject swig_types[278]
-#define SWIGTYPE_p_parameters_t swig_types[279]
-#define SWIGTYPE_p_reference swig_types[280]
-#define SWIGTYPE_p_second_type swig_types[281]
-#define SWIGTYPE_p_short swig_types[282]
-#define SWIGTYPE_p_signed_char swig_types[283]
-#define SWIGTYPE_p_size_type swig_types[284]
-#define SWIGTYPE_p_std__allocatorT_AxisInfo_t swig_types[285]
-#define SWIGTYPE_p_std__allocatorT_BasicVector3DT_double_t_t swig_types[286]
-#define SWIGTYPE_p_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t swig_types[287]
-#define SWIGTYPE_p_std__allocatorT_IFormFactor_p_t swig_types[288]
-#define SWIGTYPE_p_std__allocatorT_INode_const_p_t swig_types[289]
-#define SWIGTYPE_p_std__allocatorT_INode_p_t swig_types[290]
-#define SWIGTYPE_p_std__allocatorT_ParameterSample_t swig_types[291]
-#define SWIGTYPE_p_std__allocatorT_double_t swig_types[292]
-#define SWIGTYPE_p_std__allocatorT_int_t swig_types[293]
-#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[294]
-#define SWIGTYPE_p_std__allocatorT_std__pairT_double_double_t_t swig_types[295]
-#define SWIGTYPE_p_std__allocatorT_std__pairT_std__string_const_double_t_t swig_types[296]
-#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[297]
-#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[298]
-#define SWIGTYPE_p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t swig_types[299]
-#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[300]
-#define SWIGTYPE_p_std__complexT_double_t swig_types[301]
-#define SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t swig_types[302]
-#define SWIGTYPE_p_std__functionT_Simulation_pfF_t swig_types[303]
-#define SWIGTYPE_p_std__functionT_void_fF_t swig_types[304]
-#define SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t swig_types[305]
-#define SWIGTYPE_p_std__invalid_argument swig_types[306]
-#define SWIGTYPE_p_std__lessT_std__string_t swig_types[307]
-#define SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t swig_types[308]
-#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[309]
-#define SWIGTYPE_p_std__pairT_double_double_t swig_types[310]
-#define SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t swig_types[311]
-#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[312]
-#define SWIGTYPE_p_std__vectorT_AxesUnitsWrap__AxesUnits_std__allocatorT_AxesUnitsWrap__AxesUnits_t_t swig_types[313]
-#define SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t swig_types[314]
-#define SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t swig_types[315]
-#define SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t swig_types[316]
-#define SWIGTYPE_p_std__vectorT_HomogeneousRegion_std__allocatorT_HomogeneousRegion_t_t swig_types[317]
-#define SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t swig_types[318]
-#define SWIGTYPE_p_std__vectorT_ILayout_const_p_std__allocatorT_ILayout_const_p_t_t swig_types[319]
-#define SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t swig_types[320]
-#define SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t swig_types[321]
-#define SWIGTYPE_p_std__vectorT_Material_const_p_std__allocatorT_Material_const_p_t_t swig_types[322]
-#define SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t swig_types[323]
-#define SWIGTYPE_p_std__vectorT_PolygonalTopology_std__allocatorT_PolygonalTopology_t_t swig_types[324]
-#define SWIGTYPE_p_std__vectorT_RealParameter_p_std__allocatorT_RealParameter_p_t_t swig_types[325]
-#define SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t swig_types[326]
-#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[327]
-#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[328]
-#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[329]
-#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[330]
-#define SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t swig_types[331]
-#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[332]
-#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[333]
-#define SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t swig_types[334]
-#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[335]
-#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[336]
-#define SWIGTYPE_p_swig__SwigPyIterator swig_types[337]
-#define SWIGTYPE_p_unsigned_char swig_types[338]
-#define SWIGTYPE_p_unsigned_int swig_types[339]
-#define SWIGTYPE_p_unsigned_long_long swig_types[340]
-#define SWIGTYPE_p_unsigned_short swig_types[341]
-#define SWIGTYPE_p_value_type swig_types[342]
-static swig_type_info *swig_types[344];
-static swig_module_info swig_module = {swig_types, 343, 0, 0, 0, 0};
+#define SWIGTYPE_p_corr_matrix_t swig_types[267]
+#define SWIGTYPE_p_difference_type swig_types[268]
+#define SWIGTYPE_p_double swig_types[269]
+#define SWIGTYPE_p_first_type swig_types[270]
+#define SWIGTYPE_p_int swig_types[271]
+#define SWIGTYPE_p_iterator swig_types[272]
+#define SWIGTYPE_p_key_type swig_types[273]
+#define SWIGTYPE_p_long_long swig_types[274]
+#define SWIGTYPE_p_mapped_type swig_types[275]
+#define SWIGTYPE_p_observer_t swig_types[276]
+#define SWIGTYPE_p_p_PyObject swig_types[277]
+#define SWIGTYPE_p_parameters_t swig_types[278]
+#define SWIGTYPE_p_second_type swig_types[279]
+#define SWIGTYPE_p_short swig_types[280]
+#define SWIGTYPE_p_signed_char swig_types[281]
+#define SWIGTYPE_p_size_type swig_types[282]
+#define SWIGTYPE_p_std__allocatorT_AxisInfo_t swig_types[283]
+#define SWIGTYPE_p_std__allocatorT_BasicVector3DT_double_t_t swig_types[284]
+#define SWIGTYPE_p_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t swig_types[285]
+#define SWIGTYPE_p_std__allocatorT_IFormFactor_p_t swig_types[286]
+#define SWIGTYPE_p_std__allocatorT_INode_const_p_t swig_types[287]
+#define SWIGTYPE_p_std__allocatorT_INode_p_t swig_types[288]
+#define SWIGTYPE_p_std__allocatorT_ParameterSample_t swig_types[289]
+#define SWIGTYPE_p_std__allocatorT_double_t swig_types[290]
+#define SWIGTYPE_p_std__allocatorT_int_t swig_types[291]
+#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[292]
+#define SWIGTYPE_p_std__allocatorT_std__pairT_double_double_t_t swig_types[293]
+#define SWIGTYPE_p_std__allocatorT_std__pairT_std__string_const_double_t_t swig_types[294]
+#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[295]
+#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[296]
+#define SWIGTYPE_p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t swig_types[297]
+#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[298]
+#define SWIGTYPE_p_std__complexT_double_t swig_types[299]
+#define SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t swig_types[300]
+#define SWIGTYPE_p_std__functionT_Simulation_pfF_t swig_types[301]
+#define SWIGTYPE_p_std__functionT_void_fF_t swig_types[302]
+#define SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t swig_types[303]
+#define SWIGTYPE_p_std__invalid_argument swig_types[304]
+#define SWIGTYPE_p_std__lessT_std__string_t swig_types[305]
+#define SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t swig_types[306]
+#define SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_std__string_t_t_t__const_iterator swig_types[307]
+#define SWIGTYPE_p_std__pairT_double_double_t swig_types[308]
+#define SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t swig_types[309]
+#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[310]
+#define SWIGTYPE_p_std__vectorT_AxesUnitsWrap__AxesUnits_std__allocatorT_AxesUnitsWrap__AxesUnits_t_t swig_types[311]
+#define SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t swig_types[312]
+#define SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t swig_types[313]
+#define SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t swig_types[314]
+#define SWIGTYPE_p_std__vectorT_HomogeneousRegion_std__allocatorT_HomogeneousRegion_t_t swig_types[315]
+#define SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t swig_types[316]
+#define SWIGTYPE_p_std__vectorT_ILayout_const_p_std__allocatorT_ILayout_const_p_t_t swig_types[317]
+#define SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t swig_types[318]
+#define SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t swig_types[319]
+#define SWIGTYPE_p_std__vectorT_Material_const_p_std__allocatorT_Material_const_p_t_t swig_types[320]
+#define SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t swig_types[321]
+#define SWIGTYPE_p_std__vectorT_PolygonalTopology_std__allocatorT_PolygonalTopology_t_t swig_types[322]
+#define SWIGTYPE_p_std__vectorT_RealParameter_p_std__allocatorT_RealParameter_p_t_t swig_types[323]
+#define SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t swig_types[324]
+#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[325]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[326]
+#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[327]
+#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[328]
+#define SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t swig_types[329]
+#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[330]
+#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[331]
+#define SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t swig_types[332]
+#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[333]
+#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[334]
+#define SWIGTYPE_p_swig__SwigPyIterator swig_types[335]
+#define SWIGTYPE_p_unsigned_char swig_types[336]
+#define SWIGTYPE_p_unsigned_int swig_types[337]
+#define SWIGTYPE_p_unsigned_long_long swig_types[338]
+#define SWIGTYPE_p_unsigned_short swig_types[339]
+#define SWIGTYPE_p_value_type swig_types[340]
+static swig_type_info *swig_types[342];
+static swig_module_info swig_module = {swig_types, 341, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 /* -------- TYPES TABLE (END) -------- */
 
-#if (PY_VERSION_HEX <= 0x02000000)
-# if !defined(SWIG_PYTHON_CLASSIC)
-#  error "This python version requires swig to be run with the '-classic' option"
-# endif
+#ifdef SWIG_TypeQuery
+# undef SWIG_TypeQuery
 #endif
+#define SWIG_TypeQuery SWIG_Python_TypeQuery
 
 /*-----------------------------------------------
               @(target):= _libBornAgainCore.so
@@ -3819,7 +3430,7 @@ static swig_module_info swig_module = {swig_types, 343, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_libBornAgainCore"
 
-#define SWIGVERSION 0x030012 
+#define SWIGVERSION 0x040001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -4557,7 +4168,7 @@ namespace swig {
   template <class Type>
   struct traits_asptr {   
     static int asptr(PyObject *obj, Type **val) {
-      Type *p;
+      Type *p = 0;
       swig_type_info *descriptor = type_info<Type>();
       int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
       if (SWIG_IsOK(res)) {
@@ -4619,14 +4230,14 @@ namespace swig {
 
   template <class Type> 
   struct traits_as<Type, value_category> {
-    static Type as(PyObject *obj, bool throw_error) {
+    static Type as(PyObject *obj) {
       Type v;
       int res = asval(obj, &v);
       if (!obj || !SWIG_IsOK(res)) {
 	if (!PyErr_Occurred()) {
 	  ::SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
+	throw std::invalid_argument("bad type");
       }
       return v;
     }
@@ -4634,7 +4245,7 @@ namespace swig {
 
   template <class Type> 
   struct traits_as<Type, pointer_category> {
-    static Type as(PyObject *obj, bool throw_error) {
+    static Type as(PyObject *obj) {
       Type *v = 0;      
       int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
       if (SWIG_IsOK(res) && v) {
@@ -4646,21 +4257,17 @@ namespace swig {
 	  return *v;
 	}
       } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
 	if (!PyErr_Occurred()) {
 	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
+	throw std::invalid_argument("bad type");
       }
     }
   };
 
   template <class Type> 
   struct traits_as<Type*, pointer_category> {
-    static Type* as(PyObject *obj, bool throw_error) {
+    static Type* as(PyObject *obj) {
       Type *v = 0;      
       int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
       if (SWIG_IsOK(res)) {
@@ -4669,15 +4276,14 @@ namespace swig {
 	if (!PyErr_Occurred()) {
 	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	return 0;
+	throw std::invalid_argument("bad type");
       }
     }
   };
     
   template <class Type>
-  inline Type as(PyObject *obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
+  inline Type as(PyObject *obj) {
+    return traits_as<Type, typename traits<Type>::category>::as(obj);
   }
 
   template <class Type> 
@@ -4950,7 +4556,7 @@ namespace swig {
         typename Sequence::const_iterator isit = is.begin();
         typename Sequence::iterator it = self->begin();
         std::advance(it,ii);
-        for (size_t rc=0; rc<replacecount; ++rc) {
+        for (size_t rc=0; rc<replacecount && it != self->end(); ++rc) {
           *it++ = *isit++;
           for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
             it++;
@@ -4966,7 +4572,7 @@ namespace swig {
       typename Sequence::const_iterator isit = is.begin();
       typename Sequence::reverse_iterator it = self->rbegin();
       std::advance(it,size-ii-1);
-      for (size_t rc=0; rc<replacecount; ++rc) {
+      for (size_t rc=0; rc<replacecount && it != self->rend(); ++rc) {
         *it++ = *isit++;
         for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
           it++;
@@ -5114,16 +4720,16 @@ namespace swig {
   template<typename OutIterator, 
 	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
 	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
+  class SwigPyForwardIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
     typedef SwigPyIterator_T<out_iterator>  base;
-    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyForwardIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
     
-    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+    SwigPyForwardIteratorOpen_T(out_iterator curr, PyObject *seq)
       : SwigPyIterator_T<OutIterator>(curr, seq)
     {
     }
@@ -5145,6 +4751,25 @@ namespace swig {
       return this;
     }
 
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class SwigPyIteratorOpen_T :  public SwigPyForwardIteratorOpen_T<OutIterator, ValueType, FromOper>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    
+    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+      : SwigPyForwardIteratorOpen_T<OutIterator>(curr, seq)
+    {
+    }
+
     SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
@@ -5157,16 +4782,16 @@ namespace swig {
   template<typename OutIterator, 
 	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
 	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
+  class SwigPyForwardIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
     typedef SwigPyIterator_T<out_iterator>  base;    
-    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyForwardIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
     
-    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+    SwigPyForwardIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
       : SwigPyIterator_T<OutIterator>(curr, seq), begin(first), end(last)
     {
     }
@@ -5196,10 +4821,33 @@ namespace swig {
       return this;
     }
 
+  protected:
+    out_iterator begin;
+    out_iterator end;
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class SwigPyIteratorClosed_T :  public SwigPyForwardIteratorClosed_T<OutIterator,ValueType,FromOper>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyForwardIteratorClosed_T<OutIterator, ValueType, FromOper> base0;
+    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    
+    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+      : SwigPyForwardIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
+    {
+    }
+
     SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
-	if (base::current == begin) {
+	if (base::current == base0::begin) {
 	  throw stop_iteration();
 	} else {
 	  --base::current;
@@ -5207,12 +4855,16 @@ namespace swig {
       }
       return this;
     }
-
-  private:
-    out_iterator begin;
-    out_iterator end;
   };
 
+
+  template<typename OutIter>
+  inline SwigPyIterator*
+  make_output_forward_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
+  {
+    return new SwigPyForwardIteratorClosed_T<OutIter>(current, begin, end, seq);
+  }
+
   template<typename OutIter>
   inline SwigPyIterator*
   make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
@@ -5220,6 +4872,13 @@ namespace swig {
     return new SwigPyIteratorClosed_T<OutIter>(current, begin, end, seq);
   }
 
+  template<typename OutIter>
+  inline SwigPyIterator*
+  make_output_forward_iterator(const OutIter& current, PyObject *seq = 0)
+  {
+    return new SwigPyForwardIteratorOpen_T<OutIter>(current, seq);
+  }
+
   template<typename OutIter>
   inline SwigPyIterator*
   make_output_iterator(const OutIter& current, PyObject *seq = 0)
@@ -5244,8 +4903,8 @@ namespace swig
     {
       swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index);
       try {
-	return swig::as<T>(item, true);
-      } catch (std::exception& e) {
+	return swig::as<T>(item);
+      } catch (const std::invalid_argument& e) {
 	char msg[1024];
 	sprintf(msg, "in sequence element %d ", (int)_index);
 	if (!PyErr_Occurred()) {
@@ -5440,19 +5099,13 @@ namespace swig
       return const_reference(_seq, n);
     }
 
-    bool check(bool set_err = true) const
+    bool check() const
     {
       Py_ssize_t s = size();
       for (Py_ssize_t i = 0; i < s; ++i) {
 	swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
-	if (!swig::check<value_type>(item)) {
-	  if (set_err) {
-	    char msg[1024];
-	    sprintf(msg, "in sequence element %d", (int)i);
-	    SWIG_Error(SWIG_RuntimeError, msg);
-	  }
+	if (!swig::check<value_type>(item))
 	  return false;
-	}
       }
       return true;
     }
@@ -5708,6 +5361,42 @@ SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double
 SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____getitem____SWIG_1(std::vector< double > const *self,std::vector< double >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
+
+namespace swig {
+  static PyObject* container_owner_attribute() {
+    static PyObject* attr = SWIG_Python_str_FromChar("__swig_container");
+    return attr;
+  }
+
+  template <typename T>
+  struct container_owner {
+    // By default, do not add the back-reference (for value types)
+    // Specialization below will check the reference for pointer types.
+    static bool back_reference(PyObject* child, PyObject* owner) {
+      return false;
+    }
+  };
+
+  template <>
+  struct container_owner<swig::pointer_category> {  
+    /*
+     * Call to add a back-reference to the owning object when returning a 
+     * reference from a container.  Will only set the reference if child
+     * is a SWIG wrapper object that does not own the pointer.
+     *
+     * returns whether the reference was set or not
+     */
+    static bool back_reference(PyObject* child, PyObject* owner) {
+      SwigPyObject* swigThis = SWIG_Python_GetSwigThis(child);
+      if (swigThis && (swigThis->own & SWIG_POINTER_OWN) != SWIG_POINTER_OWN) {
+        PyObject_SetAttr(child, container_owner_attribute(), owner);
+        return true;
+      }
+      return false;
+    }
+  };
+}
+
 SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_2(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
@@ -6205,7 +5894,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_  (PyObject *o, std::complex<double>* val)
 
 
 SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/4.0.1/typemaps/swigmacros.swg,104,%ifcplusplus@*/
 
 const std::complex<double>&
 
@@ -6365,6 +6054,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
   {
     char *cstr; Py_ssize_t len;
+    int ret = SWIG_OK;
 #if PY_VERSION_HEX>=0x03000000
 #if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
     if (!alloc && cptr) {
@@ -6375,7 +6065,10 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
         return SWIG_RuntimeError;
     }
     obj = PyUnicode_AsUTF8String(obj);
-    if(alloc) *alloc = SWIG_NEWOBJ;
+    if (!obj)
+      return SWIG_TypeError;
+    if (alloc)
+      *alloc = SWIG_NEWOBJ;
 #endif
     PyBytes_AsStringAndSize(obj, &cstr, &len);
 #else
@@ -6383,21 +6076,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
     if (cptr) {
       if (alloc) {
-	/* 
-	   In python the user should not be able to modify the inner
-	   string representation. To warranty that, if you define
-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-	   buffer is always returned.
-
-	   The default behavior is just to return the pointer value,
-	   so, be careful.
-	*/ 
-#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-	if (*alloc != SWIG_OLDOBJ) 
-#else
-	if (*alloc == SWIG_NEWOBJ) 
-#endif
-	{
+	if (*alloc == SWIG_NEWOBJ) {
 	  *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
 	  *alloc = SWIG_NEWOBJ;
 	} else {
@@ -6413,6 +6092,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
 #else
 	*cptr = SWIG_Python_str_AsChar(obj);
+        if (!*cptr)
+          ret = SWIG_TypeError;
 #endif
       }
     }
@@ -6420,7 +6101,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
     Py_XDECREF(obj);
 #endif
-    return SWIG_OK;
+    return ret;
   } else {
 #if defined(SWIG_PYTHON_2_UNICODE)
 #if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
@@ -6433,6 +6114,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
         return SWIG_RuntimeError;
       }
       obj = PyUnicode_AsUTF8String(obj);
+      if (!obj)
+        return SWIG_TypeError;
       if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
         if (cptr) {
           if (alloc) *alloc = SWIG_NEWOBJ;
@@ -6526,11 +6209,7 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 #if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
       return PyBytes_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
 #else
-#if PY_VERSION_HEX >= 0x03010000
       return PyUnicode_DecodeUTF8(carray, static_cast< Py_ssize_t >(size), "surrogateescape");
-#else
-      return PyUnicode_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
-#endif
 #endif
 #else
       return PyString_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
@@ -6887,9 +6566,9 @@ SWIGINTERN void std_vector_Sl_std_string_Sg__insert__SWIG_1(std::vector< std::st
 
     template<class OutIterator,
 	     class FromOper = from_value_oper<typename OutIterator::value_type> >
-    struct SwigPyMapValueITerator_T : SwigPyMapIterator_T<OutIterator, FromOper>
+    struct SwigPyMapValueIterator_T : SwigPyMapIterator_T<OutIterator, FromOper>
     {
-      SwigPyMapValueITerator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
+      SwigPyMapValueIterator_T(OutIterator curr, OutIterator first, OutIterator last, PyObject *seq)
 	: SwigPyMapIterator_T<OutIterator, FromOper>(curr, first, last, seq)
       {
       }
@@ -6900,7 +6579,7 @@ SWIGINTERN void std_vector_Sl_std_string_Sg__insert__SWIG_1(std::vector< std::st
     inline SwigPyIterator*
     make_output_value_iterator(const OutIter& current, const OutIter& begin, const OutIter& end, PyObject *seq = 0)
     {
-      return new SwigPyMapValueITerator_T<OutIter>(current, begin, end, seq);
+      return new SwigPyMapValueIterator_T<OutIter>(current, begin, end, seq);
     }
   }
 
@@ -8263,11 +7942,11 @@ SwigDirector_IParameterized::~SwigDirector_IParameterized() {
 }
 
 ParameterPool *SwigDirector_IParameterized::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IParameterized.__init__.");
   }
@@ -8275,9 +7954,11 @@ ParameterPool *SwigDirector_IParameterized::createParameterTree() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8309,9 +7990,11 @@ void SwigDirector_IParameterized::onChange() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8339,11 +8022,11 @@ SwigDirector_INode::~SwigDirector_INode() {
 }
 
 ParameterPool *SwigDirector_INode::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call INode.__init__.");
   }
@@ -8351,9 +8034,11 @@ ParameterPool *SwigDirector_INode::createParameterTree() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8385,9 +8070,11 @@ void SwigDirector_INode::onChange() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8414,9 +8101,10 @@ void SwigDirector_INode::accept(INodeVisitor *visitor) const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "accept";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("accept");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8442,9 +8130,11 @@ std::string SwigDirector_INode::treeToString() const {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "treeToString";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("treeToString");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8469,7 +8159,7 @@ std::string SwigDirector_INode::treeToString() const {
 }
 
 
-std::vector< INode const *,std::allocator< INode const * > > SwigDirector_INode::getChildren() const {
+std::vector< INode const *, std::allocator< INode const * > > SwigDirector_INode::getChildren() const {
   void *swig_argp ;
   int swig_res = 0 ;
   
@@ -8481,9 +8171,11 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_INode:
   const size_t swig_method_index = 4;
   const char *const swig_method_name = "getChildren";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getChildren");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8517,9 +8209,10 @@ void SwigDirector_INode::setParent(INode const *newParent) {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "setParent";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setParent");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8547,11 +8240,11 @@ SwigDirector_ISample::~SwigDirector_ISample() {
 }
 
 ISample *SwigDirector_ISample::clone() const {
+  ISample *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ISample *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ISample.__init__.");
   }
@@ -8559,9 +8252,11 @@ ISample *SwigDirector_ISample::clone() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "clone";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("clone");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8593,9 +8288,11 @@ void SwigDirector_ISample::transferToCPP() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "transferToCPP";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("transferToCPP");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8613,11 +8310,11 @@ void SwigDirector_ISample::transferToCPP() {
 
 
 ParameterPool *SwigDirector_ISample::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ISample.__init__.");
   }
@@ -8625,9 +8322,11 @@ ParameterPool *SwigDirector_ISample::createParameterTree() const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8659,9 +8358,11 @@ void SwigDirector_ISample::onChange() {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8688,9 +8389,10 @@ void SwigDirector_ISample::accept(INodeVisitor *visitor) const {
   const size_t swig_method_index = 4;
   const char *const swig_method_name = "accept";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("accept");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8716,9 +8418,11 @@ std::string SwigDirector_ISample::treeToString() const {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "treeToString";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("treeToString");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8743,7 +8447,7 @@ std::string SwigDirector_ISample::treeToString() const {
 }
 
 
-std::vector< INode const *,std::allocator< INode const * > > SwigDirector_ISample::getChildren() const {
+std::vector< INode const *, std::allocator< INode const * > > SwigDirector_ISample::getChildren() const {
   std::vector< INode const *,std::allocator< INode const * > > c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ISample.__init__.");
@@ -8752,9 +8456,11 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_ISampl
   const size_t swig_method_index = 6;
   const char *const swig_method_name = "getChildren";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getChildren");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8789,9 +8495,10 @@ void SwigDirector_ISample::setParent(INode const *newParent) {
   const size_t swig_method_index = 7;
   const char *const swig_method_name = "setParent";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setParent");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8809,11 +8516,11 @@ void SwigDirector_ISample::setParent(INode const *newParent) {
 
 
 Material const *SwigDirector_ISample::material() const {
+  Material *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  Material *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ISample.__init__.");
   }
@@ -8821,9 +8528,11 @@ Material const *SwigDirector_ISample::material() const {
   const size_t swig_method_index = 8;
   const char *const swig_method_name = "material";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("material");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8858,11 +8567,11 @@ SwigDirector_PyBuilderCallback::~SwigDirector_PyBuilderCallback() {
 }
 
 Simulation *SwigDirector_PyBuilderCallback::build_simulation(Fit::Parameters arg0) {
+  Simulation *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  Simulation *c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new Fit::Parameters((const Fit::Parameters &)arg0)), SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_OWN |  0 );
   if (!swig_get_self()) {
@@ -8872,9 +8581,10 @@ Simulation *SwigDirector_PyBuilderCallback::build_simulation(Fit::Parameters arg
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "build_simulation";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"build_simulation", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("build_simulation");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8918,9 +8628,10 @@ void SwigDirector_PyObserverCallback::update(FitObjective const &arg0) {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "update";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"update", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("update");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8948,7 +8659,8 @@ SwigDirector_FitObjective::~SwigDirector_FitObjective() {
 }
 
 double SwigDirector_FitObjective::evaluate(Fit::Parameters const &params) {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&params), SWIGTYPE_p_Fit__Parameters,  0 );
   if (!swig_get_self()) {
@@ -8958,9 +8670,10 @@ double SwigDirector_FitObjective::evaluate(Fit::Parameters const &params) {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "evaluate_cpp";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate_cpp", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate_cpp");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -8984,7 +8697,7 @@ double SwigDirector_FitObjective::evaluate(Fit::Parameters const &params) {
 }
 
 
-std::vector< double,std::allocator< double > > SwigDirector_FitObjective::evaluate_residuals(Fit::Parameters const &params) {
+std::vector< double, std::allocator< double > > SwigDirector_FitObjective::evaluate_residuals(Fit::Parameters const &params) {
   std::vector< double,std::allocator< double > > c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&params), SWIGTYPE_p_Fit__Parameters,  0 );
@@ -8995,9 +8708,10 @@ std::vector< double,std::allocator< double > > SwigDirector_FitObjective::evalua
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "evaluate_residuals_cpp";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate_residuals_cpp", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate_residuals_cpp");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9033,11 +8747,11 @@ SwigDirector_IMultiLayerBuilder::~SwigDirector_IMultiLayerBuilder() {
 }
 
 ParameterPool *SwigDirector_IMultiLayerBuilder::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IMultiLayerBuilder.__init__.");
   }
@@ -9045,9 +8759,11 @@ ParameterPool *SwigDirector_IMultiLayerBuilder::createParameterTree() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9079,9 +8795,11 @@ void SwigDirector_IMultiLayerBuilder::onChange() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9099,11 +8817,11 @@ void SwigDirector_IMultiLayerBuilder::onChange() {
 
 
 MultiLayer *SwigDirector_IMultiLayerBuilder::buildSample() const {
+  MultiLayer *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  MultiLayer *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IMultiLayerBuilder.__init__.");
   }
@@ -9111,9 +8829,11 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::buildSample() const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "buildSample";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "buildSample", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("buildSample");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9138,11 +8858,11 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::buildSample() const {
 
 
 MultiLayer *SwigDirector_IMultiLayerBuilder::createSample(size_t index) {
+  MultiLayer *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  MultiLayer *c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_From_size_t(static_cast< size_t >(index));
   if (!swig_get_self()) {
@@ -9152,9 +8872,10 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::createSample(size_t index) {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "createSample";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"createSample", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createSample");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9179,7 +8900,8 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::createSample(size_t index) {
 
 
 size_t SwigDirector_IMultiLayerBuilder::size() {
-  size_t c_result;
+  size_t c_result = SwigValueInit< size_t >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IMultiLayerBuilder.__init__.");
   }
@@ -9187,9 +8909,11 @@ size_t SwigDirector_IMultiLayerBuilder::size() {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "size";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "size", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("size");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9224,11 +8948,11 @@ SwigDirector_IFormFactor::~SwigDirector_IFormFactor() {
 }
 
 IFormFactor *SwigDirector_IFormFactor::clone() const {
+  IFormFactor *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  IFormFactor *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
   }
@@ -9236,9 +8960,11 @@ IFormFactor *SwigDirector_IFormFactor::clone() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "clone";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("clone");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9270,9 +8996,11 @@ void SwigDirector_IFormFactor::transferToCPP() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "transferToCPP";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("transferToCPP");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9290,11 +9018,11 @@ void SwigDirector_IFormFactor::transferToCPP() {
 
 
 ParameterPool *SwigDirector_IFormFactor::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
   }
@@ -9302,9 +9030,11 @@ ParameterPool *SwigDirector_IFormFactor::createParameterTree() const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9336,9 +9066,11 @@ void SwigDirector_IFormFactor::onChange() {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9365,9 +9097,10 @@ void SwigDirector_IFormFactor::accept(INodeVisitor *visitor) const {
   const size_t swig_method_index = 4;
   const char *const swig_method_name = "accept";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("accept");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9393,9 +9126,11 @@ std::string SwigDirector_IFormFactor::treeToString() const {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "treeToString";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("treeToString");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9420,7 +9155,7 @@ std::string SwigDirector_IFormFactor::treeToString() const {
 }
 
 
-std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormFactor::getChildren() const {
+std::vector< INode const *, std::allocator< INode const * > > SwigDirector_IFormFactor::getChildren() const {
   std::vector< INode const *,std::allocator< INode const * > > c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
@@ -9429,9 +9164,11 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormF
   const size_t swig_method_index = 6;
   const char *const swig_method_name = "getChildren";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getChildren");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9466,9 +9203,10 @@ void SwigDirector_IFormFactor::setParent(INode const *newParent) {
   const size_t swig_method_index = 7;
   const char *const swig_method_name = "setParent";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setParent");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9486,11 +9224,11 @@ void SwigDirector_IFormFactor::setParent(INode const *newParent) {
 
 
 Material const *SwigDirector_IFormFactor::material() const {
+  Material *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  Material *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
   }
@@ -9498,9 +9236,11 @@ Material const *SwigDirector_IFormFactor::material() const {
   const size_t swig_method_index = 8;
   const char *const swig_method_name = "material";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("material");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9534,9 +9274,10 @@ void SwigDirector_IFormFactor::setAmbientMaterial(Material arg0) {
   const size_t swig_method_index = 9;
   const char *const swig_method_name = "setAmbientMaterial";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setAmbientMaterial", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setAmbientMaterial");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9564,9 +9305,10 @@ complex_t SwigDirector_IFormFactor::evaluate(WavevectorInfo const &wavevectors)
   const size_t swig_method_index = 10;
   const char *const swig_method_name = "evaluate";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9591,7 +9333,8 @@ complex_t SwigDirector_IFormFactor::evaluate(WavevectorInfo const &wavevectors)
 
 
 double SwigDirector_IFormFactor::volume() const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
   }
@@ -9599,9 +9342,11 @@ double SwigDirector_IFormFactor::volume() const {
   const size_t swig_method_index = 11;
   const char *const swig_method_name = "volume";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "volume", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("volume");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9626,7 +9371,8 @@ double SwigDirector_IFormFactor::volume() const {
 
 
 double SwigDirector_IFormFactor::radialExtension() const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
   }
@@ -9634,9 +9380,11 @@ double SwigDirector_IFormFactor::radialExtension() const {
   const size_t swig_method_index = 12;
   const char *const swig_method_name = "radialExtension";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "radialExtension", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("radialExtension");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9661,7 +9409,8 @@ double SwigDirector_IFormFactor::radialExtension() const {
 
 
 double SwigDirector_IFormFactor::bottomZ(IRotation const &rotation) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation,  0 );
   if (!swig_get_self()) {
@@ -9671,9 +9420,10 @@ double SwigDirector_IFormFactor::bottomZ(IRotation const &rotation) const {
   const size_t swig_method_index = 13;
   const char *const swig_method_name = "bottomZ";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("bottomZ");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9698,7 +9448,8 @@ double SwigDirector_IFormFactor::bottomZ(IRotation const &rotation) const {
 
 
 double SwigDirector_IFormFactor::topZ(IRotation const &rotation) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation,  0 );
   if (!swig_get_self()) {
@@ -9708,9 +9459,10 @@ double SwigDirector_IFormFactor::topZ(IRotation const &rotation) const {
   const size_t swig_method_index = 14;
   const char *const swig_method_name = "topZ";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"topZ", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("topZ");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9735,7 +9487,8 @@ double SwigDirector_IFormFactor::topZ(IRotation const &rotation) const {
 
 
 bool SwigDirector_IFormFactor::canSliceAnalytically(IRotation const &rot) const {
-  bool c_result;
+  bool c_result = SwigValueInit< bool >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rot), SWIGTYPE_p_IRotation,  0 );
   swig_set_inner("canSliceAnalytically", true);
@@ -9746,9 +9499,10 @@ bool SwigDirector_IFormFactor::canSliceAnalytically(IRotation const &rot) const
   const size_t swig_method_index = 15;
   const char *const swig_method_name = "canSliceAnalytically";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"canSliceAnalytically", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("canSliceAnalytically");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   swig_set_inner("canSliceAnalytically", false);
   if (!result) {
@@ -9774,11 +9528,11 @@ bool SwigDirector_IFormFactor::canSliceAnalytically(IRotation const &rot) const
 
 
 IFormFactor *SwigDirector_IFormFactor::sliceFormFactor(ZLimits limits, IRotation const &rot, kvector_t translation) const {
+  IFormFactor *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  IFormFactor *c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN |  0 );
   swig::SwigVar_PyObject obj1;
@@ -9793,9 +9547,10 @@ IFormFactor *SwigDirector_IFormFactor::sliceFormFactor(ZLimits limits, IRotation
   const size_t swig_method_index = 16;
   const char *const swig_method_name = "sliceFormFactor";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"sliceFormFactor", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("sliceFormFactor");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2, NULL);
 #endif
   swig_set_inner("sliceFormFactor", false);
   if (!result) {
@@ -9831,11 +9586,11 @@ SwigDirector_IFormFactorBorn::~SwigDirector_IFormFactorBorn() {
 }
 
 IFormFactorBorn *SwigDirector_IFormFactorBorn::clone() const {
+  IFormFactorBorn *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  IFormFactorBorn *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
   }
@@ -9843,9 +9598,11 @@ IFormFactorBorn *SwigDirector_IFormFactorBorn::clone() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "clone";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("clone");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9877,9 +9634,11 @@ void SwigDirector_IFormFactorBorn::transferToCPP() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "transferToCPP";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("transferToCPP");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9897,11 +9656,11 @@ void SwigDirector_IFormFactorBorn::transferToCPP() {
 
 
 ParameterPool *SwigDirector_IFormFactorBorn::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
   }
@@ -9909,9 +9668,11 @@ ParameterPool *SwigDirector_IFormFactorBorn::createParameterTree() const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9943,9 +9704,11 @@ void SwigDirector_IFormFactorBorn::onChange() {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -9972,9 +9735,10 @@ void SwigDirector_IFormFactorBorn::accept(INodeVisitor *visitor) const {
   const size_t swig_method_index = 4;
   const char *const swig_method_name = "accept";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("accept");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10000,9 +9764,11 @@ std::string SwigDirector_IFormFactorBorn::treeToString() const {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "treeToString";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("treeToString");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10027,7 +9793,7 @@ std::string SwigDirector_IFormFactorBorn::treeToString() const {
 }
 
 
-std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormFactorBorn::getChildren() const {
+std::vector< INode const *, std::allocator< INode const * > > SwigDirector_IFormFactorBorn::getChildren() const {
   std::vector< INode const *,std::allocator< INode const * > > c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
@@ -10036,9 +9802,11 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormF
   const size_t swig_method_index = 6;
   const char *const swig_method_name = "getChildren";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getChildren");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10073,9 +9841,10 @@ void SwigDirector_IFormFactorBorn::setParent(INode const *newParent) {
   const size_t swig_method_index = 7;
   const char *const swig_method_name = "setParent";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setParent");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10093,11 +9862,11 @@ void SwigDirector_IFormFactorBorn::setParent(INode const *newParent) {
 
 
 Material const *SwigDirector_IFormFactorBorn::material() const {
+  Material *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  Material *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
   }
@@ -10105,9 +9874,11 @@ Material const *SwigDirector_IFormFactorBorn::material() const {
   const size_t swig_method_index = 8;
   const char *const swig_method_name = "material";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("material");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10141,9 +9912,10 @@ void SwigDirector_IFormFactorBorn::setAmbientMaterial(Material arg0) {
   const size_t swig_method_index = 9;
   const char *const swig_method_name = "setAmbientMaterial";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setAmbientMaterial", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setAmbientMaterial");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10171,9 +9943,10 @@ complex_t SwigDirector_IFormFactorBorn::evaluate(WavevectorInfo const &wavevecto
   const size_t swig_method_index = 10;
   const char *const swig_method_name = "evaluate";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10198,7 +9971,8 @@ complex_t SwigDirector_IFormFactorBorn::evaluate(WavevectorInfo const &wavevecto
 
 
 double SwigDirector_IFormFactorBorn::volume() const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
   }
@@ -10206,9 +9980,11 @@ double SwigDirector_IFormFactorBorn::volume() const {
   const size_t swig_method_index = 11;
   const char *const swig_method_name = "volume";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "volume", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("volume");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10233,7 +10009,8 @@ double SwigDirector_IFormFactorBorn::volume() const {
 
 
 double SwigDirector_IFormFactorBorn::radialExtension() const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
   }
@@ -10241,9 +10018,11 @@ double SwigDirector_IFormFactorBorn::radialExtension() const {
   const size_t swig_method_index = 12;
   const char *const swig_method_name = "radialExtension";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "radialExtension", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("radialExtension");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10268,7 +10047,8 @@ double SwigDirector_IFormFactorBorn::radialExtension() const {
 
 
 double SwigDirector_IFormFactorBorn::bottomZ(IRotation const &rotation) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation,  0 );
   if (!swig_get_self()) {
@@ -10278,9 +10058,10 @@ double SwigDirector_IFormFactorBorn::bottomZ(IRotation const &rotation) const {
   const size_t swig_method_index = 13;
   const char *const swig_method_name = "bottomZ";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("bottomZ");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10305,7 +10086,8 @@ double SwigDirector_IFormFactorBorn::bottomZ(IRotation const &rotation) const {
 
 
 double SwigDirector_IFormFactorBorn::topZ(IRotation const &rotation) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation,  0 );
   if (!swig_get_self()) {
@@ -10315,9 +10097,10 @@ double SwigDirector_IFormFactorBorn::topZ(IRotation const &rotation) const {
   const size_t swig_method_index = 14;
   const char *const swig_method_name = "topZ";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"topZ", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("topZ");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10342,7 +10125,8 @@ double SwigDirector_IFormFactorBorn::topZ(IRotation const &rotation) const {
 
 
 bool SwigDirector_IFormFactorBorn::canSliceAnalytically(IRotation const &rot) const {
-  bool c_result;
+  bool c_result = SwigValueInit< bool >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rot), SWIGTYPE_p_IRotation,  0 );
   swig_set_inner("canSliceAnalytically", true);
@@ -10353,9 +10137,10 @@ bool SwigDirector_IFormFactorBorn::canSliceAnalytically(IRotation const &rot) co
   const size_t swig_method_index = 15;
   const char *const swig_method_name = "canSliceAnalytically";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"canSliceAnalytically", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("canSliceAnalytically");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   swig_set_inner("canSliceAnalytically", false);
   if (!result) {
@@ -10381,11 +10166,11 @@ bool SwigDirector_IFormFactorBorn::canSliceAnalytically(IRotation const &rot) co
 
 
 IFormFactor *SwigDirector_IFormFactorBorn::sliceFormFactor(ZLimits limits, IRotation const &rot, kvector_t translation) const {
+  IFormFactor *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  IFormFactor *c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN |  0 );
   swig::SwigVar_PyObject obj1;
@@ -10400,9 +10185,10 @@ IFormFactor *SwigDirector_IFormFactorBorn::sliceFormFactor(ZLimits limits, IRota
   const size_t swig_method_index = 16;
   const char *const swig_method_name = "sliceFormFactor";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"sliceFormFactor", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("sliceFormFactor");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2, NULL);
 #endif
   swig_set_inner("sliceFormFactor", false);
   if (!result) {
@@ -10438,9 +10224,10 @@ complex_t SwigDirector_IFormFactorBorn::evaluate_for_q(cvector_t q) const {
   const size_t swig_method_index = 17;
   const char *const swig_method_name = "evaluate_for_q";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate_for_q", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate_for_q");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10482,11 +10269,11 @@ SwigDirector_IInterferenceFunction::~SwigDirector_IInterferenceFunction() {
 }
 
 IInterferenceFunction *SwigDirector_IInterferenceFunction::clone() const {
+  IInterferenceFunction *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  IInterferenceFunction *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
   }
@@ -10494,9 +10281,11 @@ IInterferenceFunction *SwigDirector_IInterferenceFunction::clone() const {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "clone";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("clone");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10528,9 +10317,11 @@ void SwigDirector_IInterferenceFunction::transferToCPP() {
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "transferToCPP";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("transferToCPP");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10548,11 +10339,11 @@ void SwigDirector_IInterferenceFunction::transferToCPP() {
 
 
 ParameterPool *SwigDirector_IInterferenceFunction::createParameterTree() const {
+  ParameterPool *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  ParameterPool *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
   }
@@ -10560,9 +10351,11 @@ ParameterPool *SwigDirector_IInterferenceFunction::createParameterTree() const {
   const size_t swig_method_index = 2;
   const char *const swig_method_name = "createParameterTree";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("createParameterTree");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10594,9 +10387,11 @@ void SwigDirector_IInterferenceFunction::onChange() {
   const size_t swig_method_index = 3;
   const char *const swig_method_name = "onChange";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("onChange");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10623,9 +10418,10 @@ void SwigDirector_IInterferenceFunction::accept(INodeVisitor *visitor) const {
   const size_t swig_method_index = 4;
   const char *const swig_method_name = "accept";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("accept");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10651,9 +10447,11 @@ std::string SwigDirector_IInterferenceFunction::treeToString() const {
   const size_t swig_method_index = 5;
   const char *const swig_method_name = "treeToString";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("treeToString");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10678,7 +10476,7 @@ std::string SwigDirector_IInterferenceFunction::treeToString() const {
 }
 
 
-std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IInterferenceFunction::getChildren() const {
+std::vector< INode const *, std::allocator< INode const * > > SwigDirector_IInterferenceFunction::getChildren() const {
   std::vector< INode const *,std::allocator< INode const * > > c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
@@ -10687,9 +10485,11 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IInter
   const size_t swig_method_index = 6;
   const char *const swig_method_name = "getChildren";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getChildren");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10724,9 +10524,10 @@ void SwigDirector_IInterferenceFunction::setParent(INode const *newParent) {
   const size_t swig_method_index = 7;
   const char *const swig_method_name = "setParent";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("setParent");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10744,11 +10545,11 @@ void SwigDirector_IInterferenceFunction::setParent(INode const *newParent) {
 
 
 Material const *SwigDirector_IInterferenceFunction::material() const {
+  Material *c_result = 0 ;
   void *swig_argp ;
   int swig_res ;
   swig_owntype own ;
   
-  Material *c_result;
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
   }
@@ -10756,9 +10557,11 @@ Material const *SwigDirector_IInterferenceFunction::material() const {
   const size_t swig_method_index = 8;
   const char *const swig_method_name = "material";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("material");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10783,7 +10586,8 @@ Material const *SwigDirector_IInterferenceFunction::material() const {
 
 
 double SwigDirector_IInterferenceFunction::evaluate(kvector_t const q, double outer_iff) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new kvector_t((const kvector_t &)q)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   swig::SwigVar_PyObject obj1;
@@ -10795,9 +10599,10 @@ double SwigDirector_IInterferenceFunction::evaluate(kvector_t const q, double ou
   const size_t swig_method_index = 9;
   const char *const swig_method_name = "evaluate";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0,(PyObject *)obj1, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("evaluate");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0,(PyObject *)obj1, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10822,7 +10627,8 @@ double SwigDirector_IInterferenceFunction::evaluate(kvector_t const q, double ou
 
 
 double SwigDirector_IInterferenceFunction::getParticleDensity() const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
   }
@@ -10830,9 +10636,11 @@ double SwigDirector_IInterferenceFunction::getParticleDensity() const {
   const size_t swig_method_index = 11;
   const char *const swig_method_name = "getParticleDensity";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getParticleDensity", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("getParticleDensity");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10857,7 +10665,8 @@ double SwigDirector_IInterferenceFunction::getParticleDensity() const {
 
 
 bool SwigDirector_IInterferenceFunction::supportsMultilayer() const {
-  bool c_result;
+  bool c_result = SwigValueInit< bool >() ;
+  
   if (!swig_get_self()) {
     Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
   }
@@ -10865,9 +10674,11 @@ bool SwigDirector_IInterferenceFunction::supportsMultilayer() const {
   const size_t swig_method_index = 12;
   const char *const swig_method_name = "supportsMultilayer";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
+  swig::SwigVar_PyObject args = PyTuple_New(0);
+  swig::SwigVar_PyObject result = PyObject_Call(method, (PyObject *) args, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "supportsMultilayer", NULL);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("supportsMultilayer");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -10892,7 +10703,8 @@ bool SwigDirector_IInterferenceFunction::supportsMultilayer() const {
 
 
 double SwigDirector_IInterferenceFunction::iff_without_dw(kvector_t const q) const {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new kvector_t((const kvector_t &)q)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   swig_set_inner("iff_without_dw", true);
@@ -10903,9 +10715,10 @@ double SwigDirector_IInterferenceFunction::iff_without_dw(kvector_t const q) con
   const size_t swig_method_index = 13;
   const char *const swig_method_name = "iff_without_dw";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"iff_without_dw", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("iff_without_dw");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   swig_set_inner("iff_without_dw", false);
   if (!result) {
@@ -10938,10 +10751,11 @@ SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *SWIGUNUSEDPARM(self),
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SwigPyIterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SwigPyIterator" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
@@ -10959,26 +10773,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *SWIGUNUSEDPARM(self),
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_value",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_value" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)((swig::SwigPyIterator const *)arg1)->value();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -10986,7 +10799,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -10994,32 +10807,28 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_incr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_incr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->incr(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -11027,31 +10836,28 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_incr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (swig::SwigPyIterator *)(arg1)->incr();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -11064,20 +10870,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_incr", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SwigPyIterator_incr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_incr__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -11091,13 +10893,13 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator_incr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_incr__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SwigPyIterator_incr'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SwigPyIterator_incr'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    swig::SwigPyIterator::incr(size_t)\n"
     "    swig::SwigPyIterator::incr()\n");
@@ -11105,7 +10907,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -11113,32 +10915,28 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_decr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_decr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->decr(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -11146,31 +10944,28 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_decr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (swig::SwigPyIterator *)(arg1)->decr();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -11183,20 +10978,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_decr", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SwigPyIterator_decr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_decr__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -11210,13 +11001,13 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator_decr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_decr__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SwigPyIterator_decr'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SwigPyIterator_decr'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    swig::SwigPyIterator::decr(size_t)\n"
     "    swig::SwigPyIterator::decr()\n");
@@ -11232,17 +11023,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_distance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_distance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_distance" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -11252,11 +11042,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self
   arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
     result = ((swig::SwigPyIterator const *)arg1)->distance((swig::SwigPyIterator const &)*arg2);
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
   }
-  
   resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
   return resultobj;
 fail:
@@ -11272,17 +11060,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_equal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_equal", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_equal" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -11292,11 +11079,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self),
   arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
     result = (bool)((swig::SwigPyIterator const *)arg1)->equal((swig::SwigPyIterator const &)*arg2);
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
   }
-  
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -11309,11 +11094,12 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *SWIGUNUSEDPARM(self), P
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_copy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_copy" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
@@ -11331,26 +11117,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *SWIGUNUSEDPARM(self), P
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_next",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_next" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->next();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -11363,26 +11148,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *SWIGUNUSEDPARM(self
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator___next__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___next__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->__next__();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -11395,26 +11179,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *SWIGUNUSEDPARM(self
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_previous",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_previous" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->previous();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -11430,32 +11213,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_advance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_advance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_advance" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_advance" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->advance(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -11471,17 +11251,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___eq__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___eq__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -11493,7 +11272,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self),
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -11505,17 +11286,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___ne__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___ne__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -11527,7 +11307,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self),
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -11539,32 +11321,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___iadd__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___iadd__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *) &(arg1)->operator +=(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -11580,32 +11359,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___isub__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___isub__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___isub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *) &(arg1)->operator -=(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -11621,40 +11397,39 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___add__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___add__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -11662,40 +11437,38 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -11703,17 +11476,15 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -11725,7 +11496,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPA
   resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -11734,23 +11507,19 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator___sub__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__SwigPyIterator, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_SwigPyIterator___sub____SWIG_1(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -11765,7 +11534,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator___sub____SWIG_0(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -11778,7 +11547,7 @@ fail:
 
 SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -11789,12 +11558,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_iterator(PyObject *SWIGUNUSEDPARM(self),
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_iterator" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -11812,11 +11582,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___nonzero__(PyObject *SWIGUNUSEDPARM(self
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___nonzero__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -11834,11 +11605,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___bool__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___bool__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -11856,11 +11628,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___len__(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___len__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -11884,37 +11657,32 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< double,std::allocator< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___getslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___getslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -11922,7 +11690,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -11933,36 +11701,30 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11970,7 +11732,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -11983,30 +11745,26 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -12017,14 +11775,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_double_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -12039,13 +11794,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -12061,7 +11812,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t___setslice____SWIG_0(self, args);
+          return _wrap_vdouble1d_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -12084,7 +11835,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble1d_t___setslice____SWIG_1(self, args);
+            return _wrap_vdouble1d_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -12092,7 +11843,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n"
     "    std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n");
@@ -12111,36 +11862,31 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___delslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___delslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     std_vector_Sl_double_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12148,7 +11894,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -12156,30 +11902,25 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___delitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
   try {
     std_vector_Sl_double_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12187,38 +11928,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double,std::allocator< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -12226,7 +11962,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -12234,25 +11970,22 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -12263,14 +11996,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< double,std::allocator< double > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -12280,37 +12010,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12318,37 +12043,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_double_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12361,13 +12081,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -12377,7 +12093,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___delitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -12391,13 +12107,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___delitem____SWIG_0(self, args);
+        return _wrap_vdouble1d_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__delitem__(std::vector< double >::difference_type)\n"
     "    std::vector< double >::__delitem__(PySliceObject *)\n");
@@ -12405,7 +12121,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -12413,29 +12129,26 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getitem__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___getitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
   try {
     result = (std::vector< double >::value_type *) &std_vector_Sl_double_Sg____getitem____SWIG_1((std::vector< double > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -12447,13 +12160,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -12463,7 +12172,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___getitem____SWIG_0(self, args);
+        return _wrap_vdouble1d_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -12477,13 +12186,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___getitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__getitem__(PySliceObject *)\n"
     "    std::vector< double >::__getitem__(std::vector< double >::difference_type) const\n");
@@ -12491,7 +12200,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -12503,22 +12212,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -12526,11 +12232,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   arg3 = &temp3;
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_2(arg1,arg2,(double const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12543,13 +12247,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -12559,7 +12259,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___setitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -12575,7 +12275,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble1d_t___setitem____SWIG_0(self, args);
+          return _wrap_vdouble1d_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -12595,14 +12295,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t___setitem____SWIG_2(self, args);
+          return _wrap_vdouble1d_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__setitem__(PySliceObject *,std::vector< double,std::allocator< double > > const &)\n"
     "    std::vector< double >::__setitem__(PySliceObject *)\n"
@@ -12616,22 +12316,21 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   try {
     result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -12648,16 +12347,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_append(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_append" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_append" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -12671,11 +12369,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vdouble1d_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< double > *)new std::vector< double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -12684,17 +12382,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > const &""'"); 
     }
@@ -12718,11 +12415,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_empty(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_empty" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -12740,11 +12438,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_size(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_size" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -12765,16 +12464,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_swap" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble1d_t_swap" "', argument " "2"" of type '" "std::vector< double > &""'"); 
   }
@@ -12795,11 +12493,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_begin" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12818,11 +12517,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_end(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_end" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12841,11 +12541,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_rbegin(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_rbegin" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12864,11 +12565,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_rend(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_rend" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12887,10 +12589,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12908,11 +12611,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(se
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -12925,16 +12629,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -12952,10 +12655,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_pop_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop_back" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -12968,7 +12672,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::size_type arg2 ;
@@ -12976,16 +12680,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_resize" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_resize" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -12998,7 +12700,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -13006,17 +12708,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_erase" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -13036,7 +12736,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -13047,18 +12747,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_erase" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -13069,7 +12766,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "3"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -13094,13 +12791,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -13110,7 +12803,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< double >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vdouble1d_t_erase__SWIG_0(self, args);
+        return _wrap_vdouble1d_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -13127,14 +12820,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< double >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vdouble1d_t_erase__SWIG_1(self, args);
+          return _wrap_vdouble1d_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::erase(std::vector< double >::iterator)\n"
     "    std::vector< double >::erase(std::vector< double >::iterator,std::vector< double >::iterator)\n");
@@ -13142,7 +12835,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double >::size_type arg1 ;
   std::vector< double >::value_type *arg2 = 0 ;
@@ -13151,17 +12844,15 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vdouble1d_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double >::size_type""'");
   } 
   arg1 = static_cast< std::vector< double >::size_type >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vdouble1d_t" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13180,15 +12871,11 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vdouble1d_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vdouble1d_t__SWIG_0(self, args);
+    return _wrap_new_vdouble1d_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -13197,7 +12884,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vdouble1d_t__SWIG_2(self, args);
+      return _wrap_new_vdouble1d_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -13205,7 +12892,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vdouble1d_t__SWIG_1(self, args);
+      return _wrap_new_vdouble1d_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -13220,13 +12907,13 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vdouble1d_t__SWIG_3(self, args);
+        return _wrap_new_vdouble1d_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vdouble1d_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vdouble1d_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::vector()\n"
     "    std::vector< double >::vector(std::vector< double > const &)\n"
@@ -13245,16 +12932,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_push_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_push_back" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_push_back" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13273,17 +12959,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_front" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   result = (std::vector< double >::value_type *) &((std::vector< double > const *)arg1)->front();
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -13295,17 +12983,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_back" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   result = (std::vector< double >::value_type *) &((std::vector< double > const *)arg1)->back();
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -13324,22 +13014,20 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_assign" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_assign" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
   arg2 = static_cast< std::vector< double >::size_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_assign" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13353,7 +13041,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::size_type arg2 ;
@@ -13365,22 +13053,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_resize" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_resize" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
   arg2 = static_cast< std::vector< double >::size_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_resize" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13399,13 +13084,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -13416,7 +13097,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t_resize__SWIG_0(self, args);
+        return _wrap_vdouble1d_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -13435,14 +13116,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t_resize__SWIG_1(self, args);
+          return _wrap_vdouble1d_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::resize(std::vector< double >::size_type)\n"
     "    std::vector< double >::resize(std::vector< double >::size_type,std::vector< double >::value_type const &)\n");
@@ -13450,7 +13131,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -13462,18 +13143,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_insert" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -13484,7 +13162,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_insert" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13499,7 +13177,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -13514,18 +13192,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp4 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_insert" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -13536,12 +13210,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_insert" "', argument " "3"" of type '" "std::vector< double >::size_type""'");
   } 
   arg3 = static_cast< std::vector< double >::size_type >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vdouble1d_t_insert" "', argument " "4"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -13560,13 +13234,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -13581,7 +13251,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t_insert__SWIG_0(self, args);
+          return _wrap_vdouble1d_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -13605,7 +13275,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vdouble1d_t_insert__SWIG_1(self, args);
+            return _wrap_vdouble1d_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -13613,7 +13283,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::insert(std::vector< double >::iterator,std::vector< double >::value_type const &)\n"
     "    std::vector< double >::insert(std::vector< double >::iterator,std::vector< double >::size_type,std::vector< double >::value_type const &)\n");
@@ -13629,16 +13299,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_reserve(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_reserve" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_reserve" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -13656,11 +13325,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_capacity(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_capacity" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -13678,10 +13348,11 @@ SWIGINTERN PyObject *_wrap_delete_vdouble1d_t(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vdouble1d_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -13696,23 +13367,28 @@ fail:
 
 SWIGINTERN PyObject *vdouble1d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vdouble1d_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vdouble2d_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_iterator" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -13730,11 +13406,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___nonzero__(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -13752,11 +13429,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___bool__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___bool__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -13774,11 +13452,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___len__(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___len__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -13802,37 +13481,32 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___getslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___getslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     result = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)std_vector_Sl_std_vector_Sl_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -13840,7 +13514,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -13851,36 +13525,30 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13888,7 +13556,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -13901,30 +13569,26 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -13935,14 +13599,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -13957,13 +13618,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -13979,7 +13636,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble2d_t___setslice____SWIG_0(self, args);
+          return _wrap_vdouble2d_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -14002,7 +13659,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
           int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble2d_t___setslice____SWIG_1(self, args);
+            return _wrap_vdouble2d_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -14010,7 +13667,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n"
     "    std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n");
@@ -14029,36 +13686,31 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___delslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___delslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -14066,7 +13718,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -14074,30 +13726,25 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___delitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -14105,38 +13752,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -14144,7 +13786,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -14152,25 +13794,22 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -14181,14 +13820,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -14198,37 +13834,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -14236,37 +13867,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -14279,13 +13905,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -14295,7 +13917,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___delitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -14309,13 +13931,13 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___delitem____SWIG_0(self, args);
+        return _wrap_vdouble2d_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__delitem__(std::vector< std::vector< double > >::difference_type)\n"
     "    std::vector< std::vector< double > >::__delitem__(PySliceObject *)\n");
@@ -14323,7 +13945,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -14331,29 +13953,26 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___getitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   try {
     result = (std::vector< std::vector< double > >::value_type *) &std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_1((std::vector< std::vector< double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -14365,13 +13984,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -14381,7 +13996,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___getitem____SWIG_0(self, args);
+        return _wrap_vdouble2d_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -14395,13 +14010,13 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___getitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::vector< double > >::__getitem__(std::vector< std::vector< double > >::difference_type) const\n");
@@ -14409,7 +14024,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -14419,24 +14034,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -14447,11 +14059,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::vector< double,std::allocator< double > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -14466,13 +14076,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -14482,7 +14088,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___setitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -14498,7 +14104,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t___setitem____SWIG_0(self, args);
+          return _wrap_vdouble2d_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -14516,14 +14122,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t___setitem____SWIG_2(self, args);
+          return _wrap_vdouble2d_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__setitem__(PySliceObject *,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"
     "    std::vector< std::vector< double > >::__setitem__(PySliceObject *)\n"
@@ -14537,22 +14143,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   try {
     result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
   return resultobj;
 fail:
@@ -14567,18 +14172,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), Py
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_append" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_append" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -14597,11 +14201,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vdouble2d_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::vector< double > > *)new std::vector< std::vector< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -14610,17 +14214,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > > > const &""'"); 
     }
@@ -14644,11 +14247,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_empty(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_empty" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -14666,11 +14270,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_size(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_size" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -14691,16 +14296,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_swap" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_swap" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > > > &""'"); 
   }
@@ -14721,11 +14325,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_begin" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14744,11 +14349,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_end(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_end" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14767,11 +14373,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_rbegin(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_rbegin" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14790,11 +14397,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_rend(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_rend" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14813,10 +14421,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14834,11 +14443,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -14851,16 +14461,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -14878,10 +14487,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_pop_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -14894,7 +14504,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::size_type arg2 ;
@@ -14902,16 +14512,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -14924,7 +14532,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -14932,17 +14540,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -14962,7 +14568,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -14973,18 +14579,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -14995,7 +14598,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "3"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -15020,13 +14623,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -15036,7 +14635,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vdouble2d_t_erase__SWIG_0(self, args);
+        return _wrap_vdouble2d_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -15053,14 +14652,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vdouble2d_t_erase__SWIG_1(self, args);
+          return _wrap_vdouble2d_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::erase(std::vector< std::vector< double > >::iterator)\n"
     "    std::vector< std::vector< double > >::erase(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::iterator)\n");
@@ -15068,26 +14667,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > >::size_type arg1 ;
   std::vector< std::vector< double > >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vdouble2d_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::vector< double > >::size_type >(val1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vdouble2d_t" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15111,15 +14708,11 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vdouble2d_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vdouble2d_t__SWIG_0(self, args);
+    return _wrap_new_vdouble2d_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -15128,7 +14721,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vdouble2d_t__SWIG_2(self, args);
+      return _wrap_new_vdouble2d_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -15136,7 +14729,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vdouble2d_t__SWIG_1(self, args);
+      return _wrap_new_vdouble2d_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -15149,13 +14742,13 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vdouble2d_t__SWIG_3(self, args);
+        return _wrap_new_vdouble2d_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vdouble2d_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vdouble2d_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::vector()\n"
     "    std::vector< std::vector< double > >::vector(std::vector< std::vector< double,std::allocator< double > > > const &)\n"
@@ -15172,18 +14765,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_push_back(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_push_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_push_back" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15207,17 +14799,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_front" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->front();
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -15229,17 +14823,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->back();
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -15256,24 +14852,22 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_assign" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_assign" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_assign" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15292,7 +14886,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::size_type arg2 ;
@@ -15302,24 +14896,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_resize" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15343,13 +14934,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -15360,7 +14947,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t_resize__SWIG_0(self, args);
+        return _wrap_vdouble2d_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -15377,14 +14964,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t_resize__SWIG_1(self, args);
+          return _wrap_vdouble2d_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::resize(std::vector< std::vector< double > >::size_type)\n"
     "    std::vector< std::vector< double > >::resize(std::vector< std::vector< double > >::size_type,std::vector< std::vector< double > >::value_type const &)\n");
@@ -15392,7 +14979,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -15402,18 +14989,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -15426,7 +15010,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15446,7 +15030,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -15459,18 +15043,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -15481,14 +15061,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::size_type >(val3);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t_insert" "', argument " "4"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -15512,13 +15092,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -15531,7 +15107,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t_insert__SWIG_0(self, args);
+          return _wrap_vdouble2d_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -15553,7 +15129,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble2d_t_insert__SWIG_1(self, args);
+            return _wrap_vdouble2d_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -15561,7 +15137,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::insert(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::value_type const &)\n"
     "    std::vector< std::vector< double > >::insert(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::size_type,std::vector< std::vector< double > >::value_type const &)\n");
@@ -15577,16 +15153,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_reserve(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_reserve" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_reserve" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -15604,11 +15179,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_capacity(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_capacity" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -15626,10 +15202,11 @@ SWIGINTERN PyObject *_wrap_delete_vdouble2d_t(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vdouble2d_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -15644,23 +15221,28 @@ fail:
 
 SWIGINTERN PyObject *vdouble2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vdouble2d_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_integer_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_iterator" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -15678,11 +15260,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___nonzero__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -15700,11 +15283,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___bool__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -15722,11 +15306,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -15750,37 +15335,32 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< int,std::allocator< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___getslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___getslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -15788,7 +15368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -15799,36 +15379,30 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15836,7 +15410,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -15849,30 +15423,26 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
@@ -15883,14 +15453,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_int_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -15905,13 +15472,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -15927,7 +15490,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_integer_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -15950,7 +15513,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< int,std::allocator< int > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_integer_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_integer_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -15958,7 +15521,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n"
     "    std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n");
@@ -15977,36 +15540,31 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___delslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___delslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16014,7 +15572,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -16022,30 +15580,25 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___delitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     std_vector_Sl_int_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16053,38 +15606,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int,std::allocator< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -16092,7 +15640,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -16100,25 +15648,22 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
@@ -16129,14 +15674,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< int,std::allocator< int > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -16146,37 +15688,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16184,37 +15721,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_int_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16227,13 +15759,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -16243,7 +15771,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -16257,13 +15785,13 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_integer_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__delitem__(std::vector< int >::difference_type)\n"
     "    std::vector< int >::__delitem__(PySliceObject *)\n");
@@ -16271,7 +15799,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -16279,29 +15807,26 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getitem__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___getitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     result = (std::vector< int >::value_type *) &std_vector_Sl_int_Sg____getitem____SWIG_1((std::vector< int > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -16313,13 +15838,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -16329,7 +15850,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_integer_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -16343,13 +15864,13 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__getitem__(PySliceObject *)\n"
     "    std::vector< int >::__getitem__(std::vector< int >::difference_type) const\n");
@@ -16357,7 +15878,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -16369,22 +15890,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUN
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -16392,11 +15910,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = &temp3;
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_2(arg1,arg2,(int const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16409,13 +15925,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -16425,7 +15937,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -16441,7 +15953,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_integer_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_integer_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -16461,14 +15973,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_integer_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__setitem__(PySliceObject *,std::vector< int,std::allocator< int > > const &)\n"
     "    std::vector< int >::__setitem__(PySliceObject *)\n"
@@ -16482,22 +15994,21 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   try {
     result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
 fail:
@@ -16514,16 +16025,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_append(PyObject *SWIGUNUSEDPARM(self
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_append" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_append" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -16537,11 +16047,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_integer_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< int > *)new std::vector< int >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -16550,17 +16060,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
@@ -16584,11 +16093,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_empty" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -16606,11 +16116,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_size" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -16631,16 +16142,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_swap" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_integer_t_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
@@ -16661,11 +16171,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_begin" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16684,11 +16195,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_end" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16707,11 +16219,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_rbegin" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16730,11 +16243,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_rend" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16753,10 +16267,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16774,11 +16289,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< int > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -16791,16 +16307,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -16818,10 +16333,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -16834,7 +16350,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::size_type arg2 ;
@@ -16842,16 +16358,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -16864,7 +16378,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -16872,17 +16386,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -16902,7 +16414,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -16913,18 +16425,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -16935,7 +16444,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -16960,13 +16469,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -16976,7 +16481,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_integer_t_erase__SWIG_0(self, args);
+        return _wrap_vector_integer_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -16993,14 +16498,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< int >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_integer_t_erase__SWIG_1(self, args);
+          return _wrap_vector_integer_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::erase(std::vector< int >::iterator)\n"
     "    std::vector< int >::erase(std::vector< int >::iterator,std::vector< int >::iterator)\n");
@@ -17008,7 +16513,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int >::size_type arg1 ;
   std::vector< int >::value_type *arg2 = 0 ;
@@ -17017,17 +16522,15 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_integer_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
   arg1 = static_cast< std::vector< int >::size_type >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_integer_t" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17046,15 +16549,11 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_integer_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_integer_t__SWIG_0(self, args);
+    return _wrap_new_vector_integer_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -17063,7 +16562,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_integer_t__SWIG_2(self, args);
+      return _wrap_new_vector_integer_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -17071,7 +16570,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_integer_t__SWIG_1(self, args);
+      return _wrap_new_vector_integer_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -17086,13 +16585,13 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_integer_t__SWIG_3(self, args);
+        return _wrap_new_vector_integer_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_integer_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_integer_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::vector()\n"
     "    std::vector< int >::vector(std::vector< int > const &)\n"
@@ -17111,16 +16610,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_push_back(PyObject *SWIGUNUSEDPARM(s
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_push_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_push_back" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17139,17 +16637,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_front" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (std::vector< int >::value_type *) &((std::vector< int > const *)arg1)->front();
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -17161,17 +16661,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_back" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (std::vector< int >::value_type *) &((std::vector< int > const *)arg1)->back();
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -17190,22 +16692,20 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_assign(PyObject *SWIGUNUSEDPARM(self
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_assign" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_assign" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
   arg2 = static_cast< std::vector< int >::size_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_assign" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17219,7 +16719,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::size_type arg2 ;
@@ -17231,22 +16731,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
   arg2 = static_cast< std::vector< int >::size_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_resize" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17265,13 +16762,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -17282,7 +16775,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t_resize__SWIG_0(self, args);
+        return _wrap_vector_integer_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -17301,14 +16794,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t_resize__SWIG_1(self, args);
+          return _wrap_vector_integer_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::resize(std::vector< int >::size_type)\n"
     "    std::vector< int >::resize(std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
@@ -17316,7 +16809,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -17328,18 +16821,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -17350,7 +16840,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_insert" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17365,7 +16855,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -17380,18 +16870,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp4 ;
   int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -17402,12 +16888,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_insert" "', argument " "3"" of type '" "std::vector< int >::size_type""'");
   } 
   arg3 = static_cast< std::vector< int >::size_type >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_integer_t_insert" "', argument " "4"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -17426,13 +16912,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -17447,7 +16929,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t_insert__SWIG_0(self, args);
+          return _wrap_vector_integer_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -17471,7 +16953,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_integer_t_insert__SWIG_1(self, args);
+            return _wrap_vector_integer_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -17479,7 +16961,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::insert(std::vector< int >::iterator,std::vector< int >::value_type const &)\n"
     "    std::vector< int >::insert(std::vector< int >::iterator,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
@@ -17495,16 +16977,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_reserve" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_reserve" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -17522,11 +17003,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_capacity" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -17544,10 +17026,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_integer_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_integer_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -17562,23 +17045,28 @@ fail:
 
 SWIGINTERN PyObject *vector_integer_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_integer_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vinteger2d_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_iterator" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -17596,11 +17084,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___nonzero__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -17618,11 +17107,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___bool__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___bool__" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -17640,11 +17130,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___len__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___len__" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -17668,37 +17159,32 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___getslice__(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___getslice__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___getslice__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vinteger2d_t___getslice__" "', argument " "3"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< int > >::difference_type >(val3);
   try {
     result = (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *)std_vector_Sl_std_vector_Sl_int_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -17706,7 +17192,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::difference_type arg2 ;
@@ -17717,36 +17203,30 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_0(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vinteger2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< int > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17754,7 +17234,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::difference_type arg2 ;
@@ -17767,30 +17247,26 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_1(PyObject *SWIGUNUSE
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vinteger2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vinteger2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< int > >::difference_type >(val3);
   {
     std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *ptr = (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vinteger2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &""'"); 
     }
@@ -17801,14 +17277,11 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice____SWIG_1(PyObject *SWIGUNUSE
   }
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -17823,13 +17296,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice__(PyObject *self, PyObject *a
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -17845,7 +17314,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice__(PyObject *self, PyObject *a
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vinteger2d_t___setslice____SWIG_0(self, args);
+          return _wrap_vinteger2d_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -17868,7 +17337,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice__(PyObject *self, PyObject *a
           int res = swig::asptr(argv[3], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vinteger2d_t___setslice____SWIG_1(self, args);
+            return _wrap_vinteger2d_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -17876,7 +17345,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setslice__(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::__setslice__(std::vector< std::vector< int > >::difference_type,std::vector< std::vector< int > >::difference_type)\n"
     "    std::vector< std::vector< int > >::__setslice__(std::vector< std::vector< int > >::difference_type,std::vector< std::vector< int > >::difference_type,std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &)\n");
@@ -17895,36 +17364,31 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___delslice__(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___delslice__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___delslice__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vinteger2d_t___delslice__" "', argument " "3"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< int > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17932,7 +17396,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::difference_type arg2 ;
@@ -17940,30 +17404,25 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem____SWIG_0(PyObject *SWIGUNUSED
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___delitem__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17971,38 +17430,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *)std_vector_Sl_std_vector_Sl_int_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -18010,7 +17464,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -18018,25 +17472,22 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_0(PyObject *SWIGUNUSED
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *ptr = (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vinteger2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &""'"); 
     }
@@ -18047,14 +17498,11 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_0(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -18064,37 +17512,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -18102,37 +17545,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -18145,13 +17583,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem__(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -18161,7 +17595,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem__(PyObject *self, PyObject *ar
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vinteger2d_t___delitem____SWIG_1(self, args);
+        return _wrap_vinteger2d_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -18175,13 +17609,13 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___delitem__(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vinteger2d_t___delitem____SWIG_0(self, args);
+        return _wrap_vinteger2d_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::__delitem__(std::vector< std::vector< int > >::difference_type)\n"
     "    std::vector< std::vector< int > >::__delitem__(PySliceObject *)\n");
@@ -18189,7 +17623,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::difference_type arg2 ;
@@ -18197,29 +17631,26 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem____SWIG_1(PyObject *SWIGUNUSED
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< int > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___getitem__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
   try {
     result = (std::vector< std::vector< int > >::value_type *) &std_vector_Sl_std_vector_Sl_int_Sg__Sg____getitem____SWIG_1((std::vector< std::vector< int > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< int,std::allocator< int > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< int > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -18231,13 +17662,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem__(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -18247,7 +17674,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem__(PyObject *self, PyObject *ar
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vinteger2d_t___getitem____SWIG_0(self, args);
+        return _wrap_vinteger2d_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -18261,13 +17688,13 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___getitem__(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vinteger2d_t___getitem____SWIG_1(self, args);
+        return _wrap_vinteger2d_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::vector< int > >::__getitem__(std::vector< std::vector< int > >::difference_type) const\n");
@@ -18275,7 +17702,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::difference_type arg2 ;
@@ -18285,24 +17712,21 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_2(PyObject *SWIGUNUSED
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t___setitem__" "', argument " "2"" of type '" "std::vector< std::vector< int > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::difference_type >(val2);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vinteger2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -18313,11 +17737,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem____SWIG_2(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_std_vector_Sl_int_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::vector< int,std::allocator< int > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -18332,13 +17754,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem__(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -18348,7 +17766,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem__(PyObject *self, PyObject *ar
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vinteger2d_t___setitem____SWIG_1(self, args);
+        return _wrap_vinteger2d_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -18364,7 +17782,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem__(PyObject *self, PyObject *ar
         int res = swig::asptr(argv[2], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vinteger2d_t___setitem____SWIG_0(self, args);
+          return _wrap_vinteger2d_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -18382,14 +17800,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t___setitem__(PyObject *self, PyObject *ar
         int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vinteger2d_t___setitem____SWIG_2(self, args);
+          return _wrap_vinteger2d_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::__setitem__(PySliceObject *,std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > const &)\n"
     "    std::vector< std::vector< int > >::__setitem__(PySliceObject *)\n"
@@ -18403,22 +17821,21 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   try {
     result = std_vector_Sl_std_vector_Sl_int_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< int,std::allocator< int > > >(result));
   return resultobj;
 fail:
@@ -18433,18 +17850,17 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_append(PyObject *SWIGUNUSEDPARM(self), P
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_append" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vinteger2d_t_append" "', argument " "2"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -18463,11 +17879,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vinteger2d_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::vector< int > > *)new std::vector< std::vector< int > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -18476,17 +17892,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int,std::allocator< int > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vinteger2d_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *ptr = (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vinteger2d_t" "', argument " "1"" of type '" "std::vector< std::vector< int,std::allocator< int > > > const &""'"); 
     }
@@ -18510,11 +17925,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_empty(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_empty" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -18532,11 +17948,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_size(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_size" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -18557,16 +17974,15 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_swap" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vinteger2d_t_swap" "', argument " "2"" of type '" "std::vector< std::vector< int,std::allocator< int > > > &""'"); 
   }
@@ -18587,11 +18003,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_begin(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_begin" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18610,11 +18027,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_end(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_end" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18633,11 +18051,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_rbegin(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_rbegin" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18656,11 +18075,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_rend(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_rend" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18679,10 +18099,11 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_clear(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18700,11 +18121,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::vector< int,std::allocator< int > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -18717,16 +18139,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vinteger2d_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vinteger2d_t" "', argument " "1"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
@@ -18744,10 +18165,11 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_pop_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_pop_back" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -18760,7 +18182,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::size_type arg2 ;
@@ -18768,16 +18190,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
@@ -18790,7 +18210,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::iterator arg2 ;
@@ -18798,17 +18218,15 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< int > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
   } else {
@@ -18828,7 +18246,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::iterator arg2 ;
@@ -18839,18 +18257,15 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< int > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
   } else {
@@ -18861,7 +18276,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_erase" "', argument " "3"" of type '" "std::vector< std::vector< int > >::iterator""'");
   } else {
@@ -18886,13 +18301,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -18902,7 +18313,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< int > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vinteger2d_t_erase__SWIG_0(self, args);
+        return _wrap_vinteger2d_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -18919,14 +18330,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_erase(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< int > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vinteger2d_t_erase__SWIG_1(self, args);
+          return _wrap_vinteger2d_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::erase(std::vector< std::vector< int > >::iterator)\n"
     "    std::vector< std::vector< int > >::erase(std::vector< std::vector< int > >::iterator,std::vector< std::vector< int > >::iterator)\n");
@@ -18934,26 +18345,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vinteger2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > >::size_type arg1 ;
   std::vector< std::vector< int > >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vinteger2d_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vinteger2d_t" "', argument " "1"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::vector< int > >::size_type >(val1);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vinteger2d_t" "', argument " "2"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -18977,15 +18386,11 @@ SWIGINTERN PyObject *_wrap_new_vinteger2d_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vinteger2d_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vinteger2d_t__SWIG_0(self, args);
+    return _wrap_new_vinteger2d_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -18994,7 +18399,7 @@ SWIGINTERN PyObject *_wrap_new_vinteger2d_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vinteger2d_t__SWIG_2(self, args);
+      return _wrap_new_vinteger2d_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -19002,7 +18407,7 @@ SWIGINTERN PyObject *_wrap_new_vinteger2d_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vinteger2d_t__SWIG_1(self, args);
+      return _wrap_new_vinteger2d_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -19015,13 +18420,13 @@ SWIGINTERN PyObject *_wrap_new_vinteger2d_t(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< int,std::allocator< int > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vinteger2d_t__SWIG_3(self, args);
+        return _wrap_new_vinteger2d_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vinteger2d_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vinteger2d_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::vector()\n"
     "    std::vector< std::vector< int > >::vector(std::vector< std::vector< int,std::allocator< int > > > const &)\n"
@@ -19038,18 +18443,17 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_push_back(PyObject *SWIGUNUSEDPARM(self)
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_push_back" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vinteger2d_t_push_back" "', argument " "2"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -19073,17 +18477,19 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_front(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_front" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   result = (std::vector< std::vector< int > >::value_type *) &((std::vector< std::vector< int > > const *)arg1)->front();
   resultobj = swig::from(static_cast< std::vector< int,std::allocator< int > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< int > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -19095,17 +18501,19 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_back(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_back" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
   result = (std::vector< std::vector< int > >::value_type *) &((std::vector< std::vector< int > > const *)arg1)->back();
   resultobj = swig::from(static_cast< std::vector< int,std::allocator< int > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< int > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -19122,24 +18530,22 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_assign(PyObject *SWIGUNUSEDPARM(self), P
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_assign" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t_assign" "', argument " "2"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::size_type >(val2);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vinteger2d_t_assign" "', argument " "3"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -19158,7 +18564,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::size_type arg2 ;
@@ -19168,24 +18574,21 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< int > >::size_type >(val2);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vinteger2d_t_resize" "', argument " "3"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -19209,13 +18612,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_resize(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -19226,7 +18625,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_resize(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vinteger2d_t_resize__SWIG_0(self, args);
+        return _wrap_vinteger2d_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -19243,14 +18642,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_resize(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vinteger2d_t_resize__SWIG_1(self, args);
+          return _wrap_vinteger2d_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::resize(std::vector< std::vector< int > >::size_type)\n"
     "    std::vector< std::vector< int > >::resize(std::vector< std::vector< int > >::size_type,std::vector< std::vector< int > >::value_type const &)\n");
@@ -19258,7 +18657,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::iterator arg2 ;
@@ -19268,18 +18667,15 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< int > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vinteger2d_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
   } else {
@@ -19292,7 +18688,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(
   }
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vinteger2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -19312,7 +18708,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   std::vector< std::vector< int > >::iterator arg2 ;
@@ -19325,18 +18721,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vinteger2d_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
   } else {
@@ -19347,14 +18739,14 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vinteger2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< int > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vinteger2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< int > >::size_type >(val3);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vinteger2d_t_insert" "', argument " "4"" of type '" "std::vector< std::vector< int > >::value_type const &""'"); 
     }
@@ -19378,13 +18770,9 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vinteger2d_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< int,std::allocator< int > >,std::allocator< std::vector< int,std::allocator< int > > > >**)(0));
@@ -19397,7 +18785,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vinteger2d_t_insert__SWIG_0(self, args);
+          return _wrap_vinteger2d_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -19419,7 +18807,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert(PyObject *self, PyObject *args) {
           int res = swig::asptr(argv[3], (std::vector< int,std::allocator< int > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vinteger2d_t_insert__SWIG_1(self, args);
+            return _wrap_vinteger2d_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -19427,7 +18815,7 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vinteger2d_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vinteger2d_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< int > >::insert(std::vector< std::vector< int > >::iterator,std::vector< std::vector< int > >::value_type const &)\n"
     "    std::vector< std::vector< int > >::insert(std::vector< std::vector< int > >::iterator,std::vector< std::vector< int > >::size_type,std::vector< std::vector< int > >::value_type const &)\n");
@@ -19443,16 +18831,15 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_reserve(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vinteger2d_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vinteger2d_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_reserve" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< int > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vinteger2d_t_reserve" "', argument " "2"" of type '" "std::vector< std::vector< int > >::size_type""'");
   } 
@@ -19470,11 +18857,12 @@ SWIGINTERN PyObject *_wrap_vinteger2d_t_capacity(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< int > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vinteger2d_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vinteger2d_t_capacity" "', argument " "1"" of type '" "std::vector< std::vector< int > > const *""'"); 
   }
@@ -19492,10 +18880,11 @@ SWIGINTERN PyObject *_wrap_delete_vinteger2d_t(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::vector< int > > *arg1 = (std::vector< std::vector< int > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vinteger2d_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vinteger2d_t" "', argument " "1"" of type '" "std::vector< std::vector< int > > *""'"); 
   }
@@ -19510,23 +18899,28 @@ fail:
 
 SWIGINTERN PyObject *vinteger2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vinteger2d_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_longinteger_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_iterator" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -19544,11 +18938,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___nonzero__(PyObject *SWIGUNUSED
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___nonzero__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -19566,11 +18961,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___bool__(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___bool__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -19588,11 +18984,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___len__(PyObject *SWIGUNUSEDPARM
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___len__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -19616,37 +19013,32 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< unsigned long,std::allocator< unsigned long > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___getslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___getslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     result = (std::vector< unsigned long,std::allocator< unsigned long > > *)std_vector_Sl_unsigned_SS_long_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -19654,7 +19046,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -19665,36 +19057,30 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19702,7 +19088,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -19715,30 +19101,26 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); 
     }
@@ -19749,14 +19131,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -19771,13 +19150,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -19793,7 +19168,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_longinteger_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -19816,7 +19191,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
           int res = swig::asptr(argv[3], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_longinteger_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -19824,7 +19199,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n"
     "    std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n");
@@ -19843,36 +19218,31 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___delslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___delslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19880,7 +19250,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -19888,30 +19258,25 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___delitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19919,38 +19284,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long,std::allocator< unsigned long > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< unsigned long,std::allocator< unsigned long > > *)std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -19958,7 +19318,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -19966,25 +19326,22 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); 
     }
@@ -19995,14 +19352,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -20012,37 +19366,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20050,37 +19399,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20093,13 +19437,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -20109,7 +19449,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -20123,13 +19463,13 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_longinteger_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__delitem__(std::vector< unsigned long >::difference_type)\n"
     "    std::vector< unsigned long >::__delitem__(PySliceObject *)\n");
@@ -20137,7 +19477,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -20145,29 +19485,26 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getitem__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___getitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
   try {
     result = (std::vector< unsigned long >::value_type *) &std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_1((std::vector< unsigned long > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -20179,13 +19516,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -20195,7 +19528,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_longinteger_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -20209,13 +19542,13 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__getitem__(PySliceObject *)\n"
     "    std::vector< unsigned long >::__getitem__(std::vector< unsigned long >::difference_type) const\n");
@@ -20223,7 +19556,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -20235,22 +19568,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SW
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -20258,11 +19588,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SW
   arg3 = &temp3;
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_2(arg1,arg2,(unsigned long const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20275,13 +19603,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -20291,7 +19615,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -20307,7 +19631,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
         int res = swig::asptr(argv[2], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_longinteger_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_longinteger_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -20327,14 +19651,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_longinteger_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__setitem__(PySliceObject *,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n"
     "    std::vector< unsigned long >::__setitem__(PySliceObject *)\n"
@@ -20348,22 +19672,21 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(sel
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   try {
     result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
   return resultobj;
 fail:
@@ -20380,16 +19703,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_append(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_append" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_append" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -20403,11 +19725,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_longinteger_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< unsigned long > *)new std::vector< unsigned long >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -20416,17 +19738,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > const &""'"); 
     }
@@ -20450,11 +19771,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_empty(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_empty" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -20472,11 +19794,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_size(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_size" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -20497,16 +19820,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_swap(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_swap" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_longinteger_t_swap" "', argument " "2"" of type '" "std::vector< unsigned long > &""'"); 
   }
@@ -20527,11 +19849,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_begin(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_begin" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20550,11 +19873,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_end(PyObject *SWIGUNUSEDPARM(sel
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_end" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20573,11 +19897,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_rbegin(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_rbegin" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20596,11 +19921,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_rend(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_rend" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20619,10 +19945,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20640,11 +19967,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUS
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< unsigned long > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -20657,16 +19985,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -20684,10 +20011,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop_back(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop_back" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -20700,7 +20028,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::size_type arg2 ;
@@ -20708,16 +20036,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_resize" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_resize" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -20730,7 +20056,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -20738,17 +20064,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUS
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_erase" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -20768,7 +20092,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -20779,18 +20103,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUS
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_erase" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -20801,7 +20122,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUS
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "3"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -20826,13 +20147,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -20842,7 +20159,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< unsigned long >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_longinteger_t_erase__SWIG_0(self, args);
+        return _wrap_vector_longinteger_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -20859,14 +20176,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< unsigned long >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_longinteger_t_erase__SWIG_1(self, args);
+          return _wrap_vector_longinteger_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::erase(std::vector< unsigned long >::iterator)\n"
     "    std::vector< unsigned long >::erase(std::vector< unsigned long >::iterator,std::vector< unsigned long >::iterator)\n");
@@ -20874,7 +20191,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long >::size_type arg1 ;
   std::vector< unsigned long >::value_type *arg2 = 0 ;
@@ -20883,17 +20200,15 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSED
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_longinteger_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg1 = static_cast< std::vector< unsigned long >::size_type >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_longinteger_t" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -20912,15 +20227,11 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_longinteger_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_longinteger_t__SWIG_0(self, args);
+    return _wrap_new_vector_longinteger_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -20929,7 +20240,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_longinteger_t__SWIG_2(self, args);
+      return _wrap_new_vector_longinteger_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -20937,7 +20248,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_longinteger_t__SWIG_1(self, args);
+      return _wrap_new_vector_longinteger_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -20952,13 +20263,13 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_longinteger_t__SWIG_3(self, args);
+        return _wrap_new_vector_longinteger_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_longinteger_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_longinteger_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::vector()\n"
     "    std::vector< unsigned long >::vector(std::vector< unsigned long > const &)\n"
@@ -20977,16 +20288,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_push_back(PyObject *SWIGUNUSEDPA
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_push_back" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_push_back" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -21005,17 +20315,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_front(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_front" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   result = (std::vector< unsigned long >::value_type *) &((std::vector< unsigned long > const *)arg1)->front();
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -21027,17 +20339,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_back" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   result = (std::vector< unsigned long >::value_type *) &((std::vector< unsigned long > const *)arg1)->back();
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -21056,22 +20370,20 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_assign(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_assign" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_assign" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::size_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_assign" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -21085,7 +20397,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::size_type arg2 ;
@@ -21097,22 +20409,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_resize" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_resize" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::size_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_resize" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -21131,13 +20440,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -21148,7 +20453,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t_resize__SWIG_0(self, args);
+        return _wrap_vector_longinteger_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -21167,14 +20472,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t_resize__SWIG_1(self, args);
+          return _wrap_vector_longinteger_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::resize(std::vector< unsigned long >::size_type)\n"
     "    std::vector< unsigned long >::resize(std::vector< unsigned long >::size_type,std::vector< unsigned long >::value_type const &)\n");
@@ -21182,7 +20487,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -21194,18 +20499,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_insert" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -21216,7 +20518,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_insert" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -21231,7 +20533,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -21246,18 +20548,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp4 ;
   unsigned long val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_insert" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -21268,12 +20566,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_insert" "', argument " "3"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::size_type >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_long(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_long(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_longinteger_t_insert" "', argument " "4"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -21292,13 +20590,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -21313,7 +20607,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t_insert__SWIG_0(self, args);
+          return _wrap_vector_longinteger_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -21337,7 +20631,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_longinteger_t_insert__SWIG_1(self, args);
+            return _wrap_vector_longinteger_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -21345,7 +20639,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::insert(std::vector< unsigned long >::iterator,std::vector< unsigned long >::value_type const &)\n"
     "    std::vector< unsigned long >::insert(std::vector< unsigned long >::iterator,std::vector< unsigned long >::size_type,std::vector< unsigned long >::value_type const &)\n");
@@ -21361,16 +20655,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_reserve(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_reserve" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_reserve" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -21388,11 +20681,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_capacity(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_capacity" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -21410,10 +20704,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_longinteger_t(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_longinteger_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -21428,23 +20723,28 @@ fail:
 
 SWIGINTERN PyObject *vector_longinteger_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_longinteger_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_complex_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_iterator" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -21462,11 +20762,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -21484,11 +20785,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___bool__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -21506,11 +20808,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___len__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -21534,37 +20837,32 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::complex< double >,std::allocator< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___getslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___getslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     result = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)std_vector_Sl_std_complex_Sl_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -21572,7 +20870,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -21583,36 +20881,30 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21620,7 +20912,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -21633,30 +20925,26 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); 
     }
@@ -21667,14 +20955,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -21689,13 +20974,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -21711,7 +20992,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_complex_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -21734,7 +21015,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_complex_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_complex_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -21742,7 +21023,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n"
     "    std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n");
@@ -21761,36 +21042,31 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___delslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___delslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21798,7 +21074,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -21806,30 +21082,25 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___delitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21837,38 +21108,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double >,std::allocator< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -21876,7 +21142,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -21884,25 +21150,22 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); 
     }
@@ -21913,14 +21176,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -21930,37 +21190,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21968,37 +21223,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22011,13 +21261,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -22027,7 +21273,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -22041,13 +21287,13 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_complex_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__delitem__(std::vector< std::complex< double > >::difference_type)\n"
     "    std::vector< std::complex< double > >::__delitem__(PySliceObject *)\n");
@@ -22055,7 +21301,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -22063,29 +21309,26 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___getitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
   try {
     result = (std::vector< std::complex< double > >::value_type *) &std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_1((std::vector< std::complex< double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -22097,13 +21340,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -22113,7 +21352,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_complex_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -22127,13 +21366,13 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::complex< double > >::__getitem__(std::vector< std::complex< double > >::difference_type) const\n");
@@ -22141,7 +21380,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -22153,22 +21392,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUN
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -22176,11 +21412,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = &temp3;
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::complex< double > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22193,13 +21427,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -22209,7 +21439,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -22225,7 +21455,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_complex_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_complex_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -22245,14 +21475,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_complex_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__setitem__(PySliceObject *,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n"
     "    std::vector< std::complex< double > >::__setitem__(PySliceObject *)\n"
@@ -22266,22 +21496,21 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   try {
     result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -22298,16 +21527,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_append(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_append" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_append" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -22321,11 +21549,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_complex_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::complex< double > > *)new std::vector< std::complex< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -22334,17 +21562,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > const &""'"); 
     }
@@ -22368,11 +21595,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_empty" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -22390,11 +21618,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_size" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -22415,16 +21644,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_swap" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_complex_t_swap" "', argument " "2"" of type '" "std::vector< std::complex< double > > &""'"); 
   }
@@ -22445,11 +21673,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_begin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22468,11 +21697,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_end" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22491,11 +21721,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rbegin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22514,11 +21745,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rend" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22537,10 +21769,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22558,11 +21791,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::complex< double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -22575,16 +21809,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -22602,10 +21835,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -22618,7 +21852,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::size_type arg2 ;
@@ -22626,16 +21860,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_resize" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_resize" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -22648,7 +21880,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -22656,17 +21888,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_erase" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -22686,7 +21916,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -22697,18 +21927,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_erase" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -22719,7 +21946,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "3"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -22744,13 +21971,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -22760,7 +21983,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::complex< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_complex_t_erase__SWIG_0(self, args);
+        return _wrap_vector_complex_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -22777,14 +22000,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::complex< double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_complex_t_erase__SWIG_1(self, args);
+          return _wrap_vector_complex_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::erase(std::vector< std::complex< double > >::iterator)\n"
     "    std::vector< std::complex< double > >::erase(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::iterator)\n");
@@ -22792,7 +22015,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > >::size_type arg1 ;
   std::vector< std::complex< double > >::value_type *arg2 = 0 ;
@@ -22801,17 +22024,15 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_complex_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::complex< double > >::size_type >(val1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_complex_t" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -22830,15 +22051,11 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_complex_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_complex_t__SWIG_0(self, args);
+    return _wrap_new_vector_complex_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -22847,7 +22064,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_complex_t__SWIG_2(self, args);
+      return _wrap_new_vector_complex_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -22855,7 +22072,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_complex_t__SWIG_1(self, args);
+      return _wrap_new_vector_complex_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -22870,13 +22087,13 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_complex_t__SWIG_3(self, args);
+        return _wrap_new_vector_complex_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_complex_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_complex_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::vector()\n"
     "    std::vector< std::complex< double > >::vector(std::vector< std::complex< double > > const &)\n"
@@ -22895,16 +22112,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_push_back(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_push_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_push_back" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -22923,17 +22139,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_front" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   result = (std::vector< std::complex< double > >::value_type *) &((std::vector< std::complex< double > > const *)arg1)->front();
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -22945,17 +22163,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   result = (std::vector< std::complex< double > >::value_type *) &((std::vector< std::complex< double > > const *)arg1)->back();
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -22974,22 +22194,20 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_assign(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_assign" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_assign" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::size_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_assign" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -23003,7 +22221,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::size_type arg2 ;
@@ -23015,22 +22233,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_resize" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_resize" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::size_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_resize" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -23049,13 +22264,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -23066,7 +22277,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t_resize__SWIG_0(self, args);
+        return _wrap_vector_complex_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -23085,14 +22296,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t_resize__SWIG_1(self, args);
+          return _wrap_vector_complex_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::resize(std::vector< std::complex< double > >::size_type)\n"
     "    std::vector< std::complex< double > >::resize(std::vector< std::complex< double > >::size_type,std::vector< std::complex< double > >::value_type const &)\n");
@@ -23100,7 +22311,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -23112,18 +22323,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_insert" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -23134,7 +22342,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_insert" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -23149,7 +22357,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -23164,18 +22372,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp4 ;
   std::complex< double > val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_insert" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -23186,12 +22390,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_insert" "', argument " "3"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::size_type >(val3);
-  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj3, &val4);
+  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_complex_t_insert" "', argument " "4"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -23210,13 +22414,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -23231,7 +22431,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t_insert__SWIG_0(self, args);
+          return _wrap_vector_complex_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -23255,7 +22455,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_complex_t_insert__SWIG_1(self, args);
+            return _wrap_vector_complex_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -23263,7 +22463,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::insert(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::value_type const &)\n"
     "    std::vector< std::complex< double > >::insert(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::size_type,std::vector< std::complex< double > >::value_type const &)\n");
@@ -23279,16 +22479,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_reserve" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_reserve" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -23306,11 +22505,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_capacity" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -23328,10 +22528,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_complex_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_complex_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -23346,23 +22547,28 @@ fail:
 
 SWIGINTERN PyObject *vector_complex_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_complex_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_string_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_iterator" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -23380,11 +22586,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___nonzero__(PyObject *SWIGUNUSEDPARM(
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -23402,11 +22609,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___bool__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___bool__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -23424,11 +22632,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___len__(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___len__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -23452,37 +22661,32 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getslice__(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::string,std::allocator< std::string > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___getslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___getslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     result = (std::vector< std::string,std::allocator< std::string > > *)std_vector_Sl_std_string_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -23490,7 +22694,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -23501,36 +22705,30 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -23538,7 +22736,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -23551,30 +22749,26 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); 
     }
@@ -23585,14 +22779,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_std_string_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -23607,13 +22798,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -23629,7 +22816,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_string_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_string_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -23652,7 +22839,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
           int res = swig::asptr(argv[3], (std::vector< std::string,std::allocator< std::string > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_string_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_string_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -23660,7 +22847,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n"
     "    std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n");
@@ -23679,36 +22866,31 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delslice__(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___delslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___delslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     std_vector_Sl_std_string_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -23716,7 +22898,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -23724,30 +22906,25 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___delitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   try {
     std_vector_Sl_std_string_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -23755,38 +22932,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string,std::allocator< std::string > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::string,std::allocator< std::string > > *)std_vector_Sl_std_string_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -23794,7 +22966,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -23802,25 +22974,22 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); 
     }
@@ -23831,14 +23000,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::string,std::allocator< std::string > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -23848,37 +23014,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -23886,37 +23047,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_string_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -23929,13 +23085,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -23945,7 +23097,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -23959,13 +23111,13 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_string_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__delitem__(std::vector< std::string >::difference_type)\n"
     "    std::vector< std::string >::__delitem__(PySliceObject *)\n");
@@ -23973,7 +23125,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -23981,29 +23133,26 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNU
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getitem__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___getitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   try {
     result = (std::vector< std::string >::value_type *) &std_vector_Sl_std_string_Sg____getitem____SWIG_1((std::vector< std::string > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -24015,13 +23164,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -24031,7 +23176,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_string_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -24045,13 +23190,13 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::string >::__getitem__(std::vector< std::string >::difference_type) const\n");
@@ -24059,7 +23204,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -24069,24 +23214,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNU
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24097,11 +23239,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNU
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_2(arg1,arg2,(std::string const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -24116,13 +23256,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -24132,7 +23268,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -24148,7 +23284,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< std::string,std::allocator< std::string > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_string_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -24166,14 +23302,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_string_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__setitem__(PySliceObject *,std::vector< std::string,std::allocator< std::string > > const &)\n"
     "    std::vector< std::string >::__setitem__(PySliceObject *)\n"
@@ -24187,22 +23323,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   try {
     result = std_vector_Sl_std_string_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
 fail:
@@ -24217,18 +23352,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t_append(PyObject *SWIGUNUSEDPARM(self)
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_append" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_append" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24247,11 +23381,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_string_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::string > *)new std::vector< std::string >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -24260,17 +23394,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > const &""'"); 
     }
@@ -24294,11 +23427,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_empty(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_empty" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -24316,11 +23450,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_size" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -24341,16 +23476,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_swap" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_swap" "', argument " "2"" of type '" "std::vector< std::string > &""'"); 
   }
@@ -24371,11 +23505,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_begin(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_begin" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24394,11 +23529,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_end(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_end" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24417,11 +23553,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_rbegin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_rbegin" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24440,11 +23577,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_rend" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24463,10 +23601,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24484,11 +23623,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPAR
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -24501,16 +23641,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -24528,10 +23667,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t_pop_back(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop_back" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -24544,7 +23684,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::size_type arg2 ;
@@ -24552,16 +23692,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_resize" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_resize" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -24574,7 +23712,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -24582,17 +23720,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_erase" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -24612,7 +23748,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -24623,18 +23759,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_erase" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -24645,7 +23778,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "3"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -24670,13 +23803,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -24686,7 +23815,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::string >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_string_t_erase__SWIG_0(self, args);
+        return _wrap_vector_string_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -24703,14 +23832,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::string >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_string_t_erase__SWIG_1(self, args);
+          return _wrap_vector_string_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::erase(std::vector< std::string >::iterator)\n"
     "    std::vector< std::string >::erase(std::vector< std::string >::iterator,std::vector< std::string >::iterator)\n");
@@ -24718,26 +23847,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string >::size_type arg1 ;
   std::vector< std::string >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_string_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::string >::size_type >(val1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_string_t" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24761,15 +23888,11 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_string_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_string_t__SWIG_0(self, args);
+    return _wrap_new_vector_string_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -24778,7 +23901,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_string_t__SWIG_2(self, args);
+      return _wrap_new_vector_string_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -24786,7 +23909,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_string_t__SWIG_1(self, args);
+      return _wrap_new_vector_string_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -24799,13 +23922,13 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_string_t__SWIG_3(self, args);
+        return _wrap_new_vector_string_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_string_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_string_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::vector()\n"
     "    std::vector< std::string >::vector(std::vector< std::string > const &)\n"
@@ -24822,18 +23945,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t_push_back(PyObject *SWIGUNUSEDPARM(se
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_push_back" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_push_back" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24857,17 +23979,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t_front(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_front" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   result = (std::vector< std::string >::value_type *) &((std::vector< std::string > const *)arg1)->front();
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -24879,17 +24003,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_back" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   result = (std::vector< std::string >::value_type *) &((std::vector< std::string > const *)arg1)->back();
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -24906,24 +24032,22 @@ SWIGINTERN PyObject *_wrap_vector_string_t_assign(PyObject *SWIGUNUSEDPARM(self)
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_assign" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_assign" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::size_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_assign" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24942,7 +24066,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::size_type arg2 ;
@@ -24952,24 +24076,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPA
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_resize" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_resize" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::size_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_resize" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -24993,13 +24114,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -25010,7 +24127,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t_resize__SWIG_0(self, args);
+        return _wrap_vector_string_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -25027,14 +24144,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t_resize__SWIG_1(self, args);
+          return _wrap_vector_string_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::resize(std::vector< std::string >::size_type)\n"
     "    std::vector< std::string >::resize(std::vector< std::string >::size_type,std::vector< std::string >::value_type const &)\n");
@@ -25042,7 +24159,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -25052,18 +24169,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_insert" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -25076,7 +24190,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_insert" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -25096,7 +24210,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -25109,18 +24223,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPA
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_insert" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -25131,14 +24241,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t_insert" "', argument " "3"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::size_type >(val3);
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t_insert" "', argument " "4"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -25162,13 +24272,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -25181,7 +24287,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t_insert__SWIG_0(self, args);
+          return _wrap_vector_string_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -25203,7 +24309,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_string_t_insert__SWIG_1(self, args);
+            return _wrap_vector_string_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -25211,7 +24317,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::insert(std::vector< std::string >::iterator,std::vector< std::string >::value_type const &)\n"
     "    std::vector< std::string >::insert(std::vector< std::string >::iterator,std::vector< std::string >::size_type,std::vector< std::string >::value_type const &)\n");
@@ -25227,16 +24333,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_reserve(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_reserve" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_reserve" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -25254,11 +24359,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_capacity(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_capacity" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -25276,10 +24382,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_string_t(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_string_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -25294,21 +24401,24 @@ fail:
 
 SWIGINTERN PyObject *vector_string_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *vector_string_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::less< std::string > *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::map< std::string,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_map_string_double_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_std__lessT_std__string_t,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_std__lessT_std__string_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_map_string_double_t" "', argument " "1"" of type '" "std::less< std::string > const &""'"); 
   }
@@ -25330,12 +24440,13 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_iterator(PyObject *SWIGUNUSEDPARM
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_iterator" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25353,11 +24464,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___nonzero__(PyObject *SWIGUNUSEDP
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___nonzero__" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -25375,11 +24487,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___bool__(PyObject *SWIGUNUSEDPARM
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___bool__" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -25397,11 +24510,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___len__(PyObject *SWIGUNUSEDPARM(
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___len__" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -25421,19 +24535,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___getitem__(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::map< std::string,double >::mapped_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___getitem__" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t___getitem__" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25444,11 +24557,9 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___getitem__(PyObject *SWIGUNUSEDP
   }
   try {
     result = (std::map< std::string,double >::mapped_type *) &std_map_Sl_std_string_Sc_double_Sg____getitem__(arg1,(std::string const &)*arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_double(static_cast< double >(*result));
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
@@ -25465,18 +24576,17 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___delitem__(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t___delitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___delitem__" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t___delitem__" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25487,11 +24597,9 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___delitem__(PyObject *SWIGUNUSEDP
   }
   try {
     std_map_Sl_std_string_Sc_double_Sg____delitem__(arg1,(std::string const &)*arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
@@ -25508,19 +24616,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_has_key(PyObject *SWIGUNUSEDPARM(
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_has_key",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_has_key", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_has_key" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_has_key" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25544,11 +24651,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_keys(PyObject *SWIGUNUSEDPARM(sel
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_keys",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_keys" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25566,11 +24674,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_values(PyObject *SWIGUNUSEDPARM(s
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_values",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_values" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25588,11 +24697,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_items(PyObject *SWIGUNUSEDPARM(se
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_items",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_items" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25612,19 +24722,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___contains__(PyObject *SWIGUNUSED
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t___contains__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t___contains__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___contains__" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t___contains__" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25649,12 +24758,13 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_key_iterator(PyObject *SWIGUNUSED
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_key_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_key_iterator" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25673,12 +24783,13 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_value_iterator(PyObject *SWIGUNUS
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_value_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_value_iterator" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25691,25 +24802,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   std::map< std::string,double >::key_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___setitem__" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t___setitem__" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25728,7 +24837,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   std::map< std::string,double >::key_type *arg2 = 0 ;
@@ -25739,19 +24848,16 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_1(PyObject *SWI
   std::map< std::string,double >::mapped_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:map_string_double_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t___setitem__" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t___setitem__" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -25760,7 +24866,7 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_1(PyObject *SWI
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "map_string_double_t___setitem__" "', argument " "3"" of type '" "std::map< std::string,double >::mapped_type""'");
   } 
@@ -25768,11 +24874,9 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem____SWIG_1(PyObject *SWI
   arg3 = &temp3;
   try {
     std_map_Sl_std_string_Sc_double_Sg____setitem____SWIG_1(arg1,(std::string const &)*arg2,(double const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
@@ -25787,13 +24891,9 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem__(PyObject *self, PyObj
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "map_string_double_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > >**)(0));
@@ -25802,7 +24902,7 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem__(PyObject *self, PyObj
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_map_string_double_t___setitem____SWIG_0(self, args);
+        return _wrap_map_string_double_t___setitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -25819,14 +24919,14 @@ SWIGINTERN PyObject *_wrap_map_string_double_t___setitem__(PyObject *self, PyObj
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_map_string_double_t___setitem____SWIG_1(self, args);
+          return _wrap_map_string_double_t___setitem____SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'map_string_double_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'map_string_double_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::map< std::string,double >::__setitem__(std::map< std::string,double >::key_type const &)\n"
     "    std::map< std::string,double >::__setitem__(std::map< std::string,double >::key_type const &,std::map< std::string,double >::mapped_type const &)\n");
@@ -25839,11 +24939,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_asdict(PyObject *SWIGUNUSEDPARM(s
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_asdict",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_asdict" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -25856,11 +24957,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_map_string_double_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::map< std::string,double > *)new std::map< std::string,double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -25869,17 +24970,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_map_string_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::map< std::string,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_map_string_double_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > > *ptr = (std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_map_string_double_t" "', argument " "1"" of type '" "std::map< std::string,double > const &""'"); 
     }
@@ -25903,22 +25003,18 @@ SWIGINTERN PyObject *_wrap_new_map_string_double_t(PyObject *self, PyObject *arg
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_map_string_double_t", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_map_string_double_t__SWIG_1(self, args);
+    return _wrap_new_map_string_double_t__SWIG_1(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__lessT_std__string_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__lessT_std__string_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_map_string_double_t__SWIG_0(self, args);
+      return _wrap_new_map_string_double_t__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -25926,12 +25022,12 @@ SWIGINTERN PyObject *_wrap_new_map_string_double_t(PyObject *self, PyObject *arg
     int res = swig::asptr(argv[0], (std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_map_string_double_t__SWIG_2(self, args);
+      return _wrap_new_map_string_double_t__SWIG_2(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_map_string_double_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_map_string_double_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::map< std::string,double >::map(std::less< std::string > const &)\n"
     "    std::map< std::string,double >::map()\n"
@@ -25945,11 +25041,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_empty(PyObject *SWIGUNUSEDPARM(se
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_empty" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -25967,11 +25064,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_size(PyObject *SWIGUNUSEDPARM(sel
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_size" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -25992,16 +25090,15 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_swap(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_swap" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_swap" "', argument " "2"" of type '" "std::map< std::string,double > &""'"); 
   }
@@ -26022,11 +25119,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_begin(PyObject *SWIGUNUSEDPARM(se
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_begin" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26045,11 +25143,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_end(PyObject *SWIGUNUSEDPARM(self
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_end" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26068,11 +25167,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_rbegin(PyObject *SWIGUNUSEDPARM(s
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_rbegin" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26091,11 +25191,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_rend(PyObject *SWIGUNUSEDPARM(sel
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_rend" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26114,10 +25215,11 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_clear(PyObject *SWIGUNUSEDPARM(se
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_clear" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26135,11 +25237,12 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_get_allocator(PyObject *SWIGUNUSE
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::pair< std::string const,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:map_string_double_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_get_allocator" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
@@ -26152,26 +25255,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   std::map< std::string,double >::key_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::map< std::string,double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_erase" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_erase" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -26197,19 +25298,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_count(PyObject *SWIGUNUSEDPARM(se
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::map< std::string,double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_count",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_count", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_count" "', argument " "1"" of type '" "std::map< std::string,double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_count" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -26228,7 +25328,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   std::map< std::string,double >::iterator arg2 ;
@@ -26236,16 +25336,14 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_1(PyObject *SWIGUNUSE
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_erase" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "map_string_double_t_erase" "', argument " "2"" of type '" "std::map< std::string,double >::iterator""'");
   } else {
@@ -26264,7 +25362,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   std::map< std::string,double >::iterator arg2 ;
@@ -26275,17 +25373,14 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_2(PyObject *SWIGUNUSE
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:map_string_double_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_erase" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "map_string_double_t_erase" "', argument " "2"" of type '" "std::map< std::string,double >::iterator""'");
   } else {
@@ -26296,7 +25391,7 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase__SWIG_2(PyObject *SWIGUNUSE
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "map_string_double_t_erase" "', argument " "2"" of type '" "std::map< std::string,double >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "map_string_double_t_erase" "', argument " "3"" of type '" "std::map< std::string,double >::iterator""'");
   } else {
@@ -26320,13 +25415,9 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase(PyObject *self, PyObject *a
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "map_string_double_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > >**)(0));
@@ -26336,7 +25427,7 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase(PyObject *self, PyObject *a
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::map< std::string,double >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_map_string_double_t_erase__SWIG_1(self, args);
+        return _wrap_map_string_double_t_erase__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -26348,7 +25439,7 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase(PyObject *self, PyObject *a
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_map_string_double_t_erase__SWIG_0(self, args);
+        return _wrap_map_string_double_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -26365,14 +25456,14 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_erase(PyObject *self, PyObject *a
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::map< std::string,double >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_map_string_double_t_erase__SWIG_2(self, args);
+          return _wrap_map_string_double_t_erase__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'map_string_double_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'map_string_double_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::map< std::string,double >::erase(std::map< std::string,double >::key_type const &)\n"
     "    std::map< std::string,double >::erase(std::map< std::string,double >::iterator)\n"
@@ -26388,19 +25479,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_find(PyObject *SWIGUNUSEDPARM(sel
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::map< std::string,double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_find",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_find", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_find" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_find" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -26427,19 +25517,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_lower_bound(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::map< std::string,double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_lower_bound",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_lower_bound", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_lower_bound" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_lower_bound" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -26466,19 +25555,18 @@ SWIGINTERN PyObject *_wrap_map_string_double_t_upper_bound(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::map< std::string,double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:map_string_double_t_upper_bound",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "map_string_double_t_upper_bound", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "map_string_double_t_upper_bound" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::map< std::string,double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "map_string_double_t_upper_bound" "', argument " "2"" of type '" "std::map< std::string,double >::key_type const &""'"); 
     }
@@ -26503,10 +25591,11 @@ SWIGINTERN PyObject *_wrap_delete_map_string_double_t(PyObject *SWIGUNUSEDPARM(s
   std::map< std::string,double > *arg1 = (std::map< std::string,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_map_string_double_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_map_string_double_t" "', argument " "1"" of type '" "std::map< std::string,double > *""'"); 
   }
@@ -26521,16 +25610,20 @@ fail:
 
 SWIGINTERN PyObject *map_string_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *map_string_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::pair< double,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_pair_double_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::pair< double,double > *)new std::pair< double,double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -26539,7 +25632,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -26547,17 +25640,15 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::pair< double,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_pair_double_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_pair_double_t" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_pair_double_t" "', argument " "2"" of type '" "double""'");
   } 
@@ -26570,17 +25661,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::pair< double,double > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::pair< double,double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_pair_double_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_pair_double_t" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); 
     }
@@ -26604,22 +25694,18 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_pair_double_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_pair_double_t__SWIG_0(self, args);
+    return _wrap_new_pair_double_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
     int res = swig::asptr(argv[0], (std::pair< double,double >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_pair_double_t__SWIG_2(self, args);
+      return _wrap_new_pair_double_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -26634,13 +25720,13 @@ SWIGINTERN PyObject *_wrap_new_pair_double_t(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_pair_double_t__SWIG_1(self, args);
+        return _wrap_new_pair_double_t__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_pair_double_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_pair_double_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::pair< double,double >::pair()\n"
     "    std::pair< double,double >::pair(double,double)\n"
@@ -26657,16 +25743,15 @@ SWIGINTERN PyObject *_wrap_pair_double_t_first_set(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:pair_double_t_first_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "pair_double_t_first_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_first_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pair_double_t_first_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -26684,11 +25769,12 @@ SWIGINTERN PyObject *_wrap_pair_double_t_first_get(PyObject *SWIGUNUSEDPARM(self
   std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:pair_double_t_first_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_first_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
@@ -26709,16 +25795,15 @@ SWIGINTERN PyObject *_wrap_pair_double_t_second_set(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:pair_double_t_second_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "pair_double_t_second_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_second_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
   arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "pair_double_t_second_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -26736,11 +25821,12 @@ SWIGINTERN PyObject *_wrap_pair_double_t_second_get(PyObject *SWIGUNUSEDPARM(sel
   std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:pair_double_t_second_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pair_double_t_second_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
@@ -26758,10 +25844,11 @@ SWIGINTERN PyObject *_wrap_delete_pair_double_t(PyObject *SWIGUNUSEDPARM(self),
   std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_pair_double_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_pair_double_t" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
@@ -26776,23 +25863,28 @@ fail:
 
 SWIGINTERN PyObject *pair_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_double_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *pair_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_pair_double_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_iterator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -26810,11 +25902,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___nonzero__(PyObject *SWIGUNUSED
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -26832,11 +25925,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___bool__(PyObject *SWIGUNUSEDPAR
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___bool__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -26854,11 +25948,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___len__(PyObject *SWIGUNUSEDPARM
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___len__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -26882,37 +25977,32 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___getslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___getslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
   try {
     result = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -26920,7 +26010,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26931,36 +26021,30 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_0(PyObject *S
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26968,7 +26052,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -26981,30 +26065,26 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *S
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_pair_double_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___setslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
   {
     std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pair_double_t___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); 
     }
@@ -27015,14 +26095,11 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice____SWIG_1(PyObject *S
   }
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -27037,13 +26114,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -27059,7 +26132,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_pair_double_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_pair_double_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -27082,7 +26155,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
           int res = swig::asptr(argv[3], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_pair_double_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_pair_double_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -27090,7 +26163,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setslice__(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::__setslice__(std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double > >::difference_type)\n"
     "    std::vector< std::pair< double,double > >::__setslice__(std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n");
@@ -27109,36 +26182,31 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delslice__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___delslice__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t___delslice__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27146,7 +26214,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -27154,30 +26222,25 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_0(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___delitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27185,38 +26248,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -27224,7 +26282,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -27232,25 +26290,22 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SW
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); 
     }
@@ -27261,14 +26316,11 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_0(PyObject *SW
   }
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -27278,37 +26330,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27316,37 +26363,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___delitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27359,13 +26401,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -27375,7 +26413,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_pair_double_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -27389,13 +26427,13 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___delitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_pair_double_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::__delitem__(std::vector< std::pair< double,double > >::difference_type)\n"
     "    std::vector< std::pair< double,double > >::__delitem__(PySliceObject *)\n");
@@ -27403,7 +26441,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -27411,29 +26449,26 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem____SWIG_1(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::pair< double,double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___getitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___getitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
   try {
     result = (std::vector< std::pair< double,double > >::value_type *) &std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getitem____SWIG_1((std::vector< std::pair< double,double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -27445,13 +26480,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -27461,7 +26492,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_pair_double_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -27475,13 +26506,13 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___getitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_pair_double_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::pair< double,double > >::__getitem__(std::vector< std::pair< double,double > >::difference_type) const\n");
@@ -27489,7 +26520,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::difference_type arg2 ;
@@ -27499,24 +26530,21 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SW
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t___setitem__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t___setitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -27527,11 +26555,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem____SWIG_2(PyObject *SW
   }
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::pair< double,double > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -27546,13 +26572,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -27562,7 +26584,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_pair_double_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -27578,7 +26600,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
         int res = swig::asptr(argv[2], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_pair_double_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_pair_double_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -27596,14 +26618,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t___setitem__(PyObject *self, PyOb
         int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_pair_double_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_pair_double_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::__setitem__(PySliceObject *,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n"
     "    std::vector< std::pair< double,double > >::__setitem__(PySliceObject *)\n"
@@ -27617,22 +26639,21 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_pop" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   try {
     result = std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::pair< double,double > >(result));
   return resultobj;
 fail:
@@ -27647,18 +26668,17 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_append(PyObject *SWIGUNUSEDPARM(
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_append" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -27677,11 +26697,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_pair_double_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -27690,17 +26710,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::pair< double,double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_pair_double_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'"); 
     }
@@ -27724,11 +26743,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_empty(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_empty" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -27746,11 +26766,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_size(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_size" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -27771,16 +26792,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_swap(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_swap" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'"); 
   }
@@ -27801,11 +26821,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_begin(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_begin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27824,11 +26845,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_end(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_end" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27847,11 +26869,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_rbegin(PyObject *SWIGUNUSEDPARM(
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_rbegin" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27870,11 +26893,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_rend(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_rend" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27893,10 +26917,11 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_clear(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_clear" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27914,11 +26939,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_get_allocator(PyObject *SWIGUNUS
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::pair< double,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -27931,16 +26957,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::pair< double,double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_pair_double_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
@@ -27958,10 +26983,11 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_pop_back(PyObject *SWIGUNUSEDPAR
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_pop_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -27974,7 +27000,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -27982,16 +27008,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
@@ -28004,7 +27028,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -28012,17 +27036,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_0(PyObject *SWIGUNUS
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::pair< double,double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
   } else {
@@ -28042,7 +27064,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -28053,18 +27075,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUS
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::pair< double,double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_erase" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
   } else {
@@ -28075,7 +27094,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase__SWIG_1(PyObject *SWIGUNUS
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_erase" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
   } else {
@@ -28100,13 +27119,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -28116,7 +27131,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_pair_double_t_erase__SWIG_0(self, args);
+        return _wrap_vector_pair_double_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -28133,14 +27148,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_erase(PyObject *self, PyObject *
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_pair_double_t_erase__SWIG_1(self, args);
+          return _wrap_vector_pair_double_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::erase(std::vector< std::pair< double,double > >::iterator)\n"
     "    std::vector< std::pair< double,double > >::erase(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::iterator)\n");
@@ -28148,26 +27163,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_pair_double_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > >::size_type arg1 ;
   std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::pair< double,double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_pair_double_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::pair< double,double > >::size_type >(val1);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_pair_double_t" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28191,15 +27204,11 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_pair_double_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_pair_double_t__SWIG_0(self, args);
+    return _wrap_new_vector_pair_double_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -28208,7 +27217,7 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_pair_double_t__SWIG_2(self, args);
+      return _wrap_new_vector_pair_double_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -28216,7 +27225,7 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_pair_double_t__SWIG_1(self, args);
+      return _wrap_new_vector_pair_double_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -28229,13 +27238,13 @@ SWIGINTERN PyObject *_wrap_new_vector_pair_double_t(PyObject *self, PyObject *ar
       int res = swig::asptr(argv[1], (std::pair< double,double >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_pair_double_t__SWIG_3(self, args);
+        return _wrap_new_vector_pair_double_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_pair_double_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_pair_double_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::vector()\n"
     "    std::vector< std::pair< double,double > >::vector(std::vector< std::pair< double,double > > const &)\n"
@@ -28252,18 +27261,17 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_push_back(PyObject *SWIGUNUSEDPA
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_push_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_pair_double_t_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28287,17 +27295,19 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_front(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_front" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->front();
   resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -28309,17 +27319,19 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->back();
   resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -28336,24 +27348,22 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_assign(PyObject *SWIGUNUSEDPARM(
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_assign" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_assign" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28372,7 +27382,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::size_type arg2 ;
@@ -28382,24 +27392,21 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize__SWIG_1(PyObject *SWIGUNU
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_resize" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28423,13 +27430,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -28440,7 +27443,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_pair_double_t_resize__SWIG_0(self, args);
+        return _wrap_vector_pair_double_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -28457,14 +27460,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_resize(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_pair_double_t_resize__SWIG_1(self, args);
+          return _wrap_vector_pair_double_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::resize(std::vector< std::pair< double,double > >::size_type)\n"
     "    std::vector< std::pair< double,double > >::resize(std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
@@ -28472,7 +27475,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -28482,18 +27485,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNU
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::pair< double,double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_pair_double_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
   } else {
@@ -28506,7 +27506,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_0(PyObject *SWIGUNU
   }
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_pair_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28526,7 +27526,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   std::vector< std::pair< double,double > >::iterator arg2 ;
@@ -28539,18 +27539,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNU
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_pair_double_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_insert" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
   } else {
@@ -28561,14 +27557,14 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert__SWIG_1(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_pair_double_t_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_pair_double_t_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::size_type >(val3);
   {
     std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_pair_double_t_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
     }
@@ -28592,13 +27588,9 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_pair_double_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >**)(0));
@@ -28611,7 +27603,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_pair_double_t_insert__SWIG_0(self, args);
+          return _wrap_vector_pair_double_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -28633,7 +27625,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
           int res = swig::asptr(argv[3], (std::pair< double,double >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_pair_double_t_insert__SWIG_1(self, args);
+            return _wrap_vector_pair_double_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -28641,7 +27633,7 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_pair_double_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_pair_double_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::value_type const &)\n"
     "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
@@ -28657,16 +27649,15 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_reserve(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_pair_double_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_pair_double_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_reserve" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_pair_double_t_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
@@ -28684,11 +27675,12 @@ SWIGINTERN PyObject *_wrap_vector_pair_double_t_capacity(PyObject *SWIGUNUSEDPAR
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::pair< double,double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_pair_double_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_pair_double_t_capacity" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
   }
@@ -28706,10 +27698,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_pair_double_t(PyObject *SWIGUNUSEDPARM(
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_pair_double_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_pair_double_t" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
@@ -28724,11 +27717,15 @@ fail:
 
 SWIGINTERN PyObject *vector_pair_double_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_pair_double_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN int Swig_var_major_version_number_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable major_version_number is read-only.");
   return 1;
@@ -28775,7 +27772,7 @@ SWIGINTERN PyObject *_wrap_GetMajorVersionNumber(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GetMajorVersionNumber")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GetMajorVersionNumber", 0, 0, 0)) SWIG_fail;
   result = (int)BornAgain::GetMajorVersionNumber();
   resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
@@ -28788,7 +27785,7 @@ SWIGINTERN PyObject *_wrap_GetMinorVersionNumber(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GetMinorVersionNumber")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GetMinorVersionNumber", 0, 0, 0)) SWIG_fail;
   result = (int)BornAgain::GetMinorVersionNumber();
   resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
@@ -28801,7 +27798,7 @@ SWIGINTERN PyObject *_wrap_GetPatchVersionNumber(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GetPatchVersionNumber")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GetPatchVersionNumber", 0, 0, 0)) SWIG_fail;
   result = (int)BornAgain::GetPatchVersionNumber();
   resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
@@ -28814,7 +27811,7 @@ SWIGINTERN PyObject *_wrap_GetName(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GetName")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GetName", 0, 0, 0)) SWIG_fail;
   result = BornAgain::GetName();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
@@ -28827,7 +27824,7 @@ SWIGINTERN PyObject *_wrap_GetVersionNumber(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GetVersionNumber")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GetVersionNumber", 0, 0, 0)) SWIG_fail;
   result = BornAgain::GetVersionNumber();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
@@ -28847,23 +27844,21 @@ SWIGINTERN PyObject *_wrap_vecOfLambdaAlphaPhi(PyObject *SWIGUNUSEDPARM(self), P
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vecOfLambdaAlphaPhi",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "vecOfLambdaAlphaPhi", 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 '" "vecOfLambdaAlphaPhi" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vecOfLambdaAlphaPhi" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vecOfLambdaAlphaPhi" "', argument " "3"" of type '" "double""'");
   } 
@@ -28881,10 +27876,11 @@ SWIGINTERN PyObject *_wrap_delete_ICloneable(PyObject *SWIGUNUSEDPARM(self), PyO
   ICloneable *arg1 = (ICloneable *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ICloneable",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ICloneable, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ICloneable, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ICloneable" "', argument " "1"" of type '" "ICloneable *""'"); 
   }
@@ -28902,11 +27898,12 @@ SWIGINTERN PyObject *_wrap_ICloneable_clone(PyObject *SWIGUNUSEDPARM(self), PyOb
   ICloneable *arg1 = (ICloneable *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ICloneable *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ICloneable_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ICloneable, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ICloneable, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ICloneable_clone" "', argument " "1"" of type '" "ICloneable const *""'"); 
   }
@@ -28924,10 +27921,11 @@ SWIGINTERN PyObject *_wrap_ICloneable_transferToCPP(PyObject *SWIGUNUSEDPARM(sel
   ICloneable *arg1 = (ICloneable *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ICloneable_transferToCPP",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ICloneable, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ICloneable, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ICloneable_transferToCPP" "', argument " "1"" of type '" "ICloneable *""'"); 
   }
@@ -28942,19 +27940,18 @@ fail:
 
 SWIGINTERN PyObject *ICloneable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ICloneable, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_INamed__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_INamed__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
   INamed *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_INamed",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (INamed *)new SwigDirector_INamed(arg1); 
@@ -28969,20 +27966,18 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_INamed__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_INamed__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   std::string *arg2 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   INamed *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_INamed",&obj0,&obj1)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  arg1 = swig_obj[0];
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_INamed" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29012,18 +28007,14 @@ SWIGINTERN PyObject *_wrap_new_INamed(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_INamed", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      return _wrap_new_INamed__SWIG_0(self, args);
+      return _wrap_new_INamed__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -29033,13 +28024,13 @@ SWIGINTERN PyObject *_wrap_new_INamed(PyObject *self, PyObject *args) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_INamed__SWIG_1(self, args);
+        return _wrap_new_INamed__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_INamed'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_INamed'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    INamed::INamed()\n"
     "    INamed::INamed(PyObject *,std::string const &)\n");
@@ -29052,10 +28043,11 @@ SWIGINTERN PyObject *_wrap_delete_INamed(PyObject *SWIGUNUSEDPARM(self), PyObjec
   INamed *arg1 = (INamed *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_INamed",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INamed, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INamed, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_INamed" "', argument " "1"" of type '" "INamed *""'"); 
   }
@@ -29073,11 +28065,12 @@ SWIGINTERN PyObject *_wrap_INamed_getName(PyObject *SWIGUNUSEDPARM(self), PyObje
   INamed *arg1 = (INamed *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INamed_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INamed, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INamed, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INamed_getName" "', argument " "1"" of type '" "INamed const *""'"); 
   }
@@ -29095,10 +28088,11 @@ SWIGINTERN PyObject *_wrap_disown_INamed(PyObject *SWIGUNUSEDPARM(self), PyObjec
   INamed *arg1 = (INamed *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_INamed",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INamed, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INamed, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_INamed" "', argument " "1"" of type '" "INamed *""'"); 
   }
@@ -29117,25 +28111,27 @@ fail:
 
 SWIGINTERN PyObject *INamed_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_INamed, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *INamed_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   std::string *arg2 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IParameterized *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IParameterized",&obj0,&obj1)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  arg1 = swig_obj[0];
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_IParameterized" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29160,14 +28156,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
   IParameterized *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IParameterized",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (IParameterized *)new SwigDirector_IParameterized(arg1); 
@@ -29182,19 +28177,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IParameterized__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IParameterized *arg2 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IParameterized *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IParameterized",&obj0,&obj1)) SWIG_fail;
-  arg1 = obj0;
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IParameterized,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  arg1 = swig_obj[0];
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IParameterized,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_IParameterized" "', argument " "2"" of type '" "IParameterized const &""'"); 
   }
@@ -29221,28 +28214,24 @@ SWIGINTERN PyObject *_wrap_new_IParameterized(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_IParameterized", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      return _wrap_new_IParameterized__SWIG_1(self, args);
+      return _wrap_new_IParameterized__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParameterized, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParameterized, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_IParameterized__SWIG_2(self, args);
+        return _wrap_new_IParameterized__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -29253,13 +28242,13 @@ SWIGINTERN PyObject *_wrap_new_IParameterized(PyObject *self, PyObject *args) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_IParameterized__SWIG_0(self, args);
+        return _wrap_new_IParameterized__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_IParameterized'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_IParameterized'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParameterized::IParameterized(std::string const &)\n"
     "    IParameterized::IParameterized()\n"
@@ -29273,10 +28262,11 @@ SWIGINTERN PyObject *_wrap_delete_IParameterized(PyObject *SWIGUNUSEDPARM(self),
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IParameterized",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IParameterized" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
@@ -29294,11 +28284,12 @@ SWIGINTERN PyObject *_wrap_IParameterized_parameterPool(PyObject *SWIGUNUSEDPARM
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_parameterPool",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_parameterPool" "', argument " "1"" of type '" "IParameterized const *""'"); 
   }
@@ -29316,19 +28307,20 @@ SWIGINTERN PyObject *_wrap_IParameterized_createParameterTree(PyObject *SWIGUNUS
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_createParameterTree",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_createParameterTree" "', argument " "1"" of type '" "IParameterized const *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (ParameterPool *)((IParameterized const *)arg1)->IParameterized::createParameterTree();
@@ -29353,11 +28345,12 @@ SWIGINTERN PyObject *_wrap_IParameterized_parametersToString(PyObject *SWIGUNUSE
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_parametersToString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_parametersToString" "', argument " "1"" of type '" "IParameterized const *""'"); 
   }
@@ -29380,20 +28373,18 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter(PyObject *SWIGUNUSED
   int res2 = SWIG_OLDOBJ ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IParameterized_registerParameter",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_registerParameter", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_registerParameter" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_registerParameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29402,7 +28393,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter(PyObject *SWIGUNUSED
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_double, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IParameterized_registerParameter" "', argument " "3"" of type '" "double *""'"); 
   }
@@ -29417,7 +28408,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParameterized *arg1 = (IParameterized *) 0 ;
   std::string *arg2 = 0 ;
@@ -29429,20 +28420,16 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_0(PyObject *SWIGU
   void *argp3 = 0 ;
   int res3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IParameterized_registerVector",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_registerVector" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_registerVector" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29451,14 +28438,14 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_0(PyObject *SWIGU
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  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 '" "IParameterized_registerVector" "', argument " "3"" of type '" "kvector_t *""'"); 
   }
   arg3 = reinterpret_cast< kvector_t * >(argp3);
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IParameterized_registerVector" "', argument " "4"" of type '" "std::string const &""'"); 
     }
@@ -29479,7 +28466,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParameterized *arg1 = (IParameterized *) 0 ;
   std::string *arg2 = 0 ;
@@ -29489,19 +28476,16 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_1(PyObject *SWIGU
   int res2 = SWIG_OLDOBJ ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IParameterized_registerVector",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_registerVector" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_registerVector" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29510,7 +28494,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector__SWIG_1(PyObject *SWIGU
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  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 '" "IParameterized_registerVector" "', argument " "3"" of type '" "kvector_t *""'"); 
   }
@@ -29530,13 +28514,9 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IParameterized_registerVector", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -29550,7 +28530,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector(PyObject *self, PyObjec
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BasicVector3DT_double_t, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_IParameterized_registerVector__SWIG_1(self, args);
+          return _wrap_IParameterized_registerVector__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -29571,7 +28551,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector(PyObject *self, PyObjec
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_IParameterized_registerVector__SWIG_0(self, args);
+            return _wrap_IParameterized_registerVector__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -29579,7 +28559,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerVector(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IParameterized_registerVector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IParameterized_registerVector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParameterized::registerVector(std::string const &,kvector_t *,std::string const &)\n"
     "    IParameterized::registerVector(std::string const &,kvector_t *)\n");
@@ -29597,19 +28577,17 @@ SWIGINTERN PyObject *_wrap_IParameterized_setParameterValue(PyObject *SWIGUNUSED
   int res2 = SWIG_OLDOBJ ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IParameterized_setParameterValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_setParameterValue", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_setParameterValue" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_setParameterValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29618,7 +28596,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_setParameterValue(PyObject *SWIGUNUSED
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParameterized_setParameterValue" "', argument " "3"" of type '" "double""'");
   } 
@@ -29643,19 +28621,17 @@ SWIGINTERN PyObject *_wrap_IParameterized_setVectorValue(PyObject *SWIGUNUSEDPAR
   int res2 = SWIG_OLDOBJ ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IParameterized_setVectorValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_setVectorValue", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_setVectorValue" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_setVectorValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29665,7 +28641,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_setVectorValue(PyObject *SWIGUNUSEDPAR
     arg2 = ptr;
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "IParameterized_setVectorValue" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -29694,19 +28670,18 @@ SWIGINTERN PyObject *_wrap_IParameterized_parameter(PyObject *SWIGUNUSEDPARM(sel
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterized_parameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_parameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_parameter" "', argument " "1"" of type '" "IParameterized const *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_parameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29730,18 +28705,19 @@ SWIGINTERN PyObject *_wrap_IParameterized_onChange(PyObject *SWIGUNUSEDPARM(self
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_onChange",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_onChange" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       (arg1)->IParameterized::onChange();
@@ -29765,18 +28741,17 @@ SWIGINTERN PyObject *_wrap_IParameterized_removeParameter(PyObject *SWIGUNUSEDPA
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterized_removeParameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_removeParameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_removeParameter" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_removeParameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29802,18 +28777,17 @@ SWIGINTERN PyObject *_wrap_IParameterized_removeVector(PyObject *SWIGUNUSEDPARM(
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterized_removeVector",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterized_removeVector", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_removeVector" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
   arg1 = reinterpret_cast< IParameterized * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterized_removeVector" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -29836,13 +28810,14 @@ SWIGINTERN PyObject *_wrap_IParameterized_XComponentName(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_XComponentName",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_XComponentName" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -29865,13 +28840,14 @@ SWIGINTERN PyObject *_wrap_IParameterized_YComponentName(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_YComponentName",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_YComponentName" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -29894,13 +28870,14 @@ SWIGINTERN PyObject *_wrap_IParameterized_ZComponentName(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterized_ZComponentName",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterized_ZComponentName" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -29924,10 +28901,11 @@ SWIGINTERN PyObject *_wrap_disown_IParameterized(PyObject *SWIGUNUSEDPARM(self),
   IParameterized *arg1 = (IParameterized *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_IParameterized",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterized, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IParameterized" "', argument " "1"" of type '" "IParameterized *""'"); 
   }
@@ -29946,19 +28924,24 @@ fail:
 
 SWIGINTERN PyObject *IParameterized_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IParameterized, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IParameterized_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_INode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   INode *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_INode",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (INode *)new SwigDirector_INode(arg1); 
@@ -29979,10 +28962,11 @@ SWIGINTERN PyObject *_wrap_delete_INode(PyObject *SWIGUNUSEDPARM(self), PyObject
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_INode",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_INode" "', argument " "1"" of type '" "INode *""'"); 
   }
@@ -30003,24 +28987,23 @@ SWIGINTERN PyObject *_wrap_INode_accept(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INode_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "INode_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_accept" "', argument " "1"" of type '" "INode const *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INode_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
   arg2 = reinterpret_cast< INodeVisitor * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("INode::accept");
@@ -30042,19 +29025,20 @@ SWIGINTERN PyObject *_wrap_INode_treeToString(PyObject *SWIGUNUSEDPARM(self), Py
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_treeToString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_treeToString" "', argument " "1"" of type '" "INode const *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = ((INode const *)arg1)->INode::treeToString();
@@ -30079,16 +29063,15 @@ SWIGINTERN PyObject *_wrap_INode_registerChild(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INode_registerChild",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "INode_registerChild", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_registerChild" "', argument " "1"" of type '" "INode *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INode_registerChild" "', argument " "2"" of type '" "INode *""'"); 
   }
@@ -30106,19 +29089,20 @@ SWIGINTERN PyObject *_wrap_INode_getChildren(PyObject *SWIGUNUSEDPARM(self), PyO
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_getChildren" "', argument " "1"" of type '" "INode const *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = ((INode const *)arg1)->INode::getChildren();
@@ -30143,24 +29127,23 @@ SWIGINTERN PyObject *_wrap_INode_setParent(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INode_setParent",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "INode_setParent", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_setParent" "', argument " "1"" of type '" "INode *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INode_setParent" "', argument " "2"" of type '" "INode const *""'"); 
   }
   arg2 = reinterpret_cast< INode * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       (arg1)->INode::setParent((INode const *)arg2);
@@ -30177,17 +29160,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INode_parent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INode_parent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Swig::Director *director = 0;
   INode *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_parent",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_parent" "', argument " "1"" of type '" "INode const *""'"); 
   }
@@ -30206,17 +29188,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INode_parent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INode_parent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Swig::Director *director = 0;
   INode *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_parent",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_parent" "', argument " "1"" of type '" "INode *""'"); 
   }
@@ -30240,20 +29221,16 @@ SWIGINTERN PyObject *_wrap_INode_parent(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "INode_parent", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_INode, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_INode_parent__SWIG_1(self, args);
+      return _wrap_INode_parent__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -30262,12 +29239,12 @@ SWIGINTERN PyObject *_wrap_INode_parent(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_INode, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_INode_parent__SWIG_0(self, args);
+      return _wrap_INode_parent__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'INode_parent'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'INode_parent'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    INode::parent() const\n"
     "    INode::parent()\n");
@@ -30283,17 +29260,16 @@ SWIGINTERN PyObject *_wrap_INode_copyNumber(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INode_copyNumber",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "INode_copyNumber", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_copyNumber" "', argument " "1"" of type '" "INode const *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INode_copyNumber" "', argument " "2"" of type '" "INode const *""'"); 
   }
@@ -30311,11 +29287,12 @@ SWIGINTERN PyObject *_wrap_INode_displayName(PyObject *SWIGUNUSEDPARM(self), PyO
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_displayName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_displayName" "', argument " "1"" of type '" "INode const *""'"); 
   }
@@ -30333,19 +29310,20 @@ SWIGINTERN PyObject *_wrap_INode_createParameterTree(PyObject *SWIGUNUSEDPARM(se
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INode_createParameterTree",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_createParameterTree" "', argument " "1"" of type '" "INode const *""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (ParameterPool *)((INode const *)arg1)->INode::createParameterTree();
@@ -30370,10 +29348,11 @@ SWIGINTERN PyObject *_wrap_disown_INode(PyObject *SWIGUNUSEDPARM(self), PyObject
   INode *arg1 = (INode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_INode",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_INode" "', argument " "1"" of type '" "INode *""'"); 
   }
@@ -30392,23 +29371,28 @@ fail:
 
 SWIGINTERN PyObject *INode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_INode, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *INode_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_iterator" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -30426,11 +29410,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___nonzero__(PyObject *SW
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___nonzero__" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -30448,11 +29433,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___bool__(PyObject *SWIGU
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___bool__" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -30470,11 +29456,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___len__(PyObject *SWIGUN
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___len__" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -30498,37 +29485,32 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getslice__(PyObject *S
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< INode *,std::allocator< INode * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___getslice__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___getslice__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_inode_vector___getslice__" "', argument " "3"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode * >::difference_type >(val3);
   try {
     result = (std::vector< INode *,std::allocator< INode * > > *)std_vector_Sl_INode_Sm__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -30536,7 +29518,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::difference_type arg2 ;
@@ -30547,36 +29529,30 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_0(PyO
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "3"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode * >::difference_type >(val3);
   try {
     std_vector_Sl_INode_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30584,7 +29560,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::difference_type arg2 ;
@@ -30597,30 +29573,26 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(PyO
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_inode_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "3"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode * >::difference_type >(val3);
   {
     std::vector< INode*,std::allocator< INode * > > *ptr = (std::vector< INode*,std::allocator< INode * > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_inode_vector___setslice__" "', argument " "4"" of type '" "std::vector< INode *,std::allocator< INode * > > const &""'"); 
     }
@@ -30631,14 +29603,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(PyO
   }
   try {
     std_vector_Sl_INode_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< INode *,std::allocator< INode * > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -30653,13 +29622,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice__(PyObject *s
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -30675,7 +29640,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice__(PyObject *s
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector___setslice____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_inode_vector___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -30698,7 +29663,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice__(PyObject *s
           int res = swig::asptr(argv[3], (std::vector< INode*,std::allocator< INode * > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(self, args);
+            return _wrap_swig_dummy_type_inode_vector___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -30706,7 +29671,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setslice__(PyObject *s
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::__setslice__(std::vector< INode * >::difference_type,std::vector< INode * >::difference_type)\n"
     "    std::vector< INode * >::__setslice__(std::vector< INode * >::difference_type,std::vector< INode * >::difference_type,std::vector< INode *,std::allocator< INode * > > const &)\n");
@@ -30725,36 +29690,31 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delslice__(PyObject *S
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___delslice__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___delslice__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_inode_vector___delslice__" "', argument " "3"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode * >::difference_type >(val3);
   try {
     std_vector_Sl_INode_Sm__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30762,7 +29722,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::difference_type arg2 ;
@@ -30770,30 +29730,25 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem____SWIG_0(PyOb
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___delitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___delitem__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
   try {
     std_vector_Sl_INode_Sm__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30801,38 +29756,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode *,std::allocator< INode * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___getitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< INode *,std::allocator< INode * > > *)std_vector_Sl_INode_Sm__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -30840,7 +29790,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -30848,25 +29798,22 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(PyOb
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< INode*,std::allocator< INode * > > *ptr = (std::vector< INode*,std::allocator< INode * > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "3"" of type '" "std::vector< INode *,std::allocator< INode * > > const &""'"); 
     }
@@ -30877,14 +29824,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(PyOb
   }
   try {
     std_vector_Sl_INode_Sm__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< INode *,std::allocator< INode * > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -30894,37 +29838,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_INode_Sm__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30932,37 +29871,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___delitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_INode_Sm__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30975,13 +29909,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem__(PyObject *se
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -30991,7 +29921,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem__(PyObject *se
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector___delitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_inode_vector___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -31005,13 +29935,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___delitem__(PyObject *se
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector___delitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_inode_vector___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::__delitem__(std::vector< INode * >::difference_type)\n"
     "    std::vector< INode * >::__delitem__(PySliceObject *)\n");
@@ -31019,7 +29949,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::difference_type arg2 ;
@@ -31027,28 +29957,24 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem____SWIG_1(PyOb
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___getitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___getitem__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
   try {
     result = (std::vector< INode * >::value_type)std_vector_Sl_INode_Sm__Sg____getitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_INode, 0 |  0 );
   return resultobj;
 fail:
@@ -31061,13 +29987,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem__(PyObject *se
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -31077,7 +29999,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem__(PyObject *se
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector___getitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_inode_vector___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -31091,13 +30013,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___getitem__(PyObject *se
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector___getitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_inode_vector___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::__getitem__(PySliceObject *)\n"
     "    std::vector< INode * >::__getitem__(std::vector< INode * >::difference_type)\n");
@@ -31105,7 +30027,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::difference_type arg2 ;
@@ -31116,33 +30038,28 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem____SWIG_2(PyOb
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "2"" of type '" "std::vector< INode * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_inode_vector___setitem__" "', argument " "3"" of type '" "std::vector< INode * >::value_type""'"); 
   }
   arg3 = reinterpret_cast< std::vector< INode * >::value_type >(argp3);
   try {
     std_vector_Sl_INode_Sm__Sg____setitem____SWIG_2(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31155,13 +30072,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem__(PyObject *se
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -31171,7 +30084,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem__(PyObject *se
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -31187,7 +30100,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem__(PyObject *se
         int res = swig::asptr(argv[2], (std::vector< INode*,std::allocator< INode * > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -31206,14 +30119,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector___setitem__(PyObject *se
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_2(self, args);
+          return _wrap_swig_dummy_type_inode_vector___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::__setitem__(PySliceObject *,std::vector< INode *,std::allocator< INode * > > const &)\n"
     "    std::vector< INode * >::__setitem__(PySliceObject *)\n"
@@ -31227,22 +30140,21 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_pop(PyObject *SWIGUNUSED
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_pop" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
   try {
     result = (std::vector< INode * >::value_type)std_vector_Sl_INode_Sm__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_INode, 0 |  0 );
   return resultobj;
 fail:
@@ -31258,16 +30170,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_append(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_append" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_inode_vector_append" "', argument " "2"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -31280,11 +30191,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< INode * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_swig_dummy_type_inode_vector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< INode * > *)new std::vector< INode * >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -31293,17 +30204,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< INode * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_inode_vector",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< INode*,std::allocator< INode * > > *ptr = (std::vector< INode*,std::allocator< INode * > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_swig_dummy_type_inode_vector" "', argument " "1"" of type '" "std::vector< INode * > const &""'"); 
     }
@@ -31327,11 +30237,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_empty(PyObject *SWIGUNUS
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_empty" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -31349,11 +30260,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_size(PyObject *SWIGUNUSE
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_size" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -31374,16 +30286,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_swap(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_swap" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_inode_vector_swap" "', argument " "2"" of type '" "std::vector< INode * > &""'"); 
   }
@@ -31404,11 +30315,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_begin(PyObject *SWIGUNUS
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_begin" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31427,11 +30339,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_end(PyObject *SWIGUNUSED
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_end" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31450,11 +30363,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_rbegin(PyObject *SWIGUNU
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_rbegin" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31473,11 +30387,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_rend(PyObject *SWIGUNUSE
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_rend" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31496,10 +30411,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_clear(PyObject *SWIGUNUS
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_clear" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31517,11 +30433,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_get_allocator(PyObject *
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< INode * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_get_allocator" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -31534,16 +30451,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< INode * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_inode_vector",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_inode_vector" "', argument " "1"" of type '" "std::vector< INode * >::size_type""'");
   } 
@@ -31561,10 +30477,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_pop_back(PyObject *SWIGU
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_pop_back" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -31577,7 +30494,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::size_type arg2 ;
@@ -31585,16 +30502,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_0(PyObject
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_resize" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector_resize" "', argument " "2"" of type '" "std::vector< INode * >::size_type""'");
   } 
@@ -31607,7 +30522,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::iterator arg2 ;
@@ -31615,17 +30530,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_0(PyObject *
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
   } else {
@@ -31645,7 +30558,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::iterator arg2 ;
@@ -31656,18 +30569,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_1(PyObject *
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< INode * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
   } else {
@@ -31678,7 +30588,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase__SWIG_1(PyObject *
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_erase" "', argument " "3"" of type '" "std::vector< INode * >::iterator""'");
   } else {
@@ -31703,13 +30613,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase(PyObject *self, Py
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -31719,7 +30625,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase(PyObject *self, Py
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< INode * >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector_erase__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_inode_vector_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -31736,14 +30642,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_erase(PyObject *self, Py
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< INode * >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector_erase__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_inode_vector_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::erase(std::vector< INode * >::iterator)\n"
     "    std::vector< INode * >::erase(std::vector< INode * >::iterator,std::vector< INode * >::iterator)\n");
@@ -31751,7 +30657,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * >::size_type arg1 ;
   std::vector< INode * >::value_type arg2 = (std::vector< INode * >::value_type) 0 ;
@@ -31759,17 +30665,15 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector__SWIG_3(PyObject *SW
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_swig_dummy_type_inode_vector",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_inode_vector" "', argument " "1"" of type '" "std::vector< INode * >::size_type""'");
   } 
   arg1 = static_cast< std::vector< INode * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_swig_dummy_type_inode_vector" "', argument " "2"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -31787,15 +30691,11 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_swig_dummy_type_inode_vector", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_swig_dummy_type_inode_vector__SWIG_0(self, args);
+    return _wrap_new_swig_dummy_type_inode_vector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -31804,7 +30704,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector(PyObject *self, PyOb
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_swig_dummy_type_inode_vector__SWIG_2(self, args);
+      return _wrap_new_swig_dummy_type_inode_vector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -31812,7 +30712,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector(PyObject *self, PyOb
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_swig_dummy_type_inode_vector__SWIG_1(self, args);
+      return _wrap_new_swig_dummy_type_inode_vector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -31826,13 +30726,13 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_inode_vector(PyObject *self, PyOb
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_INode, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_swig_dummy_type_inode_vector__SWIG_3(self, args);
+        return _wrap_new_swig_dummy_type_inode_vector__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_inode_vector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_inode_vector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::vector()\n"
     "    std::vector< INode * >::vector(std::vector< INode * > const &)\n"
@@ -31850,16 +30750,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_push_back(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_push_back" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_inode_vector_push_back" "', argument " "2"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -31877,11 +30776,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_front(PyObject *SWIGUNUS
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_front" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -31899,11 +30799,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_back(PyObject *SWIGUNUSE
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_back" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -31927,22 +30828,20 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_assign(PyObject *SWIGUNU
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_assign" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector_assign" "', argument " "2"" of type '" "std::vector< INode * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_inode_vector_assign" "', argument " "3"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -31955,7 +30854,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::size_type arg2 ;
@@ -31966,22 +30865,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize__SWIG_1(PyObject
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_resize" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector_resize" "', argument " "2"" of type '" "std::vector< INode * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< INode * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_inode_vector_resize" "', argument " "3"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -31999,13 +30895,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize(PyObject *self, P
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -32016,7 +30908,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize(PyObject *self, P
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_inode_vector_resize__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_inode_vector_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -32034,14 +30926,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_resize(PyObject *self, P
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector_resize__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_inode_vector_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::resize(std::vector< INode * >::size_type)\n"
     "    std::vector< INode * >::resize(std::vector< INode * >::size_type,std::vector< INode * >::value_type)\n");
@@ -32049,7 +30941,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::iterator arg2 ;
@@ -32060,18 +30952,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_0(PyObject
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< INode * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_inode_vector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
   } else {
@@ -32082,7 +30971,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_0(PyObject
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "3"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -32096,7 +30985,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   std::vector< INode * >::iterator arg2 ;
@@ -32110,18 +30999,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_1(PyObject
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_inode_vector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
   } else {
@@ -32132,12 +31017,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert__SWIG_1(PyObject
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode * >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "3"" of type '" "std::vector< INode * >::size_type""'");
   } 
   arg3 = static_cast< std::vector< INode * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_INode, 0 |  0 );
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_inode_vector_insert" "', argument " "4"" of type '" "std::vector< INode * >::value_type""'"); 
   }
@@ -32155,13 +31040,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert(PyObject *self, P
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode*,std::allocator< INode * > >**)(0));
@@ -32175,7 +31056,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert(PyObject *self, P
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_inode_vector_insert__SWIG_0(self, args);
+          return _wrap_swig_dummy_type_inode_vector_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -32198,7 +31079,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert(PyObject *self, P
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_INode, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_inode_vector_insert__SWIG_1(self, args);
+            return _wrap_swig_dummy_type_inode_vector_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -32206,7 +31087,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_insert(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_inode_vector_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode * >::insert(std::vector< INode * >::iterator,std::vector< INode * >::value_type)\n"
     "    std::vector< INode * >::insert(std::vector< INode * >::iterator,std::vector< INode * >::size_type,std::vector< INode * >::value_type)\n");
@@ -32222,16 +31103,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_reserve(PyObject *SWIGUN
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_inode_vector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_inode_vector_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_reserve" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_inode_vector_reserve" "', argument " "2"" of type '" "std::vector< INode * >::size_type""'");
   } 
@@ -32249,11 +31129,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_inode_vector_capacity(PyObject *SWIGU
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_inode_vector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_inode_vector_capacity" "', argument " "1"" of type '" "std::vector< INode * > const *""'"); 
   }
@@ -32271,10 +31152,11 @@ SWIGINTERN PyObject *_wrap_delete_swig_dummy_type_inode_vector(PyObject *SWIGUNU
   std::vector< INode * > *arg1 = (std::vector< INode * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_swig_dummy_type_inode_vector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_swig_dummy_type_inode_vector" "', argument " "1"" of type '" "std::vector< INode * > *""'"); 
   }
@@ -32289,23 +31171,28 @@ fail:
 
 SWIGINTERN PyObject *swig_dummy_type_inode_vector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *swig_dummy_type_inode_vector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_iterator" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -32323,11 +31210,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___nonzero__(PyObje
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___nonzero__" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -32345,11 +31233,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___bool__(PyObject
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___bool__" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -32367,11 +31256,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___len__(PyObject *
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___len__" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -32395,37 +31285,32 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getslice__(PyObj
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< INode const *,std::allocator< INode const * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___getslice__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___getslice__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_inode_vector___getslice__" "', argument " "3"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode const * >::difference_type >(val3);
   try {
     result = (std::vector< INode const *,std::allocator< INode const * > > *)std_vector_Sl_INode_SS_const_Sm__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -32433,7 +31318,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::difference_type arg2 ;
@@ -32444,36 +31329,30 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "3"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode const * >::difference_type >(val3);
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32481,7 +31360,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::difference_type arg2 ;
@@ -32494,30 +31373,26 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_const_inode_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "3"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode const * >::difference_type >(val3);
   {
     std::vector< INode const*,std::allocator< INode const * > > *ptr = (std::vector< INode const*,std::allocator< INode const * > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_const_inode_vector___setslice__" "', argument " "4"" of type '" "std::vector< INode const *,std::allocator< INode const * > > const &""'"); 
     }
@@ -32528,14 +31403,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice____SWIG
   }
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< INode const *,std::allocator< INode const * > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -32550,13 +31422,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice__(PyObj
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -32572,7 +31440,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice__(PyObj
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -32595,7 +31463,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice__(PyObj
           int res = swig::asptr(argv[3], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_1(self, args);
+            return _wrap_swig_dummy_type_const_inode_vector___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -32603,7 +31471,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setslice__(PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::__setslice__(std::vector< INode const * >::difference_type,std::vector< INode const * >::difference_type)\n"
     "    std::vector< INode const * >::__setslice__(std::vector< INode const * >::difference_type,std::vector< INode const * >::difference_type,std::vector< INode const *,std::allocator< INode const * > > const &)\n");
@@ -32622,36 +31490,31 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delslice__(PyObj
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___delslice__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___delslice__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_inode_vector___delslice__" "', argument " "3"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< INode const * >::difference_type >(val3);
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32659,7 +31522,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::difference_type arg2 ;
@@ -32667,30 +31530,25 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___delitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___delitem__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32698,38 +31556,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode const *,std::allocator< INode const * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___getitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< INode const *,std::allocator< INode const * > > *)std_vector_Sl_INode_SS_const_Sm__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -32737,7 +31590,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -32745,25 +31598,22 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< INode const*,std::allocator< INode const * > > *ptr = (std::vector< INode const*,std::allocator< INode const * > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "3"" of type '" "std::vector< INode const *,std::allocator< INode const * > > const &""'"); 
     }
@@ -32774,14 +31624,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_
   }
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< INode const *,std::allocator< INode const * > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -32791,37 +31638,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32829,37 +31671,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___delitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32872,13 +31709,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem__(PyObje
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -32888,7 +31721,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem__(PyObje
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -32902,13 +31735,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___delitem__(PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::__delitem__(std::vector< INode const * >::difference_type)\n"
     "    std::vector< INode const * >::__delitem__(PySliceObject *)\n");
@@ -32916,7 +31749,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::difference_type arg2 ;
@@ -32924,28 +31757,24 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode const * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___getitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___getitem__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
   try {
     result = (std::vector< INode const * >::value_type)std_vector_Sl_INode_SS_const_Sm__Sg____getitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_INode, 0 |  0 );
   return resultobj;
 fail:
@@ -32958,13 +31787,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem__(PyObje
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -32974,7 +31799,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem__(PyObje
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -32988,13 +31813,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___getitem__(PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::__getitem__(PySliceObject *)\n"
     "    std::vector< INode const * >::__getitem__(std::vector< INode const * >::difference_type)\n");
@@ -33002,7 +31827,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::difference_type arg2 ;
@@ -33013,33 +31838,28 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "2"" of type '" "std::vector< INode const * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_inode_vector___setitem__" "', argument " "3"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
   arg3 = reinterpret_cast< std::vector< INode const * >::value_type >(argp3);
   try {
     std_vector_Sl_INode_SS_const_Sm__Sg____setitem____SWIG_2(arg1,arg2,(INode const *)arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33052,13 +31872,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem__(PyObje
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -33068,7 +31884,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem__(PyObje
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -33084,7 +31900,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem__(PyObje
         int res = swig::asptr(argv[2], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -33103,14 +31919,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector___setitem__(PyObje
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_2(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::__setitem__(PySliceObject *,std::vector< INode const *,std::allocator< INode const * > > const &)\n"
     "    std::vector< INode const * >::__setitem__(PySliceObject *)\n"
@@ -33124,22 +31940,21 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_pop(PyObject *SWIG
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_pop" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
   try {
     result = (std::vector< INode const * >::value_type)std_vector_Sl_INode_SS_const_Sm__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_INode, 0 |  0 );
   return resultobj;
 fail:
@@ -33155,16 +31970,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_append(PyObject *S
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_append" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_const_inode_vector_append" "', argument " "2"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33177,11 +31991,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_swig_dummy_type_const_inode_vector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< INode const * > *)new std::vector< INode const * >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -33190,17 +32004,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< INode const * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_const_inode_vector",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< INode const*,std::allocator< INode const * > > *ptr = (std::vector< INode const*,std::allocator< INode const * > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_swig_dummy_type_const_inode_vector" "', argument " "1"" of type '" "std::vector< INode const * > const &""'"); 
     }
@@ -33224,11 +32037,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_empty(PyObject *SW
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_empty" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -33246,11 +32060,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_size(PyObject *SWI
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_size" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -33271,16 +32086,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_swap(PyObject *SWI
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_swap" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_const_inode_vector_swap" "', argument " "2"" of type '" "std::vector< INode const * > &""'"); 
   }
@@ -33301,11 +32115,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_begin(PyObject *SW
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_begin" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33324,11 +32139,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_end(PyObject *SWIG
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_end" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33347,11 +32163,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_rbegin(PyObject *S
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_rbegin" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33370,11 +32187,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_rend(PyObject *SWI
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_rend" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33393,10 +32211,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_clear(PyObject *SW
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_clear" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33414,11 +32233,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_get_allocator(PyOb
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_get_allocator" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -33431,16 +32251,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< INode const * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_const_inode_vector",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_const_inode_vector" "', argument " "1"" of type '" "std::vector< INode const * >::size_type""'");
   } 
@@ -33458,10 +32277,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_pop_back(PyObject
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_pop_back" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -33474,7 +32294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::size_type arg2 ;
@@ -33482,16 +32302,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_0(PyO
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_resize" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector_resize" "', argument " "2"" of type '" "std::vector< INode const * >::size_type""'");
   } 
@@ -33504,7 +32322,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::iterator arg2 ;
@@ -33512,17 +32330,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_0(PyOb
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode const * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
   } else {
@@ -33542,7 +32358,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::iterator arg2 ;
@@ -33553,18 +32369,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(PyOb
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< INode const * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
   } else {
@@ -33575,7 +32388,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(PyOb
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_erase" "', argument " "3"" of type '" "std::vector< INode const * >::iterator""'");
   } else {
@@ -33600,13 +32413,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase(PyObject *se
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -33616,7 +32425,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase(PyObject *se
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< INode const * >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector_erase__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -33633,14 +32442,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_erase(PyObject *se
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< INode const * >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::erase(std::vector< INode const * >::iterator)\n"
     "    std::vector< INode const * >::erase(std::vector< INode const * >::iterator,std::vector< INode const * >::iterator)\n");
@@ -33648,7 +32457,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * >::size_type arg1 ;
   std::vector< INode const * >::value_type arg2 = (std::vector< INode const * >::value_type) 0 ;
@@ -33656,17 +32465,15 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector__SWIG_3(PyObje
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< INode const * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_swig_dummy_type_const_inode_vector",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_const_inode_vector" "', argument " "1"" of type '" "std::vector< INode const * >::size_type""'");
   } 
   arg1 = static_cast< std::vector< INode const * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_swig_dummy_type_const_inode_vector" "', argument " "2"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33684,15 +32491,11 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector(PyObject *self
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_swig_dummy_type_const_inode_vector", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_0(self, args);
+    return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -33701,7 +32504,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector(PyObject *self
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_2(self, args);
+      return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -33709,7 +32512,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector(PyObject *self
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_1(self, args);
+      return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -33723,13 +32526,13 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_inode_vector(PyObject *self
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_INode, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_3(self, args);
+        return _wrap_new_swig_dummy_type_const_inode_vector__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_const_inode_vector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_const_inode_vector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::vector()\n"
     "    std::vector< INode const * >::vector(std::vector< INode const * > const &)\n"
@@ -33747,16 +32550,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_push_back(PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_push_back" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_const_inode_vector_push_back" "', argument " "2"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33774,11 +32576,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_front(PyObject *SW
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_front" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -33796,11 +32599,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_back(PyObject *SWI
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_back" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -33824,22 +32628,20 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_assign(PyObject *S
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_assign" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector_assign" "', argument " "2"" of type '" "std::vector< INode const * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_inode_vector_assign" "', argument " "3"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33852,7 +32654,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::size_type arg2 ;
@@ -33863,22 +32665,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize__SWIG_1(PyO
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_resize" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector_resize" "', argument " "2"" of type '" "std::vector< INode const * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< INode const * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_inode_vector_resize" "', argument " "3"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33896,13 +32695,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize(PyObject *s
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -33913,7 +32708,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize(PyObject *s
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_const_inode_vector_resize__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_const_inode_vector_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -33931,14 +32726,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_resize(PyObject *s
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector_resize__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::resize(std::vector< INode const * >::size_type)\n"
     "    std::vector< INode const * >::resize(std::vector< INode const * >::size_type,std::vector< INode const * >::value_type)\n");
@@ -33946,7 +32741,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::iterator arg2 ;
@@ -33957,18 +32752,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(PyO
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< INode const * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_inode_vector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
   } else {
@@ -33979,7 +32771,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(PyO
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_INode, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "3"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -33993,7 +32785,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   std::vector< INode const * >::iterator arg2 ;
@@ -34007,18 +32799,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(PyO
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_const_inode_vector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
   } else {
@@ -34029,12 +32817,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(PyO
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "2"" of type '" "std::vector< INode const * >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "3"" of type '" "std::vector< INode const * >::size_type""'");
   } 
   arg3 = static_cast< std::vector< INode const * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_INode, 0 |  0 );
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_const_inode_vector_insert" "', argument " "4"" of type '" "std::vector< INode const * >::value_type""'"); 
   }
@@ -34052,13 +32840,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert(PyObject *s
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< INode const*,std::allocator< INode const * > >**)(0));
@@ -34072,7 +32856,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert(PyObject *s
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_INode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(self, args);
+          return _wrap_swig_dummy_type_const_inode_vector_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -34095,7 +32879,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert(PyObject *s
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_INode, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(self, args);
+            return _wrap_swig_dummy_type_const_inode_vector_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -34103,7 +32887,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_insert(PyObject *s
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_inode_vector_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< INode const * >::insert(std::vector< INode const * >::iterator,std::vector< INode const * >::value_type)\n"
     "    std::vector< INode const * >::insert(std::vector< INode const * >::iterator,std::vector< INode const * >::size_type,std::vector< INode const * >::value_type)\n");
@@ -34119,16 +32903,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_reserve(PyObject *
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_const_inode_vector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_const_inode_vector_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_reserve" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< INode const * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_const_inode_vector_reserve" "', argument " "2"" of type '" "std::vector< INode const * >::size_type""'");
   } 
@@ -34146,11 +32929,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_inode_vector_capacity(PyObject
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_inode_vector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_inode_vector_capacity" "', argument " "1"" of type '" "std::vector< INode const * > const *""'"); 
   }
@@ -34168,10 +32952,11 @@ SWIGINTERN PyObject *_wrap_delete_swig_dummy_type_const_inode_vector(PyObject *S
   std::vector< INode const * > *arg1 = (std::vector< INode const * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_swig_dummy_type_const_inode_vector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_swig_dummy_type_const_inode_vector" "', argument " "1"" of type '" "std::vector< INode const * > *""'"); 
   }
@@ -34186,23 +32971,28 @@ fail:
 
 SWIGINTERN PyObject *swig_dummy_type_const_inode_vector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *swig_dummy_type_const_inode_vector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_iterator" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -34220,11 +33010,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___nonzero__(PyObject
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___nonzero__" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -34242,11 +33033,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___bool__(PyObject *SW
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___bool__" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -34264,11 +33056,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___len__(PyObject *SWI
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___len__" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -34292,37 +33085,32 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getslice__(PyObject
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< AxisInfo,std::allocator< AxisInfo > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___getslice__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___getslice__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_axisinfo_vector___getslice__" "', argument " "3"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< AxisInfo >::difference_type >(val3);
   try {
     result = (std::vector< AxisInfo,std::allocator< AxisInfo > > *)std_vector_Sl_AxisInfo_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -34330,7 +33118,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::difference_type arg2 ;
@@ -34341,36 +33129,30 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_0(
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "3"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< AxisInfo >::difference_type >(val3);
   try {
     std_vector_Sl_AxisInfo_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34378,7 +33160,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::difference_type arg2 ;
@@ -34391,30 +33173,26 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_axisinfo_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "3"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< AxisInfo >::difference_type >(val3);
   {
     std::vector< AxisInfo,std::allocator< AxisInfo > > *ptr = (std::vector< AxisInfo,std::allocator< AxisInfo > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_axisinfo_vector___setslice__" "', argument " "4"" of type '" "std::vector< AxisInfo,std::allocator< AxisInfo > > const &""'"); 
     }
@@ -34425,14 +33203,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(
   }
   try {
     std_vector_Sl_AxisInfo_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< AxisInfo,std::allocator< AxisInfo > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -34447,13 +33222,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice__(PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -34469,7 +33240,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice__(PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -34492,7 +33263,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice__(PyObject
           int res = swig::asptr(argv[3], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(self, args);
+            return _wrap_swig_dummy_type_axisinfo_vector___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -34500,7 +33271,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setslice__(PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::__setslice__(std::vector< AxisInfo >::difference_type,std::vector< AxisInfo >::difference_type)\n"
     "    std::vector< AxisInfo >::__setslice__(std::vector< AxisInfo >::difference_type,std::vector< AxisInfo >::difference_type,std::vector< AxisInfo,std::allocator< AxisInfo > > const &)\n");
@@ -34519,36 +33290,31 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delslice__(PyObject
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___delslice__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___delslice__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_axisinfo_vector___delslice__" "', argument " "3"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< AxisInfo >::difference_type >(val3);
   try {
     std_vector_Sl_AxisInfo_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34556,7 +33322,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::difference_type arg2 ;
@@ -34564,30 +33330,25 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_0(P
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___delitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___delitem__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
   try {
     std_vector_Sl_AxisInfo_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34595,38 +33356,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< AxisInfo,std::allocator< AxisInfo > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___getitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< AxisInfo,std::allocator< AxisInfo > > *)std_vector_Sl_AxisInfo_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -34634,7 +33390,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -34642,25 +33398,22 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(P
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< AxisInfo,std::allocator< AxisInfo > > *ptr = (std::vector< AxisInfo,std::allocator< AxisInfo > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "3"" of type '" "std::vector< AxisInfo,std::allocator< AxisInfo > > const &""'"); 
     }
@@ -34671,14 +33424,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(P
   }
   try {
     std_vector_Sl_AxisInfo_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< AxisInfo,std::allocator< AxisInfo > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -34688,37 +33438,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_AxisInfo_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34726,37 +33471,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___delitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_AxisInfo_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34769,13 +33509,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem__(PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -34785,7 +33521,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem__(PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -34799,13 +33535,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___delitem__(PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::__delitem__(std::vector< AxisInfo >::difference_type)\n"
     "    std::vector< AxisInfo >::__delitem__(PySliceObject *)\n");
@@ -34813,7 +33549,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::difference_type arg2 ;
@@ -34821,29 +33557,26 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_1(P
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< AxisInfo >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___getitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___getitem__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
   try {
     result = (std::vector< AxisInfo >::value_type *) &std_vector_Sl_AxisInfo_Sg____getitem____SWIG_1((std::vector< AxisInfo > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AxisInfo, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< AxisInfo >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -34855,13 +33588,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem__(PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -34871,7 +33600,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem__(PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_0(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -34885,13 +33614,13 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___getitem__(PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::__getitem__(PySliceObject *)\n"
     "    std::vector< AxisInfo >::__getitem__(std::vector< AxisInfo >::difference_type) const\n");
@@ -34899,7 +33628,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::difference_type arg2 ;
@@ -34910,22 +33639,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(P
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "2"" of type '" "std::vector< AxisInfo >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_axisinfo_vector___setitem__" "', argument " "3"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -34935,11 +33661,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(P
   arg3 = reinterpret_cast< std::vector< AxisInfo >::value_type * >(argp3);
   try {
     std_vector_Sl_AxisInfo_Sg____setitem____SWIG_2(arg1,arg2,(AxisInfo const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34952,13 +33676,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem__(PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -34968,7 +33688,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem__(PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_1(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -34984,7 +33704,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem__(PyObject
         int res = swig::asptr(argv[2], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -34999,17 +33719,17 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector___setitem__(PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::__setitem__(PySliceObject *,std::vector< AxisInfo,std::allocator< AxisInfo > > const &)\n"
     "    std::vector< AxisInfo >::__setitem__(PySliceObject *)\n"
@@ -35023,22 +33743,21 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_pop(PyObject *SWIGUNU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_pop" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   try {
     result = std_vector_Sl_AxisInfo_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj((new std::vector< AxisInfo >::value_type(static_cast< const std::vector< AxisInfo >::value_type& >(result))), SWIGTYPE_p_AxisInfo, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -35054,16 +33773,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_append(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_append" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_axisinfo_vector_append" "', argument " "2"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35079,11 +33797,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_swig_dummy_type_axisinfo_vector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< AxisInfo > *)new std::vector< AxisInfo >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -35092,17 +33810,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< AxisInfo > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_axisinfo_vector",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< AxisInfo,std::allocator< AxisInfo > > *ptr = (std::vector< AxisInfo,std::allocator< AxisInfo > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_swig_dummy_type_axisinfo_vector" "', argument " "1"" of type '" "std::vector< AxisInfo > const &""'"); 
     }
@@ -35126,11 +33843,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_empty(PyObject *SWIGU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_empty" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -35148,11 +33866,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_size(PyObject *SWIGUN
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_size" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -35173,16 +33892,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_swap(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_swap" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_axisinfo_vector_swap" "', argument " "2"" of type '" "std::vector< AxisInfo > &""'"); 
   }
@@ -35203,11 +33921,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_begin(PyObject *SWIGU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_begin" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35226,11 +33945,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_end(PyObject *SWIGUNU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_end" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35249,11 +33969,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_rbegin(PyObject *SWIG
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_rbegin" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35272,11 +33993,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_rend(PyObject *SWIGUN
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_rend" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35295,10 +34017,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_clear(PyObject *SWIGU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_clear" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35316,11 +34039,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_get_allocator(PyObjec
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< AxisInfo > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_get_allocator" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -35333,16 +34057,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< AxisInfo > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_axisinfo_vector",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_axisinfo_vector" "', argument " "1"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
@@ -35360,10 +34083,11 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_pop_back(PyObject *SW
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_pop_back" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -35376,7 +34100,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::size_type arg2 ;
@@ -35384,16 +34108,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_0(PyObje
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_resize" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector_resize" "', argument " "2"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
@@ -35406,7 +34128,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::iterator arg2 ;
@@ -35414,17 +34136,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_0(PyObjec
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< AxisInfo >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
   } else {
@@ -35444,7 +34164,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::iterator arg2 ;
@@ -35455,18 +34175,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(PyObjec
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< AxisInfo >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
   } else {
@@ -35477,7 +34194,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(PyObjec
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_erase" "', argument " "3"" of type '" "std::vector< AxisInfo >::iterator""'");
   } else {
@@ -35502,13 +34219,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase(PyObject *self,
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -35518,7 +34231,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase(PyObject *self,
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< AxisInfo >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -35535,14 +34248,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_erase(PyObject *self,
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< AxisInfo >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::erase(std::vector< AxisInfo >::iterator)\n"
     "    std::vector< AxisInfo >::erase(std::vector< AxisInfo >::iterator,std::vector< AxisInfo >::iterator)\n");
@@ -35550,7 +34263,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo >::size_type arg1 ;
   std::vector< AxisInfo >::value_type *arg2 = 0 ;
@@ -35558,17 +34271,15 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector__SWIG_3(PyObject
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< AxisInfo > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_swig_dummy_type_axisinfo_vector",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_swig_dummy_type_axisinfo_vector" "', argument " "1"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
   arg1 = static_cast< std::vector< AxisInfo >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_swig_dummy_type_axisinfo_vector" "', argument " "2"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35589,15 +34300,11 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector(PyObject *self, P
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_swig_dummy_type_axisinfo_vector", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_0(self, args);
+    return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -35606,7 +34313,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector(PyObject *self, P
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_2(self, args);
+      return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -35614,7 +34321,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector(PyObject *self, P
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_1(self, args);
+      return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -35624,16 +34331,16 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_axisinfo_vector(PyObject *self, P
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_AxisInfo, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_AxisInfo, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_3(self, args);
+        return _wrap_new_swig_dummy_type_axisinfo_vector__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_axisinfo_vector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_swig_dummy_type_axisinfo_vector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::vector()\n"
     "    std::vector< AxisInfo >::vector(std::vector< AxisInfo > const &)\n"
@@ -35651,16 +34358,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_push_back(PyObject *S
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_push_back" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "swig_dummy_type_axisinfo_vector_push_back" "', argument " "2"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35681,17 +34387,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_front(PyObject *SWIGU
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_front" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   result = (std::vector< AxisInfo >::value_type *) &((std::vector< AxisInfo > const *)arg1)->front();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AxisInfo, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< AxisInfo >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -35703,17 +34411,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_back(PyObject *SWIGUN
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_back" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
   result = (std::vector< AxisInfo >::value_type *) &((std::vector< AxisInfo > const *)arg1)->back();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AxisInfo, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< AxisInfo >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -35731,22 +34441,20 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_assign(PyObject *SWIG
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_assign" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector_assign" "', argument " "2"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_axisinfo_vector_assign" "', argument " "3"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35762,7 +34470,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::size_type arg2 ;
@@ -35773,22 +34481,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_1(PyObje
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_resize" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector_resize" "', argument " "2"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
   arg2 = static_cast< std::vector< AxisInfo >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_axisinfo_vector_resize" "', argument " "3"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35809,13 +34514,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize(PyObject *self
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -35826,7 +34527,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize(PyObject *self
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_0(self, args);
+        return _wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -35840,17 +34541,17 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_resize(PyObject *self
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_1(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::resize(std::vector< AxisInfo >::size_type)\n"
     "    std::vector< AxisInfo >::resize(std::vector< AxisInfo >::size_type,std::vector< AxisInfo >::value_type const &)\n");
@@ -35858,7 +34559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::iterator arg2 ;
@@ -35869,18 +34570,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(PyObje
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< AxisInfo >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_axisinfo_vector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
   } else {
@@ -35891,7 +34589,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(PyObje
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "3"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35908,7 +34606,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   std::vector< AxisInfo >::iterator arg2 ;
@@ -35922,18 +34620,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(PyObje
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_axisinfo_vector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
   } else {
@@ -35944,12 +34638,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(PyObje
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "2"" of type '" "std::vector< AxisInfo >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "3"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
   arg3 = static_cast< std::vector< AxisInfo >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_AxisInfo,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_AxisInfo,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_axisinfo_vector_insert" "', argument " "4"" of type '" "std::vector< AxisInfo >::value_type const &""'"); 
   }
@@ -35970,13 +34664,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert(PyObject *self
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< AxisInfo,std::allocator< AxisInfo > >**)(0));
@@ -35986,10 +34676,10 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert(PyObject *self
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< AxisInfo >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AxisInfo, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(self, args);
+          return _wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -36008,10 +34698,10 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert(PyObject *self
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_AxisInfo, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_AxisInfo, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(self, args);
+            return _wrap_swig_dummy_type_axisinfo_vector_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -36019,7 +34709,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_insert(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'swig_dummy_type_axisinfo_vector_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< AxisInfo >::insert(std::vector< AxisInfo >::iterator,std::vector< AxisInfo >::value_type const &)\n"
     "    std::vector< AxisInfo >::insert(std::vector< AxisInfo >::iterator,std::vector< AxisInfo >::size_type,std::vector< AxisInfo >::value_type const &)\n");
@@ -36035,16 +34725,15 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_reserve(PyObject *SWI
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:swig_dummy_type_axisinfo_vector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "swig_dummy_type_axisinfo_vector_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_reserve" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< AxisInfo > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "swig_dummy_type_axisinfo_vector_reserve" "', argument " "2"" of type '" "std::vector< AxisInfo >::size_type""'");
   } 
@@ -36062,11 +34751,12 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_axisinfo_vector_capacity(PyObject *SW
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< AxisInfo >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_axisinfo_vector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_axisinfo_vector_capacity" "', argument " "1"" of type '" "std::vector< AxisInfo > const *""'"); 
   }
@@ -36084,10 +34774,11 @@ SWIGINTERN PyObject *_wrap_delete_swig_dummy_type_axisinfo_vector(PyObject *SWIG
   std::vector< AxisInfo > *arg1 = (std::vector< AxisInfo > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_swig_dummy_type_axisinfo_vector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_swig_dummy_type_axisinfo_vector" "', argument " "1"" of type '" "std::vector< AxisInfo > *""'"); 
   }
@@ -36102,16 +34793,20 @@ fail:
 
 SWIGINTERN PyObject *swig_dummy_type_axisinfo_vector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_kvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *swig_dummy_type_axisinfo_vector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_kvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   BasicVector3D< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_kvector_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (BasicVector3D< double > *)new BasicVector3D< double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -36120,7 +34815,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -36131,23 +34826,20 @@ SWIGINTERN PyObject *_wrap_new_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   BasicVector3D< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_kvector_t",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_kvector_t" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_kvector_t" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_kvector_t" "', argument " "3"" of type '" "double""'");
   } 
@@ -36165,15 +34857,11 @@ SWIGINTERN PyObject *_wrap_new_kvector_t(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_kvector_t", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_kvector_t__SWIG_0(self, args);
+    return _wrap_new_kvector_t__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
     int _v;
@@ -36192,14 +34880,14 @@ SWIGINTERN PyObject *_wrap_new_kvector_t(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_kvector_t__SWIG_1(self, args);
+          return _wrap_new_kvector_t__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_kvector_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_kvector_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    BasicVector3D< double >::BasicVector3D()\n"
     "    BasicVector3D< double >::BasicVector3D(double const,double const,double const)\n");
@@ -36212,11 +34900,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_x(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_x" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36234,11 +34923,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_y(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_y" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36256,11 +34946,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_z(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_z" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36282,16 +34973,15 @@ SWIGINTERN PyObject *_wrap_kvector_t_setX(PyObject *SWIGUNUSEDPARM(self), PyObje
   double temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t_setX", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_setX" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "kvector_t_setX" "', argument " "2"" of type '" "double""'");
   } 
@@ -36314,16 +35004,15 @@ SWIGINTERN PyObject *_wrap_kvector_t_setY(PyObject *SWIGUNUSEDPARM(self), PyObje
   double temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t_setY", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_setY" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "kvector_t_setY" "', argument " "2"" of type '" "double""'");
   } 
@@ -36346,16 +35035,15 @@ SWIGINTERN PyObject *_wrap_kvector_t_setZ(PyObject *SWIGUNUSEDPARM(self), PyObje
   double temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t_setZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_setZ" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "kvector_t_setZ" "', argument " "2"" of type '" "double""'");
   } 
@@ -36377,17 +35065,16 @@ SWIGINTERN PyObject *_wrap_kvector_t___iadd__(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___iadd__" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "kvector_t___iadd__" "', argument " "2"" of type '" "BasicVector3D< double > const &""'"); 
   }
@@ -36411,17 +35098,16 @@ SWIGINTERN PyObject *_wrap_kvector_t___isub__(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t___isub__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___isub__" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "kvector_t___isub__" "', argument " "2"" of type '" "BasicVector3D< double > const &""'"); 
   }
@@ -36442,11 +35128,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_conj(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_conj",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_conj" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36464,11 +35151,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_mag2(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_mag2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_mag2" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36486,11 +35174,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_mag(PyObject *SWIGUNUSEDPARM(self), PyObjec
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_mag",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_mag" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36508,11 +35197,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_magxy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_magxy2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_magxy2" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36530,11 +35220,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_magxy(PyObject *SWIGUNUSEDPARM(self), PyObj
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_magxy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_magxy" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36552,11 +35243,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_phi(PyObject *SWIGUNUSEDPARM(self), PyObjec
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_phi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_phi" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36574,11 +35266,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_theta(PyObject *SWIGUNUSEDPARM(self), PyObj
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_theta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_theta" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36596,11 +35289,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_cosTheta(PyObject *SWIGUNUSEDPARM(self), Py
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_cosTheta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_cosTheta" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36618,11 +35312,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_sin2Theta(PyObject *SWIGUNUSEDPARM(self), P
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_sin2Theta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_sin2Theta" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36640,11 +35335,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_unit(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_unit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_unit" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36662,11 +35358,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_complex(PyObject *SWIGUNUSEDPARM(self), PyO
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< std::complex< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_complex",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_complex" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36684,11 +35381,12 @@ SWIGINTERN PyObject *_wrap_kvector_t_real(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t_real",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_real" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36709,17 +35407,16 @@ SWIGINTERN PyObject *_wrap_kvector_t_angle(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t_angle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t_angle", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_angle" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "kvector_t_angle" "', argument " "2"" of type '" "BasicVector3D< double > const &""'"); 
   }
@@ -36743,17 +35440,16 @@ SWIGINTERN PyObject *_wrap_kvector_t_project(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t_project",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t_project", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t_project" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "kvector_t_project" "', argument " "2"" of type '" "BasicVector3D< double > const &""'"); 
   }
@@ -36777,17 +35473,16 @@ SWIGINTERN PyObject *_wrap_kvector_t___add__(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t___add__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___add__" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "kvector_t___add__" "', argument " "2"" of type '" "BasicVector3D< double > const &""'"); 
   }
@@ -36799,7 +35494,9 @@ SWIGINTERN PyObject *_wrap_kvector_t___add__(PyObject *SWIGUNUSEDPARM(self), PyO
   resultobj = SWIG_NewPointerObj((new BasicVector3D< double >(static_cast< const BasicVector3D< double >& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -36811,17 +35508,16 @@ SWIGINTERN PyObject *_wrap_kvector_t___mul__(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t___mul__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___mul__" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "kvector_t___mul__" "', argument " "2"" of type '" "double""'");
   } 
@@ -36830,7 +35526,9 @@ SWIGINTERN PyObject *_wrap_kvector_t___mul__(PyObject *SWIGUNUSEDPARM(self), PyO
   resultobj = SWIG_NewPointerObj((new BasicVector3D< double >(static_cast< const BasicVector3D< double >& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -36842,17 +35540,16 @@ SWIGINTERN PyObject *_wrap_kvector_t___rmul__(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:kvector_t___rmul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "kvector_t___rmul__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___rmul__" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "kvector_t___rmul__" "', argument " "2"" of type '" "double""'");
   } 
@@ -36861,7 +35558,9 @@ SWIGINTERN PyObject *_wrap_kvector_t___rmul__(PyObject *SWIGUNUSEDPARM(self), Py
   resultobj = SWIG_NewPointerObj((new BasicVector3D< double >(static_cast< const BasicVector3D< double >& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -36870,11 +35569,12 @@ SWIGINTERN PyObject *_wrap_kvector_t___neg__(PyObject *SWIGUNUSEDPARM(self), PyO
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:kvector_t___neg__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "kvector_t___neg__" "', argument " "1"" of type '" "BasicVector3D< double > const *""'"); 
   }
@@ -36883,7 +35583,9 @@ SWIGINTERN PyObject *_wrap_kvector_t___neg__(PyObject *SWIGUNUSEDPARM(self), PyO
   resultobj = SWIG_NewPointerObj((new BasicVector3D< double >(static_cast< const BasicVector3D< double >& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -36892,10 +35594,11 @@ SWIGINTERN PyObject *_wrap_delete_kvector_t(PyObject *SWIGUNUSEDPARM(self), PyOb
   BasicVector3D< double > *arg1 = (BasicVector3D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_kvector_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_kvector_t" "', argument " "1"" of type '" "BasicVector3D< double > *""'"); 
   }
@@ -36910,23 +35613,28 @@ fail:
 
 SWIGINTERN PyObject *kvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BasicVector3DT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *kvector_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_kvector_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_iterator" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -36944,11 +35652,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___nonzero__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -36966,11 +35675,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___bool__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -36988,11 +35698,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___len__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -37016,37 +35727,32 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___getslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___getslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___getslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val3);
   try {
     result = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -37054,7 +35760,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::difference_type arg2 ;
@@ -37065,36 +35771,30 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___setslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___setslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val3);
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37102,7 +35802,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::difference_type arg2 ;
@@ -37115,30 +35815,26 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___setslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___setslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val3);
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_kvector_t___setslice__" "', argument " "4"" of type '" "std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &""'"); 
     }
@@ -37149,14 +35845,11 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -37171,13 +35864,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -37193,7 +35882,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_kvector_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_kvector_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -37216,7 +35905,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_kvector_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_kvector_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -37224,7 +35913,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::__setslice__(std::vector< BasicVector3D< double > >::difference_type,std::vector< BasicVector3D< double > >::difference_type)\n"
     "    std::vector< BasicVector3D< double > >::__setslice__(std::vector< BasicVector3D< double > >::difference_type,std::vector< BasicVector3D< double > >::difference_type,std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &)\n");
@@ -37243,36 +35932,31 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___delslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___delslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___delslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val3);
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37280,7 +35964,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::difference_type arg2 ;
@@ -37288,30 +35972,25 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___delitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___delitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37319,38 +35998,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___getitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -37358,7 +36032,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -37366,25 +36040,22 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_kvector_t___setitem__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &""'"); 
     }
@@ -37395,14 +36066,11 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -37412,37 +36080,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37450,37 +36113,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___delitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37493,13 +36151,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -37509,7 +36163,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_kvector_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_kvector_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -37523,13 +36177,13 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_kvector_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_kvector_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::__delitem__(std::vector< BasicVector3D< double > >::difference_type)\n"
     "    std::vector< BasicVector3D< double > >::__delitem__(PySliceObject *)\n");
@@ -37537,7 +36191,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::difference_type arg2 ;
@@ -37545,29 +36199,26 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___getitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___getitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
   try {
     result = (std::vector< BasicVector3D< double > >::value_type *) &std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____getitem____SWIG_1((std::vector< BasicVector3D< double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -37579,13 +36230,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -37595,7 +36242,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_kvector_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_kvector_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -37609,13 +36256,13 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_kvector_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_kvector_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< BasicVector3D< double > >::__getitem__(std::vector< BasicVector3D< double > >::difference_type) const\n");
@@ -37623,7 +36270,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::difference_type arg2 ;
@@ -37634,22 +36281,19 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_2(PyObject *SWIGUN
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t___setitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  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 '" "vector_kvector_t___setitem__" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -37659,11 +36303,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = reinterpret_cast< std::vector< BasicVector3D< double > >::value_type * >(argp3);
   try {
     std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(BasicVector3D< double > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37676,13 +36318,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -37692,7 +36330,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_kvector_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_kvector_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -37708,7 +36346,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_kvector_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_kvector_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -37723,17 +36361,17 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_kvector_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_kvector_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::__setitem__(PySliceObject *,std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > const &)\n"
     "    std::vector< BasicVector3D< double > >::__setitem__(PySliceObject *)\n"
@@ -37747,22 +36385,21 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_pop" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   try {
     result = std_vector_Sl_BasicVector3D_Sl_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj((new std::vector< BasicVector3D< double > >::value_type(static_cast< const std::vector< BasicVector3D< double > >::value_type& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -37778,16 +36415,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_append(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_append" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_kvector_t_append" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -37803,11 +36439,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_kvector_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< BasicVector3D< double > > *)new std::vector< BasicVector3D< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -37816,17 +36452,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< BasicVector3D< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_kvector_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_kvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const &""'"); 
     }
@@ -37850,11 +36485,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_empty" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -37872,11 +36508,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_size" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -37897,16 +36534,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_swap" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_kvector_t_swap" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > > &""'"); 
   }
@@ -37927,11 +36563,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_begin" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -37950,11 +36587,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_end" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -37973,11 +36611,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_rbegin" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -37996,11 +36635,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_rend" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -38019,10 +36659,11 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_clear" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -38040,11 +36681,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< BasicVector3D< double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -38057,16 +36699,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< BasicVector3D< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_kvector_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_kvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
@@ -38084,10 +36725,11 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_pop_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -38100,7 +36742,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::size_type arg2 ;
@@ -38108,16 +36750,14 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_resize" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t_resize" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
@@ -38130,7 +36770,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::iterator arg2 ;
@@ -38138,17 +36778,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_erase" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
   } else {
@@ -38168,7 +36806,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::iterator arg2 ;
@@ -38179,18 +36817,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< BasicVector3D< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_erase" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
   } else {
@@ -38201,7 +36836,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_erase" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
   } else {
@@ -38226,13 +36861,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -38242,7 +36873,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_kvector_t_erase__SWIG_0(self, args);
+        return _wrap_vector_kvector_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -38259,14 +36890,14 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_kvector_t_erase__SWIG_1(self, args);
+          return _wrap_vector_kvector_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::erase(std::vector< BasicVector3D< double > >::iterator)\n"
     "    std::vector< BasicVector3D< double > >::erase(std::vector< BasicVector3D< double > >::iterator,std::vector< BasicVector3D< double > >::iterator)\n");
@@ -38274,7 +36905,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > >::size_type arg1 ;
   std::vector< BasicVector3D< double > >::value_type *arg2 = 0 ;
@@ -38282,17 +36913,15 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_kvector_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_kvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< BasicVector3D< double > >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_kvector_t" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38313,15 +36942,11 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_kvector_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_kvector_t__SWIG_0(self, args);
+    return _wrap_new_vector_kvector_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -38330,7 +36955,7 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_kvector_t__SWIG_2(self, args);
+      return _wrap_new_vector_kvector_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -38338,7 +36963,7 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_kvector_t__SWIG_1(self, args);
+      return _wrap_new_vector_kvector_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -38348,16 +36973,16 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_kvector_t__SWIG_3(self, args);
+        return _wrap_new_vector_kvector_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_kvector_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_kvector_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::vector()\n"
     "    std::vector< BasicVector3D< double > >::vector(std::vector< BasicVector3D< double > > const &)\n"
@@ -38375,16 +37000,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_push_back(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_push_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_kvector_t_push_back" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38405,17 +37029,19 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_front" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   result = (std::vector< BasicVector3D< double > >::value_type *) &((std::vector< BasicVector3D< double > > const *)arg1)->front();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -38427,17 +37053,19 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
   result = (std::vector< BasicVector3D< double > >::value_type *) &((std::vector< BasicVector3D< double > > const *)arg1)->back();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -38455,22 +37083,20 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_assign(PyObject *SWIGUNUSEDPARM(self
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_assign" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t_assign" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  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 '" "vector_kvector_t_assign" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38486,7 +37112,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::size_type arg2 ;
@@ -38497,22 +37123,19 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_resize" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t_resize" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< double > >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  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 '" "vector_kvector_t_resize" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38533,13 +37156,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -38550,7 +37169,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_kvector_t_resize__SWIG_0(self, args);
+        return _wrap_vector_kvector_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -38564,17 +37183,17 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_kvector_t_resize__SWIG_1(self, args);
+          return _wrap_vector_kvector_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::resize(std::vector< BasicVector3D< double > >::size_type)\n"
     "    std::vector< BasicVector3D< double > >::resize(std::vector< BasicVector3D< double > >::size_type,std::vector< BasicVector3D< double > >::value_type const &)\n");
@@ -38582,7 +37201,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::iterator arg2 ;
@@ -38593,18 +37212,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< BasicVector3D< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_insert" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
   } else {
@@ -38615,7 +37231,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  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 '" "vector_kvector_t_insert" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38632,7 +37248,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   std::vector< BasicVector3D< double > >::iterator arg2 ;
@@ -38646,18 +37262,14 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_kvector_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_insert" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
   } else {
@@ -38668,12 +37280,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_kvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t_insert" "', argument " "3"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< double > >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_kvector_t_insert" "', argument " "4"" of type '" "std::vector< BasicVector3D< double > >::value_type const &""'"); 
   }
@@ -38694,13 +37306,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_kvector_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
@@ -38710,10 +37318,10 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *arg
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_kvector_t_insert__SWIG_0(self, args);
+          return _wrap_vector_kvector_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -38732,10 +37340,10 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_kvector_t_insert__SWIG_1(self, args);
+            return _wrap_vector_kvector_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -38743,7 +37351,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_kvector_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< double > >::insert(std::vector< BasicVector3D< double > >::iterator,std::vector< BasicVector3D< double > >::value_type const &)\n"
     "    std::vector< BasicVector3D< double > >::insert(std::vector< BasicVector3D< double > >::iterator,std::vector< BasicVector3D< double > >::size_type,std::vector< BasicVector3D< double > >::value_type const &)\n");
@@ -38759,16 +37367,15 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_kvector_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_kvector_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_reserve" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_kvector_t_reserve" "', argument " "2"" of type '" "std::vector< BasicVector3D< double > >::size_type""'");
   } 
@@ -38786,11 +37393,12 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_capacity" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > const *""'"); 
   }
@@ -38808,10 +37416,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_kvector_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< BasicVector3D< double > > *arg1 = (std::vector< BasicVector3D< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_kvector_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_kvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< double > > *""'"); 
   }
@@ -38826,16 +37435,20 @@ fail:
 
 SWIGINTERN PyObject *vector_kvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_BasicVector3DT_double_t_std__allocatorT_BasicVector3DT_double_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_cvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *vector_kvector_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_cvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   BasicVector3D< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_cvector_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (BasicVector3D< std::complex< double > > *)new BasicVector3D< std::complex< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -38844,7 +37457,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::complex< double > arg1 ;
   std::complex< double > arg2 ;
@@ -38855,23 +37468,20 @@ SWIGINTERN PyObject *_wrap_new_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   BasicVector3D< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_cvector_t",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_cvector_t" "', argument " "1"" of type '" "std::complex< double >""'");
   } 
   arg1 = static_cast< std::complex< double > >(val1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_cvector_t" "', argument " "2"" of type '" "std::complex< double >""'");
   } 
   arg2 = static_cast< std::complex< double > >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_cvector_t" "', argument " "3"" of type '" "std::complex< double >""'");
   } 
@@ -38889,15 +37499,11 @@ SWIGINTERN PyObject *_wrap_new_cvector_t(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_cvector_t", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_cvector_t__SWIG_0(self, args);
+    return _wrap_new_cvector_t__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
     int _v;
@@ -38916,14 +37522,14 @@ SWIGINTERN PyObject *_wrap_new_cvector_t(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_cvector_t__SWIG_1(self, args);
+          return _wrap_new_cvector_t__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_cvector_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_cvector_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    BasicVector3D< std::complex< double > >::BasicVector3D()\n"
     "    BasicVector3D< std::complex< double > >::BasicVector3D(std::complex< double > const,std::complex< double > const,std::complex< double > const)\n");
@@ -38936,11 +37542,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_x(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::complex< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_x" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -38958,11 +37565,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_y(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::complex< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_y" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -38980,11 +37588,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_z(PyObject *SWIGUNUSEDPARM(self), PyObject
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::complex< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_z" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39006,16 +37615,15 @@ SWIGINTERN PyObject *_wrap_cvector_t_setX(PyObject *SWIGUNUSEDPARM(self), PyObje
   std::complex< double > temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t_setX", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_setX" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvector_t_setX" "', argument " "2"" of type '" "std::complex< double >""'");
   } 
@@ -39038,16 +37646,15 @@ SWIGINTERN PyObject *_wrap_cvector_t_setY(PyObject *SWIGUNUSEDPARM(self), PyObje
   std::complex< double > temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t_setY", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_setY" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvector_t_setY" "', argument " "2"" of type '" "std::complex< double >""'");
   } 
@@ -39070,16 +37677,15 @@ SWIGINTERN PyObject *_wrap_cvector_t_setZ(PyObject *SWIGUNUSEDPARM(self), PyObje
   std::complex< double > temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t_setZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_setZ" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvector_t_setZ" "', argument " "2"" of type '" "std::complex< double >""'");
   } 
@@ -39101,17 +37707,16 @@ SWIGINTERN PyObject *_wrap_cvector_t___iadd__(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t___iadd__" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvector_t___iadd__" "', argument " "2"" of type '" "BasicVector3D< std::complex< double > > const &""'"); 
   }
@@ -39135,17 +37740,16 @@ SWIGINTERN PyObject *_wrap_cvector_t___isub__(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t___isub__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t___isub__" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvector_t___isub__" "', argument " "2"" of type '" "BasicVector3D< std::complex< double > > const &""'"); 
   }
@@ -39166,11 +37770,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_conj(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< std::complex< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_conj",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_conj" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39188,11 +37793,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_mag2(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_mag2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_mag2" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39210,11 +37816,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_mag(PyObject *SWIGUNUSEDPARM(self), PyObjec
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_mag",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_mag" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39232,11 +37839,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_magxy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_magxy2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_magxy2" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39254,11 +37862,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_magxy(PyObject *SWIGUNUSEDPARM(self), PyObj
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_magxy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_magxy" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39276,11 +37885,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_unit(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< std::complex< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_unit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_unit" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39298,11 +37908,12 @@ SWIGINTERN PyObject *_wrap_cvector_t_real(PyObject *SWIGUNUSEDPARM(self), PyObje
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicVector3D< double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvector_t_real",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_real" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
@@ -39323,17 +37934,16 @@ SWIGINTERN PyObject *_wrap_cvector_t_project(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   BasicVector3D< std::complex< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:cvector_t_project",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "cvector_t_project", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvector_t_project" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< BasicVector3D< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvector_t_project" "', argument " "2"" of type '" "BasicVector3D< std::complex< double > > const &""'"); 
   }
@@ -39354,10 +37964,11 @@ SWIGINTERN PyObject *_wrap_delete_cvector_t(PyObject *SWIGUNUSEDPARM(self), PyOb
   BasicVector3D< std::complex< double > > *arg1 = (BasicVector3D< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_cvector_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_cvector_t" "', argument " "1"" of type '" "BasicVector3D< std::complex< double > > *""'"); 
   }
@@ -39372,23 +37983,28 @@ fail:
 
 SWIGINTERN PyObject *cvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *cvector_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_cvector_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_iterator" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -39406,11 +38022,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___nonzero__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -39428,11 +38045,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___bool__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -39450,11 +38068,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___len__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -39478,37 +38097,32 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___getslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___getslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___getslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val3);
   try {
     result = (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *)std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -39516,7 +38130,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::difference_type arg2 ;
@@ -39527,36 +38141,30 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___setslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___setslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val3);
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39564,7 +38172,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::difference_type arg2 ;
@@ -39577,30 +38185,26 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___setslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___setslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val3);
   {
     std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *ptr = (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_cvector_t___setslice__" "', argument " "4"" of type '" "std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &""'"); 
     }
@@ -39611,14 +38215,11 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -39633,13 +38234,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -39655,7 +38252,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_cvector_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_cvector_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -39678,7 +38275,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_cvector_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_cvector_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -39686,7 +38283,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__setslice__(std::vector< BasicVector3D< std::complex< double > > >::difference_type,std::vector< BasicVector3D< std::complex< double > > >::difference_type)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__setslice__(std::vector< BasicVector3D< std::complex< double > > >::difference_type,std::vector< BasicVector3D< std::complex< double > > >::difference_type,std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &)\n");
@@ -39705,36 +38302,31 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___delslice__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___delslice__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___delslice__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val3);
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39742,7 +38334,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::difference_type arg2 ;
@@ -39750,30 +38342,25 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___delitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___delitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39781,38 +38368,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___getitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *)std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -39820,7 +38402,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -39828,25 +38410,22 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *ptr = (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t___setitem__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &""'"); 
     }
@@ -39857,14 +38436,11 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -39874,37 +38450,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39912,37 +38483,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___delitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39955,13 +38521,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -39971,7 +38533,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_cvector_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_cvector_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -39985,13 +38547,13 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_cvector_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_cvector_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__delitem__(std::vector< BasicVector3D< std::complex< double > > >::difference_type)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__delitem__(PySliceObject *)\n");
@@ -39999,7 +38561,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::difference_type arg2 ;
@@ -40007,29 +38569,26 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___getitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___getitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
   try {
     result = (std::vector< BasicVector3D< std::complex< double > > >::value_type *) &std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getitem____SWIG_1((std::vector< BasicVector3D< std::complex< double > > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< std::complex< double > > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -40041,13 +38600,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -40057,7 +38612,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_cvector_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_cvector_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -40071,13 +38626,13 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_cvector_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_cvector_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__getitem__(PySliceObject *)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__getitem__(std::vector< BasicVector3D< std::complex< double > > >::difference_type) const\n");
@@ -40085,7 +38640,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::difference_type arg2 ;
@@ -40096,22 +38651,19 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_2(PyObject *SWIGUN
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setitem__" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t___setitem__" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t___setitem__" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40121,11 +38673,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > >::value_type * >(argp3);
   try {
     std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_2(arg1,arg2,(BasicVector3D< std::complex< double > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40138,13 +38688,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -40154,7 +38700,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_cvector_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_cvector_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -40170,7 +38716,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_cvector_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_cvector_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -40185,17 +38731,17 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_cvector_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_cvector_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__setitem__(PySliceObject *,std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > const &)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::__setitem__(PySliceObject *)\n"
@@ -40209,22 +38755,21 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_pop" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   try {
     result = std_vector_Sl_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj((new std::vector< BasicVector3D< std::complex< double > > >::value_type(static_cast< const std::vector< BasicVector3D< std::complex< double > > >::value_type& >(result))), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -40240,16 +38785,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_append(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_append" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_cvector_t_append" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40265,11 +38809,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_cvector_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< BasicVector3D< std::complex< double > > > *)new std::vector< BasicVector3D< std::complex< double > > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -40278,17 +38822,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_cvector_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *ptr = (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_cvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const &""'"); 
     }
@@ -40312,11 +38855,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_empty" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -40334,11 +38878,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_size" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -40359,16 +38904,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_swap" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_cvector_t_swap" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > > &""'"); 
   }
@@ -40389,11 +38933,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_begin" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40412,11 +38957,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_end" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40435,11 +38981,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_rbegin" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40458,11 +39005,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_rend" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40481,10 +39029,11 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_clear" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40502,11 +39051,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< BasicVector3D< std::complex< double > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -40519,16 +39069,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_cvector_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_cvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
@@ -40546,10 +39095,11 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_pop_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -40562,7 +39112,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::size_type arg2 ;
@@ -40570,16 +39120,14 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_resize" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t_resize" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
@@ -40592,7 +39140,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator arg2 ;
@@ -40600,17 +39148,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_erase" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
   } else {
@@ -40630,7 +39176,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator arg2 ;
@@ -40641,18 +39187,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_erase" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
   } else {
@@ -40663,7 +39206,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_erase" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_erase" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
   } else {
@@ -40688,13 +39231,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -40704,7 +39243,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< std::complex< double > > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_cvector_t_erase__SWIG_0(self, args);
+        return _wrap_vector_cvector_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -40721,14 +39260,14 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< std::complex< double > > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_cvector_t_erase__SWIG_1(self, args);
+          return _wrap_vector_cvector_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::erase(std::vector< BasicVector3D< std::complex< double > > >::iterator)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::erase(std::vector< BasicVector3D< std::complex< double > > >::iterator,std::vector< BasicVector3D< std::complex< double > > >::iterator)\n");
@@ -40736,7 +39275,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > >::size_type arg1 ;
   std::vector< BasicVector3D< std::complex< double > > >::value_type *arg2 = 0 ;
@@ -40744,17 +39283,15 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_cvector_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_cvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_cvector_t" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40775,15 +39312,11 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_cvector_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_cvector_t__SWIG_0(self, args);
+    return _wrap_new_vector_cvector_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -40792,7 +39325,7 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_cvector_t__SWIG_2(self, args);
+      return _wrap_new_vector_cvector_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -40800,7 +39333,7 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_cvector_t__SWIG_1(self, args);
+      return _wrap_new_vector_cvector_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -40810,16 +39343,16 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_cvector_t__SWIG_3(self, args);
+        return _wrap_new_vector_cvector_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_cvector_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_cvector_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::vector()\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::vector(std::vector< BasicVector3D< std::complex< double > > > const &)\n"
@@ -40837,16 +39370,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_push_back(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_push_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_cvector_t_push_back" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40867,17 +39399,19 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_front" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   result = (std::vector< BasicVector3D< std::complex< double > > >::value_type *) &((std::vector< BasicVector3D< std::complex< double > > > const *)arg1)->front();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< std::complex< double > > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -40889,17 +39423,19 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_back" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
   result = (std::vector< BasicVector3D< std::complex< double > > >::value_type *) &((std::vector< BasicVector3D< std::complex< double > > > const *)arg1)->back();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< BasicVector3D< std::complex< double > > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -40917,22 +39453,20 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_assign(PyObject *SWIGUNUSEDPARM(self
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_assign" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t_assign" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t_assign" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40948,7 +39482,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::size_type arg2 ;
@@ -40959,22 +39493,19 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_resize" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t_resize" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t_resize" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -40995,13 +39526,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -41012,7 +39539,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_cvector_t_resize__SWIG_0(self, args);
+        return _wrap_vector_cvector_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -41026,17 +39553,17 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_cvector_t_resize__SWIG_1(self, args);
+          return _wrap_vector_cvector_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::resize(std::vector< BasicVector3D< std::complex< double > > >::size_type)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::resize(std::vector< BasicVector3D< std::complex< double > > >::size_type,std::vector< BasicVector3D< std::complex< double > > >::value_type const &)\n");
@@ -41044,7 +39571,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator arg2 ;
@@ -41055,18 +39582,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_insert" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
   } else {
@@ -41077,7 +39601,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t_insert" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -41094,7 +39618,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   std::vector< BasicVector3D< std::complex< double > > >::iterator arg2 ;
@@ -41108,18 +39632,14 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_cvector_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_insert" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
   } else {
@@ -41130,12 +39650,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_cvector_t_insert" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t_insert" "', argument " "3"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< BasicVector3D< std::complex< double > > >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_cvector_t_insert" "', argument " "4"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::value_type const &""'"); 
   }
@@ -41156,13 +39676,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_cvector_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< std::complex< double > >,std::allocator< BasicVector3D< std::complex< double > > > >**)(0));
@@ -41172,10 +39688,10 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *arg
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< BasicVector3D< std::complex< double > > >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_cvector_t_insert__SWIG_0(self, args);
+          return _wrap_vector_cvector_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -41194,10 +39710,10 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_cvector_t_insert__SWIG_1(self, args);
+            return _wrap_vector_cvector_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -41205,7 +39721,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_cvector_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::insert(std::vector< BasicVector3D< std::complex< double > > >::iterator,std::vector< BasicVector3D< std::complex< double > > >::value_type const &)\n"
     "    std::vector< BasicVector3D< std::complex< double > > >::insert(std::vector< BasicVector3D< std::complex< double > > >::iterator,std::vector< BasicVector3D< std::complex< double > > >::size_type,std::vector< BasicVector3D< std::complex< double > > >::value_type const &)\n");
@@ -41221,16 +39737,15 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_cvector_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_cvector_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_reserve" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< BasicVector3D< std::complex< double > > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_cvector_t_reserve" "', argument " "2"" of type '" "std::vector< BasicVector3D< std::complex< double > > >::size_type""'");
   } 
@@ -41248,11 +39763,12 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< BasicVector3D< std::complex< double > > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_capacity" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > const *""'"); 
   }
@@ -41270,10 +39786,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_cvector_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< BasicVector3D< std::complex< double > > > *arg1 = (std::vector< BasicVector3D< std::complex< double > > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_cvector_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_cvector_t" "', argument " "1"" of type '" "std::vector< BasicVector3D< std::complex< double > > > *""'"); 
   }
@@ -41288,21 +39805,26 @@ fail:
 
 SWIGINTERN PyObject *vector_cvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_BasicVector3DT_std__complexT_double_t_t_std__allocatorT_BasicVector3DT_std__complexT_double_t_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_cvector_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_mul_I(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:mul_I",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "mul_I" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -41320,11 +39842,12 @@ SWIGINTERN PyObject *_wrap_exp_I(PyObject *SWIGUNUSEDPARM(self), PyObject *args)
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:exp_I",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "exp_I" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -41510,11 +40033,12 @@ SWIGINTERN PyObject *_wrap_rad2deg(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:rad2deg",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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""'");
   } 
@@ -41532,11 +40056,12 @@ SWIGINTERN PyObject *_wrap_deg2rad(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:deg2rad",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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""'");
   } 
@@ -41637,7 +40162,7 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_GetZeroQ(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   SwigValueWrapper< WavevectorInfo > result;
   
-  if (!PyArg_ParseTuple(args,(char *)":WavevectorInfo_GetZeroQ")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "WavevectorInfo_GetZeroQ", 0, 0, 0)) SWIG_fail;
   result = WavevectorInfo::GetZeroQ();
   resultobj = SWIG_NewPointerObj((new WavevectorInfo(static_cast< const WavevectorInfo& >(result))), SWIGTYPE_p_WavevectorInfo, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -41646,7 +40171,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   cvector_t arg1 ;
   cvector_t arg2 ;
@@ -41657,14 +40182,11 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   WavevectorInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_WavevectorInfo",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_WavevectorInfo" "', argument " "1"" of type '" "cvector_t""'"); 
     }  
@@ -41677,7 +40199,7 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_WavevectorInfo" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -41689,7 +40211,7 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(s
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_WavevectorInfo" "', argument " "3"" of type '" "double""'");
   } 
@@ -41702,7 +40224,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   kvector_t arg1 ;
   kvector_t arg2 ;
@@ -41713,14 +40235,11 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   WavevectorInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_WavevectorInfo",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_WavevectorInfo" "', argument " "1"" of type '" "kvector_t""'"); 
     }  
@@ -41733,7 +40252,7 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_WavevectorInfo" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -41745,7 +40264,7 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_WavevectorInfo" "', argument " "3"" of type '" "double""'");
   } 
@@ -41763,19 +40282,15 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_WavevectorInfo", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -41783,17 +40298,17 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_WavevectorInfo__SWIG_0(self, args);
+          return _wrap_new_WavevectorInfo__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -41801,14 +40316,14 @@ SWIGINTERN PyObject *_wrap_new_WavevectorInfo(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_WavevectorInfo__SWIG_1(self, args);
+          return _wrap_new_WavevectorInfo__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_WavevectorInfo'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_WavevectorInfo'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    WavevectorInfo::WavevectorInfo(cvector_t,cvector_t,double)\n"
     "    WavevectorInfo::WavevectorInfo(kvector_t,kvector_t,double)\n");
@@ -41824,17 +40339,16 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_transformed(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< WavevectorInfo > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:WavevectorInfo_transformed",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "WavevectorInfo_transformed", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "WavevectorInfo_transformed" "', argument " "1"" of type '" "WavevectorInfo const *""'"); 
   }
   arg1 = reinterpret_cast< WavevectorInfo * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "WavevectorInfo_transformed" "', argument " "2"" of type '" "Transform3D const &""'"); 
   }
@@ -41855,11 +40369,12 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_getKi(PyObject *SWIGUNUSEDPARM(self),
   WavevectorInfo *arg1 = (WavevectorInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:WavevectorInfo_getKi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "WavevectorInfo_getKi" "', argument " "1"" of type '" "WavevectorInfo const *""'"); 
   }
@@ -41877,11 +40392,12 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_getKf(PyObject *SWIGUNUSEDPARM(self),
   WavevectorInfo *arg1 = (WavevectorInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:WavevectorInfo_getKf",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "WavevectorInfo_getKf" "', argument " "1"" of type '" "WavevectorInfo const *""'"); 
   }
@@ -41899,11 +40415,12 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_getQ(PyObject *SWIGUNUSEDPARM(self), P
   WavevectorInfo *arg1 = (WavevectorInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:WavevectorInfo_getQ",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "WavevectorInfo_getQ" "', argument " "1"" of type '" "WavevectorInfo const *""'"); 
   }
@@ -41921,11 +40438,12 @@ SWIGINTERN PyObject *_wrap_WavevectorInfo_getWavelength(PyObject *SWIGUNUSEDPARM
   WavevectorInfo *arg1 = (WavevectorInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:WavevectorInfo_getWavelength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "WavevectorInfo_getWavelength" "', argument " "1"" of type '" "WavevectorInfo const *""'"); 
   }
@@ -41943,10 +40461,11 @@ SWIGINTERN PyObject *_wrap_delete_WavevectorInfo(PyObject *SWIGUNUSEDPARM(self),
   WavevectorInfo *arg1 = (WavevectorInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_WavevectorInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_WavevectorInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_WavevectorInfo, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_WavevectorInfo" "', argument " "1"" of type '" "WavevectorInfo *""'"); 
   }
@@ -41961,16 +40480,20 @@ fail:
 
 SWIGINTERN PyObject *WavevectorInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_WavevectorInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Beam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *WavevectorInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Beam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Beam *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Beam")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Beam *)new Beam();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Beam, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -41979,16 +40502,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Beam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Beam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Beam *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Beam *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Beam",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Beam,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Beam,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Beam" "', argument " "1"" of type '" "Beam const &""'"); 
   }
@@ -42009,27 +40531,23 @@ SWIGINTERN PyObject *_wrap_new_Beam(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Beam", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Beam__SWIG_0(self, args);
+    return _wrap_new_Beam__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Beam, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Beam, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Beam__SWIG_1(self, args);
+      return _wrap_new_Beam__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Beam'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Beam'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Beam::Beam()\n"
     "    Beam::Beam(Beam const &)\n");
@@ -42042,10 +40560,11 @@ SWIGINTERN PyObject *_wrap_delete_Beam(PyObject *SWIGUNUSEDPARM(self), PyObject
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Beam",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Beam" "', argument " "1"" of type '" "Beam *""'"); 
   }
@@ -42063,11 +40582,12 @@ SWIGINTERN PyObject *_wrap_Beam_getCentralK(PyObject *SWIGUNUSEDPARM(self), PyOb
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getCentralK",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getCentralK" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42094,28 +40614,25 @@ SWIGINTERN PyObject *_wrap_Beam_setCentralK(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Beam_setCentralK",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_setCentralK", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_setCentralK" "', argument " "1"" of type '" "Beam *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Beam_setCentralK" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Beam_setCentralK" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Beam_setCentralK" "', argument " "4"" of type '" "double""'");
   } 
@@ -42133,11 +40650,12 @@ SWIGINTERN PyObject *_wrap_Beam_getIntensity(PyObject *SWIGUNUSEDPARM(self), PyO
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getIntensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getIntensity" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42158,16 +40676,15 @@ SWIGINTERN PyObject *_wrap_Beam_setIntensity(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Beam_setIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_setIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_setIntensity" "', argument " "1"" of type '" "Beam *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Beam_setIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -42185,11 +40702,12 @@ SWIGINTERN PyObject *_wrap_Beam_footprintFactor(PyObject *SWIGUNUSEDPARM(self),
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFootprintFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_footprintFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_footprintFactor" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42210,16 +40728,15 @@ SWIGINTERN PyObject *_wrap_Beam_setFootprintFactor(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Beam_setFootprintFactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_setFootprintFactor", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_setFootprintFactor" "', argument " "1"" of type '" "Beam *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFootprintFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFootprintFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Beam_setFootprintFactor" "', argument " "2"" of type '" "IFootprintFactor const &""'"); 
   }
@@ -42243,16 +40760,15 @@ SWIGINTERN PyObject *_wrap_Beam_setWidthRatio(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Beam_setWidthRatio",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_setWidthRatio", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_setWidthRatio" "', argument " "1"" of type '" "Beam *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Beam_setWidthRatio" "', argument " "2"" of type '" "double""'");
   } 
@@ -42273,17 +40789,16 @@ SWIGINTERN PyObject *_wrap_Beam_setPolarization(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Beam_setPolarization",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_setPolarization", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_setPolarization" "', argument " "1"" of type '" "Beam *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Beam_setPolarization" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -42308,11 +40823,12 @@ SWIGINTERN PyObject *_wrap_Beam_getBlochVector(PyObject *SWIGUNUSEDPARM(self), P
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getBlochVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getBlochVector" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42330,11 +40846,12 @@ SWIGINTERN PyObject *_wrap_Beam_getWavelength(PyObject *SWIGUNUSEDPARM(self), Py
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getWavelength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getWavelength" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42352,11 +40869,12 @@ SWIGINTERN PyObject *_wrap_Beam_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObjec
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getAlpha" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42374,11 +40892,12 @@ SWIGINTERN PyObject *_wrap_Beam_getPhi(PyObject *SWIGUNUSEDPARM(self), PyObject
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getPhi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getPhi" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42399,16 +40918,15 @@ SWIGINTERN PyObject *_wrap_Beam_accept(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Beam_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Beam_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_accept" "', argument " "1"" of type '" "Beam const *""'"); 
   }
   arg1 = reinterpret_cast< Beam * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Beam_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -42426,11 +40944,12 @@ SWIGINTERN PyObject *_wrap_Beam_getChildren(PyObject *SWIGUNUSEDPARM(self), PyOb
   Beam *arg1 = (Beam *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Beam_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Beam, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Beam_getChildren" "', argument " "1"" of type '" "Beam const *""'"); 
   }
@@ -42445,16 +40964,20 @@ fail:
 
 SWIGINTERN PyObject *Beam_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Beam, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Bin1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Beam_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Bin1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Bin1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Bin1D")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Bin1D *)new Bin1D();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Bin1D, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -42463,7 +40986,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -42471,17 +40994,15 @@ SWIGINTERN PyObject *_wrap_new_Bin1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Bin1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Bin1D",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Bin1D" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Bin1D" "', argument " "2"" of type '" "double""'");
   } 
@@ -42499,15 +41020,11 @@ SWIGINTERN PyObject *_wrap_new_Bin1D(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Bin1D", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Bin1D__SWIG_0(self, args);
+    return _wrap_new_Bin1D__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -42521,13 +41038,13 @@ SWIGINTERN PyObject *_wrap_new_Bin1D(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_Bin1D__SWIG_1(self, args);
+        return _wrap_new_Bin1D__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Bin1D'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Bin1D'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Bin1D::Bin1D()\n"
     "    Bin1D::Bin1D(double,double)\n");
@@ -42543,16 +41060,15 @@ SWIGINTERN PyObject *_wrap_Bin1D_m_lower_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1D_m_lower_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1D_m_lower_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_m_lower_set" "', argument " "1"" of type '" "Bin1D *""'"); 
   }
   arg1 = reinterpret_cast< Bin1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Bin1D_m_lower_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -42570,11 +41086,12 @@ SWIGINTERN PyObject *_wrap_Bin1D_m_lower_get(PyObject *SWIGUNUSEDPARM(self), PyO
   Bin1D *arg1 = (Bin1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1D_m_lower_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_m_lower_get" "', argument " "1"" of type '" "Bin1D *""'"); 
   }
@@ -42595,16 +41112,15 @@ SWIGINTERN PyObject *_wrap_Bin1D_m_upper_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1D_m_upper_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1D_m_upper_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_m_upper_set" "', argument " "1"" of type '" "Bin1D *""'"); 
   }
   arg1 = reinterpret_cast< Bin1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Bin1D_m_upper_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -42622,11 +41138,12 @@ SWIGINTERN PyObject *_wrap_Bin1D_m_upper_get(PyObject *SWIGUNUSEDPARM(self), PyO
   Bin1D *arg1 = (Bin1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1D_m_upper_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_m_upper_get" "', argument " "1"" of type '" "Bin1D *""'"); 
   }
@@ -42644,11 +41161,12 @@ SWIGINTERN PyObject *_wrap_Bin1D_getMidPoint(PyObject *SWIGUNUSEDPARM(self), PyO
   Bin1D *arg1 = (Bin1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1D_getMidPoint",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_getMidPoint" "', argument " "1"" of type '" "Bin1D const *""'"); 
   }
@@ -42666,11 +41184,12 @@ SWIGINTERN PyObject *_wrap_Bin1D_getBinSize(PyObject *SWIGUNUSEDPARM(self), PyOb
   Bin1D *arg1 = (Bin1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1D_getBinSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1D_getBinSize" "', argument " "1"" of type '" "Bin1D const *""'"); 
   }
@@ -42688,10 +41207,11 @@ SWIGINTERN PyObject *_wrap_delete_Bin1D(PyObject *SWIGUNUSEDPARM(self), PyObject
   Bin1D *arg1 = (Bin1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Bin1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Bin1D" "', argument " "1"" of type '" "Bin1D *""'"); 
   }
@@ -42706,11 +41226,15 @@ fail:
 
 SWIGINTERN PyObject *Bin1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Bin1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Bin1D_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_BinContains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Bin1D *arg1 = 0 ;
@@ -42719,12 +41243,11 @@ SWIGINTERN PyObject *_wrap_BinContains(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:BinContains",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Bin1D,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "BinContains", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BinContains" "', argument " "1"" of type '" "Bin1D const &""'"); 
   }
@@ -42732,7 +41255,7 @@ SWIGINTERN PyObject *_wrap_BinContains(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BinContains" "', argument " "1"" of type '" "Bin1D const &""'"); 
   }
   arg1 = reinterpret_cast< Bin1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BinContains" "', argument " "2"" of type '" "double""'");
   } 
@@ -42745,11 +41268,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Bin1DKVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Bin1DKVector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Bin1DKVector *)new Bin1DKVector();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Bin1DKVector, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -42758,7 +41281,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   kvector_t arg1 ;
   kvector_t arg2 ;
@@ -42766,13 +41289,11 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Bin1DKVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Bin1DKVector",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Bin1DKVector" "', argument " "1"" of type '" "kvector_t const""'"); 
     }  
@@ -42785,7 +41306,7 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Bin1DKVector" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -42805,7 +41326,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   Bin1D *arg2 = 0 ;
@@ -42816,18 +41337,15 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Bin1DKVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Bin1DKVector",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Bin1DKVector" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Bin1DKVector" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -42835,7 +41353,7 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Bin1DKVector" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Bin1DKVector" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -42856,25 +41374,21 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Bin1DKVector", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Bin1DKVector__SWIG_0(self, args);
+    return _wrap_new_Bin1DKVector__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Bin1DKVector__SWIG_1(self, args);
+        return _wrap_new_Bin1DKVector__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -42885,20 +41399,20 @@ SWIGINTERN PyObject *_wrap_new_Bin1DKVector(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_Bin1DKVector__SWIG_2(self, args);
+          return _wrap_new_Bin1DKVector__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Bin1DKVector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Bin1DKVector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Bin1DKVector::Bin1DKVector()\n"
     "    Bin1DKVector::Bin1DKVector(kvector_t const,kvector_t const)\n"
@@ -42912,11 +41426,12 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_getMidPoint(PyObject *SWIGUNUSEDPARM(sel
   Bin1DKVector *arg1 = (Bin1DKVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DKVector_getMidPoint",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_getMidPoint" "', argument " "1"" of type '" "Bin1DKVector const *""'"); 
   }
@@ -42934,11 +41449,12 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_getDelta(PyObject *SWIGUNUSEDPARM(self),
   Bin1DKVector *arg1 = (Bin1DKVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DKVector_getDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_getDelta" "', argument " "1"" of type '" "Bin1DKVector const *""'"); 
   }
@@ -42959,16 +41475,15 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_m_q_lower_set(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1DKVector_m_q_lower_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1DKVector_m_q_lower_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_m_q_lower_set" "', argument " "1"" of type '" "Bin1DKVector *""'"); 
   }
   arg1 = reinterpret_cast< Bin1DKVector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bin1DKVector_m_q_lower_set" "', argument " "2"" of type '" "kvector_t *""'"); 
   }
@@ -42986,11 +41501,12 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_m_q_lower_get(PyObject *SWIGUNUSEDPARM(s
   Bin1DKVector *arg1 = (Bin1DKVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DKVector_m_q_lower_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_m_q_lower_get" "', argument " "1"" of type '" "Bin1DKVector *""'"); 
   }
@@ -43011,16 +41527,15 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_m_q_upper_set(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1DKVector_m_q_upper_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1DKVector_m_q_upper_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_m_q_upper_set" "', argument " "1"" of type '" "Bin1DKVector *""'"); 
   }
   arg1 = reinterpret_cast< Bin1DKVector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bin1DKVector_m_q_upper_set" "', argument " "2"" of type '" "kvector_t *""'"); 
   }
@@ -43038,11 +41553,12 @@ SWIGINTERN PyObject *_wrap_Bin1DKVector_m_q_upper_get(PyObject *SWIGUNUSEDPARM(s
   Bin1DKVector *arg1 = (Bin1DKVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DKVector_m_q_upper_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DKVector_m_q_upper_get" "', argument " "1"" of type '" "Bin1DKVector *""'"); 
   }
@@ -43060,10 +41576,11 @@ SWIGINTERN PyObject *_wrap_delete_Bin1DKVector(PyObject *SWIGUNUSEDPARM(self), P
   Bin1DKVector *arg1 = (Bin1DKVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Bin1DKVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DKVector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DKVector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Bin1DKVector" "', argument " "1"" of type '" "Bin1DKVector *""'"); 
   }
@@ -43078,16 +41595,20 @@ fail:
 
 SWIGINTERN PyObject *Bin1DKVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Bin1DKVector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Bin1DKVector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Bin1DCVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Bin1DCVector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Bin1DCVector *)new Bin1DCVector();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Bin1DCVector, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -43096,7 +41617,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   cvector_t arg1 ;
   cvector_t arg2 ;
@@ -43104,13 +41625,11 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Bin1DCVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Bin1DCVector",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Bin1DCVector" "', argument " "1"" of type '" "cvector_t""'"); 
     }  
@@ -43123,7 +41642,7 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Bin1DCVector" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -43143,7 +41662,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   Bin1D *arg2 = 0 ;
@@ -43154,18 +41673,15 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Bin1DCVector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Bin1DCVector",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Bin1DCVector" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Bin1DCVector" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -43173,7 +41689,7 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Bin1DCVector" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Bin1DCVector" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -43194,25 +41710,21 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Bin1DCVector", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Bin1DCVector__SWIG_0(self, args);
+    return _wrap_new_Bin1DCVector__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Bin1DCVector__SWIG_1(self, args);
+        return _wrap_new_Bin1DCVector__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -43223,20 +41735,20 @@ SWIGINTERN PyObject *_wrap_new_Bin1DCVector(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_Bin1DCVector__SWIG_2(self, args);
+          return _wrap_new_Bin1DCVector__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Bin1DCVector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Bin1DCVector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Bin1DCVector::Bin1DCVector()\n"
     "    Bin1DCVector::Bin1DCVector(cvector_t,cvector_t)\n"
@@ -43250,11 +41762,12 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_getMidPoint(PyObject *SWIGUNUSEDPARM(sel
   Bin1DCVector *arg1 = (Bin1DCVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DCVector_getMidPoint",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_getMidPoint" "', argument " "1"" of type '" "Bin1DCVector const *""'"); 
   }
@@ -43272,11 +41785,12 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_getDelta(PyObject *SWIGUNUSEDPARM(self),
   Bin1DCVector *arg1 = (Bin1DCVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DCVector_getDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_getDelta" "', argument " "1"" of type '" "Bin1DCVector const *""'"); 
   }
@@ -43297,16 +41811,15 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_m_q_lower_set(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1DCVector_m_q_lower_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1DCVector_m_q_lower_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_m_q_lower_set" "', argument " "1"" of type '" "Bin1DCVector *""'"); 
   }
   arg1 = reinterpret_cast< Bin1DCVector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bin1DCVector_m_q_lower_set" "', argument " "2"" of type '" "cvector_t *""'"); 
   }
@@ -43324,11 +41837,12 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_m_q_lower_get(PyObject *SWIGUNUSEDPARM(s
   Bin1DCVector *arg1 = (Bin1DCVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DCVector_m_q_lower_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_m_q_lower_get" "', argument " "1"" of type '" "Bin1DCVector *""'"); 
   }
@@ -43349,16 +41863,15 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_m_q_upper_set(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Bin1DCVector_m_q_upper_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Bin1DCVector_m_q_upper_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_m_q_upper_set" "', argument " "1"" of type '" "Bin1DCVector *""'"); 
   }
   arg1 = reinterpret_cast< Bin1DCVector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Bin1DCVector_m_q_upper_set" "', argument " "2"" of type '" "cvector_t *""'"); 
   }
@@ -43376,11 +41889,12 @@ SWIGINTERN PyObject *_wrap_Bin1DCVector_m_q_upper_get(PyObject *SWIGUNUSEDPARM(s
   Bin1DCVector *arg1 = (Bin1DCVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   cvector_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bin1DCVector_m_q_upper_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bin1DCVector_m_q_upper_get" "', argument " "1"" of type '" "Bin1DCVector *""'"); 
   }
@@ -43398,10 +41912,11 @@ SWIGINTERN PyObject *_wrap_delete_Bin1DCVector(PyObject *SWIGUNUSEDPARM(self), P
   Bin1DCVector *arg1 = (Bin1DCVector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Bin1DCVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Bin1DCVector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Bin1DCVector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Bin1DCVector" "', argument " "1"" of type '" "Bin1DCVector *""'"); 
   }
@@ -43416,21 +41931,26 @@ fail:
 
 SWIGINTERN PyObject *Bin1DCVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Bin1DCVector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Bin1DCVector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IAxis_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_clone" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43448,10 +41968,11 @@ SWIGINTERN PyObject *_wrap_delete_IAxis(PyObject *SWIGUNUSEDPARM(self), PyObject
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IAxis" "', argument " "1"" of type '" "IAxis *""'"); 
   }
@@ -43469,11 +41990,12 @@ SWIGINTERN PyObject *_wrap_IAxis_size(PyObject *SWIGUNUSEDPARM(self), PyObject *
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_size" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43491,11 +42013,12 @@ SWIGINTERN PyObject *_wrap_IAxis_getName(PyObject *SWIGUNUSEDPARM(self), PyObjec
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getName" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43514,18 +42037,17 @@ SWIGINTERN PyObject *_wrap_IAxis_setName(PyObject *SWIGUNUSEDPARM(self), PyObjec
   std::string arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis_setName",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_setName", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_setName" "', argument " "1"" of type '" "IAxis *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    int res = SWIG_AsPtr_std_string(obj1, &ptr);
+    int res = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "IAxis_setName" "', argument " "2"" of type '" "std::string""'"); 
     }
@@ -43548,17 +42070,16 @@ SWIGINTERN PyObject *_wrap_IAxis_getBin(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis_getBin",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_getBin", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getBin" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAxis_getBin" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -43576,11 +42097,12 @@ SWIGINTERN PyObject *_wrap_IAxis_getMin(PyObject *SWIGUNUSEDPARM(self), PyObject
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_getMin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getMin" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43598,11 +42120,12 @@ SWIGINTERN PyObject *_wrap_IAxis_getMax(PyObject *SWIGUNUSEDPARM(self), PyObject
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_getMax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getMax" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43623,17 +42146,16 @@ SWIGINTERN PyObject *_wrap_IAxis_getBinCenter(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis_getBinCenter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_getBinCenter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getBinCenter" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAxis_getBinCenter" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -43654,17 +42176,16 @@ SWIGINTERN PyObject *_wrap_IAxis_findClosestIndex(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis_findClosestIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_findClosestIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_findClosestIndex" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAxis_findClosestIndex" "', argument " "2"" of type '" "double""'");
   } 
@@ -43685,17 +42206,16 @@ SWIGINTERN PyObject *_wrap_IAxis___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis___eq__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis___eq__" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IAxis___eq__" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -43707,7 +42227,9 @@ SWIGINTERN PyObject *_wrap_IAxis___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -43719,17 +42241,16 @@ SWIGINTERN PyObject *_wrap_IAxis___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis___ne__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis___ne__" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IAxis___ne__" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -43741,7 +42262,9 @@ SWIGINTERN PyObject *_wrap_IAxis___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -43750,11 +42273,12 @@ SWIGINTERN PyObject *_wrap_IAxis_getBinCenters(PyObject *SWIGUNUSEDPARM(self), P
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_getBinCenters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getBinCenters" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43772,11 +42296,12 @@ SWIGINTERN PyObject *_wrap_IAxis_getBinBoundaries(PyObject *SWIGUNUSEDPARM(self)
   IAxis *arg1 = (IAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAxis_getBinBoundaries",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_getBinBoundaries" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
@@ -43800,23 +42325,21 @@ SWIGINTERN PyObject *_wrap_IAxis_createClippedAxis(PyObject *SWIGUNUSEDPARM(self
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IAxis_createClippedAxis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_createClippedAxis", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_createClippedAxis" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAxis_createClippedAxis" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IAxis_createClippedAxis" "', argument " "3"" of type '" "double""'");
   } 
@@ -43837,17 +42360,16 @@ SWIGINTERN PyObject *_wrap_IAxis_contains(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAxis_contains",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAxis_contains", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAxis_contains" "', argument " "1"" of type '" "IAxis const *""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAxis_contains" "', argument " "2"" of type '" "double""'");
   } 
@@ -43862,7 +42384,7 @@ fail:
 
 SWIGINTERN PyObject *IAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IAxis, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43875,12 +42397,11 @@ SWIGINTERN PyObject *_wrap_HaveSameNameAndShape(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:HaveSameNameAndShape",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAxis,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "HaveSameNameAndShape", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HaveSameNameAndShape" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
@@ -43888,7 +42409,7 @@ SWIGINTERN PyObject *_wrap_HaveSameNameAndShape(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HaveSameNameAndShape" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HaveSameNameAndShape" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -43913,15 +42434,13 @@ SWIGINTERN PyObject *_wrap_new_VariableBinAxis(PyObject *SWIGUNUSEDPARM(self), P
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   VariableBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_VariableBinAxis",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_VariableBinAxis", 3, 3, swig_obj)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_VariableBinAxis" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -43930,14 +42449,14 @@ SWIGINTERN PyObject *_wrap_new_VariableBinAxis(PyObject *SWIGUNUSEDPARM(self), P
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_VariableBinAxis" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_VariableBinAxis" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -43963,10 +42482,11 @@ SWIGINTERN PyObject *_wrap_delete_VariableBinAxis(PyObject *SWIGUNUSEDPARM(self)
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VariableBinAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VariableBinAxis" "', argument " "1"" of type '" "VariableBinAxis *""'"); 
   }
@@ -43984,11 +42504,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_clone(PyObject *SWIGUNUSEDPARM(self),
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VariableBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_clone" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44006,11 +42527,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_size(PyObject *SWIGUNUSEDPARM(self),
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_size" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44031,17 +42553,16 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBin(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VariableBinAxis_getBin",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VariableBinAxis_getBin", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getBin" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< VariableBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VariableBinAxis_getBin" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -44059,11 +42580,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getMin(PyObject *SWIGUNUSEDPARM(self)
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_getMin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getMin" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44081,11 +42603,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getMax(PyObject *SWIGUNUSEDPARM(self)
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_getMax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getMax" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44106,17 +42629,16 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBinCenter(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VariableBinAxis_getBinCenter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VariableBinAxis_getBinCenter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getBinCenter" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< VariableBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VariableBinAxis_getBinCenter" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -44137,17 +42659,16 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_findClosestIndex(PyObject *SWIGUNUSED
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VariableBinAxis_findClosestIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VariableBinAxis_findClosestIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_findClosestIndex" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< VariableBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VariableBinAxis_findClosestIndex" "', argument " "2"" of type '" "double""'");
   } 
@@ -44165,11 +42686,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBinCenters(PyObject *SWIGUNUSEDPAR
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_getBinCenters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getBinCenters" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44187,11 +42709,12 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBinBoundaries(PyObject *SWIGUNUSED
   VariableBinAxis *arg1 = (VariableBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VariableBinAxis_getBinBoundaries",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_getBinBoundaries" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
@@ -44215,23 +42738,21 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_createClippedAxis(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   VariableBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VariableBinAxis_createClippedAxis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VariableBinAxis_createClippedAxis", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis_createClippedAxis" "', argument " "1"" of type '" "VariableBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< VariableBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VariableBinAxis_createClippedAxis" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "VariableBinAxis_createClippedAxis" "', argument " "3"" of type '" "double""'");
   } 
@@ -44252,17 +42773,16 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis___getitem__(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VariableBinAxis___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VariableBinAxis___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VariableBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VariableBinAxis___getitem__" "', argument " "1"" of type '" "VariableBinAxis *""'"); 
   }
   arg1 = reinterpret_cast< VariableBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VariableBinAxis___getitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -44277,11 +42797,15 @@ fail:
 
 SWIGINTERN PyObject *VariableBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VariableBinAxis, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *VariableBinAxis_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_ConstKBinAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
@@ -44295,16 +42819,13 @@ SWIGINTERN PyObject *_wrap_new_ConstKBinAxis(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   ConstKBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ConstKBinAxis",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_ConstKBinAxis", 4, 4, swig_obj)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ConstKBinAxis" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -44313,17 +42834,17 @@ SWIGINTERN PyObject *_wrap_new_ConstKBinAxis(PyObject *SWIGUNUSEDPARM(self), PyO
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ConstKBinAxis" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ConstKBinAxis" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ConstKBinAxis" "', argument " "4"" of type '" "double""'");
   } 
@@ -44343,10 +42864,11 @@ SWIGINTERN PyObject *_wrap_delete_ConstKBinAxis(PyObject *SWIGUNUSEDPARM(self),
   ConstKBinAxis *arg1 = (ConstKBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstKBinAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstKBinAxis, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstKBinAxis, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstKBinAxis" "', argument " "1"" of type '" "ConstKBinAxis *""'"); 
   }
@@ -44364,11 +42886,12 @@ SWIGINTERN PyObject *_wrap_ConstKBinAxis_clone(PyObject *SWIGUNUSEDPARM(self), P
   ConstKBinAxis *arg1 = (ConstKBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ConstKBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ConstKBinAxis_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstKBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstKBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstKBinAxis_clone" "', argument " "1"" of type '" "ConstKBinAxis const *""'"); 
   }
@@ -44392,23 +42915,21 @@ SWIGINTERN PyObject *_wrap_ConstKBinAxis_createClippedAxis(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   ConstKBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ConstKBinAxis_createClippedAxis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstKBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ConstKBinAxis_createClippedAxis", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstKBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstKBinAxis_createClippedAxis" "', argument " "1"" of type '" "ConstKBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< ConstKBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ConstKBinAxis_createClippedAxis" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ConstKBinAxis_createClippedAxis" "', argument " "3"" of type '" "double""'");
   } 
@@ -44423,11 +42944,15 @@ fail:
 
 SWIGINTERN PyObject *ConstKBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ConstKBinAxis, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ConstKBinAxis_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_CustomBinAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
@@ -44441,16 +42966,13 @@ SWIGINTERN PyObject *_wrap_new_CustomBinAxis(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   CustomBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CustomBinAxis",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_CustomBinAxis", 4, 4, swig_obj)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CustomBinAxis" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -44459,17 +42981,17 @@ SWIGINTERN PyObject *_wrap_new_CustomBinAxis(PyObject *SWIGUNUSEDPARM(self), PyO
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CustomBinAxis" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CustomBinAxis" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CustomBinAxis" "', argument " "4"" of type '" "double""'");
   } 
@@ -44489,10 +43011,11 @@ SWIGINTERN PyObject *_wrap_delete_CustomBinAxis(PyObject *SWIGUNUSEDPARM(self),
   CustomBinAxis *arg1 = (CustomBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_CustomBinAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CustomBinAxis, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CustomBinAxis, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CustomBinAxis" "', argument " "1"" of type '" "CustomBinAxis *""'"); 
   }
@@ -44510,11 +43033,12 @@ SWIGINTERN PyObject *_wrap_CustomBinAxis_clone(PyObject *SWIGUNUSEDPARM(self), P
   CustomBinAxis *arg1 = (CustomBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   CustomBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:CustomBinAxis_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CustomBinAxis_clone" "', argument " "1"" of type '" "CustomBinAxis const *""'"); 
   }
@@ -44535,17 +43059,16 @@ SWIGINTERN PyObject *_wrap_CustomBinAxis_getBin(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CustomBinAxis_getBin",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "CustomBinAxis_getBin", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CustomBinAxis_getBin" "', argument " "1"" of type '" "CustomBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< CustomBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CustomBinAxis_getBin" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -44563,11 +43086,12 @@ SWIGINTERN PyObject *_wrap_CustomBinAxis_getBinCenters(PyObject *SWIGUNUSEDPARM(
   CustomBinAxis *arg1 = (CustomBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:CustomBinAxis_getBinCenters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CustomBinAxis_getBinCenters" "', argument " "1"" of type '" "CustomBinAxis const *""'"); 
   }
@@ -44591,23 +43115,21 @@ SWIGINTERN PyObject *_wrap_CustomBinAxis_createClippedAxis(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   CustomBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:CustomBinAxis_createClippedAxis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "CustomBinAxis_createClippedAxis", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CustomBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CustomBinAxis_createClippedAxis" "', argument " "1"" of type '" "CustomBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< CustomBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CustomBinAxis_createClippedAxis" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CustomBinAxis_createClippedAxis" "', argument " "3"" of type '" "double""'");
   } 
@@ -44622,21 +43144,26 @@ fail:
 
 SWIGINTERN PyObject *CustomBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CustomBinAxis, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *CustomBinAxis_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IShape2D_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IShape2D *arg1 = (IShape2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IShape2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IShape2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IShape2D_clone" "', argument " "1"" of type '" "IShape2D const *""'"); 
   }
@@ -44649,7 +43176,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IShape2D *arg1 = (IShape2D *) 0 ;
   double arg2 ;
@@ -44660,23 +43187,20 @@ SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IShape2D_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IShape2D_contains" "', argument " "1"" of type '" "IShape2D const *""'"); 
   }
   arg1 = reinterpret_cast< IShape2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IShape2D_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IShape2D_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -44689,7 +43213,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IShape2D *arg1 = (IShape2D *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -44700,18 +43224,15 @@ SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IShape2D_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IShape2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IShape2D_contains" "', argument " "1"" of type '" "IShape2D const *""'"); 
   }
   arg1 = reinterpret_cast< IShape2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IShape2D_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -44719,7 +43240,7 @@ SWIGINTERN PyObject *_wrap_IShape2D_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IShape2D_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IShape2D_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -44740,26 +43261,22 @@ SWIGINTERN PyObject *_wrap_IShape2D_contains(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IShape2D_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IShape2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_IShape2D_contains__SWIG_1(self, args);
+          return _wrap_IShape2D_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -44780,14 +43297,14 @@ SWIGINTERN PyObject *_wrap_IShape2D_contains(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IShape2D_contains__SWIG_0(self, args);
+          return _wrap_IShape2D_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IShape2D_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IShape2D_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IShape2D::contains(double,double) const\n"
     "    IShape2D::contains(Bin1D const &,Bin1D const &) const\n");
@@ -44800,10 +43317,11 @@ SWIGINTERN PyObject *_wrap_delete_IShape2D(PyObject *SWIGUNUSEDPARM(self), PyObj
   IShape2D *arg1 = (IShape2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IShape2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IShape2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IShape2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IShape2D" "', argument " "1"" of type '" "IShape2D *""'"); 
   }
@@ -44818,7 +43336,7 @@ fail:
 
 SWIGINTERN PyObject *IShape2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IShape2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -44828,19 +43346,20 @@ SWIGINTERN PyObject *_wrap_ISample_clone(PyObject *SWIGUNUSEDPARM(self), PyObjec
   ISample *arg1 = (ISample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   ISample *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ISample_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISample_clone" "', argument " "1"" of type '" "ISample const *""'"); 
   }
   arg1 = reinterpret_cast< ISample * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("ISample::clone");
@@ -44871,19 +43390,20 @@ SWIGINTERN PyObject *_wrap_ISample_material(PyObject *SWIGUNUSEDPARM(self), PyOb
   ISample *arg1 = (ISample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   Material *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ISample_material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISample_material" "', argument " "1"" of type '" "ISample const *""'"); 
   }
   arg1 = reinterpret_cast< ISample * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (Material *)((ISample const *)arg1)->ISample::material();
@@ -44908,11 +43428,12 @@ SWIGINTERN PyObject *_wrap_ISample_containedMaterials(PyObject *SWIGUNUSEDPARM(s
   ISample *arg1 = (ISample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< Material const *,std::allocator< Material const * > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ISample_containedMaterials",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISample_containedMaterials" "', argument " "1"" of type '" "ISample const *""'"); 
   }
@@ -44928,11 +43449,12 @@ fail:
 SWIGINTERN PyObject *_wrap_new_ISample(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ISample *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ISample",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (ISample *)new SwigDirector_ISample(arg1); 
@@ -44953,10 +43475,11 @@ SWIGINTERN PyObject *_wrap_delete_ISample(PyObject *SWIGUNUSEDPARM(self), PyObje
   ISample *arg1 = (ISample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ISample",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISample, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISample, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ISample" "', argument " "1"" of type '" "ISample *""'"); 
   }
@@ -44974,10 +43497,11 @@ SWIGINTERN PyObject *_wrap_disown_ISample(PyObject *SWIGUNUSEDPARM(self), PyObje
   ISample *arg1 = (ISample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_ISample",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_ISample" "', argument " "1"" of type '" "ISample *""'"); 
   }
@@ -44996,20 +43520,25 @@ fail:
 
 SWIGINTERN PyObject *ISample_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ISample, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ISample_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IChiSquaredModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IChiSquaredModule *arg1 = (IChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IChiSquaredModule",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IChiSquaredModule" "', argument " "1"" of type '" "IChiSquaredModule *""'"); 
   }
@@ -45027,11 +43556,12 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_clone(PyObject *SWIGUNUSEDPARM(self
   IChiSquaredModule *arg1 = (IChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IChiSquaredModule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IChiSquaredModule_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_clone" "', argument " "1"" of type '" "IChiSquaredModule const *""'"); 
   }
@@ -45049,11 +43579,12 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_varianceFunction(PyObject *SWIGUNUS
   IChiSquaredModule *arg1 = (IChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IVarianceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IChiSquaredModule_varianceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_varianceFunction" "', argument " "1"" of type '" "IChiSquaredModule const *""'"); 
   }
@@ -45074,16 +43605,15 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_setVarianceFunction(PyObject *SWIGU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IChiSquaredModule_setVarianceFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IChiSquaredModule_setVarianceFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_setVarianceFunction" "', argument " "1"" of type '" "IChiSquaredModule *""'"); 
   }
   arg1 = reinterpret_cast< IChiSquaredModule * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IVarianceFunction,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IVarianceFunction,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IChiSquaredModule_setVarianceFunction" "', argument " "2"" of type '" "IVarianceFunction const &""'"); 
   }
@@ -45104,11 +43634,12 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_getIntensityFunction(PyObject *SWIG
   IChiSquaredModule *arg1 = (IChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IIntensityFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IChiSquaredModule_getIntensityFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_getIntensityFunction" "', argument " "1"" of type '" "IChiSquaredModule const *""'"); 
   }
@@ -45129,16 +43660,15 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_setIntensityFunction(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IChiSquaredModule_setIntensityFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IChiSquaredModule_setIntensityFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_setIntensityFunction" "', argument " "1"" of type '" "IChiSquaredModule *""'"); 
   }
   arg1 = reinterpret_cast< IChiSquaredModule * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IIntensityFunction,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IIntensityFunction,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IChiSquaredModule_setIntensityFunction" "', argument " "2"" of type '" "IIntensityFunction const &""'"); 
   }
@@ -45168,29 +43698,26 @@ SWIGINTERN PyObject *_wrap_IChiSquaredModule_residual(PyObject *SWIGUNUSEDPARM(s
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IChiSquaredModule_residual",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IChiSquaredModule_residual", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IChiSquaredModule_residual" "', argument " "1"" of type '" "IChiSquaredModule *""'"); 
   }
   arg1 = reinterpret_cast< IChiSquaredModule * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IChiSquaredModule_residual" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IChiSquaredModule_residual" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IChiSquaredModule_residual" "', argument " "4"" of type '" "double""'");
   } 
@@ -45205,7 +43732,7 @@ fail:
 
 SWIGINTERN PyObject *IChiSquaredModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IChiSquaredModule, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45215,10 +43742,11 @@ SWIGINTERN PyObject *_wrap_delete_IObserver(PyObject *SWIGUNUSEDPARM(self), PyOb
   IObserver *arg1 = (IObserver *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IObserver",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IObserver, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IObserver, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IObserver" "', argument " "1"" of type '" "IObserver *""'"); 
   }
@@ -45239,16 +43767,15 @@ SWIGINTERN PyObject *_wrap_IObserver_notify(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IObserver_notify",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IObserver, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IObserver_notify", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IObserver, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IObserver_notify" "', argument " "1"" of type '" "IObserver *""'"); 
   }
   arg1 = reinterpret_cast< IObserver * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IObservable, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IObservable, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IObserver_notify" "', argument " "2"" of type '" "IObservable *""'"); 
   }
@@ -45263,7 +43790,7 @@ fail:
 
 SWIGINTERN PyObject *IObserver_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IObserver, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45273,10 +43800,11 @@ SWIGINTERN PyObject *_wrap_delete_IObservable(PyObject *SWIGUNUSEDPARM(self), Py
   IObservable *arg1 = (IObservable *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IObservable",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IObservable, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IObservable, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IObservable" "', argument " "1"" of type '" "IObservable *""'"); 
   }
@@ -45297,17 +43825,16 @@ SWIGINTERN PyObject *_wrap_IObservable_attachObserver(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IObservable_attachObserver",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IObservable, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IObservable_attachObserver", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IObservable, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IObservable_attachObserver" "', argument " "1"" of type '" "IObservable *""'"); 
   }
   arg1 = reinterpret_cast< IObservable * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__shared_ptrT_IObserver_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__shared_ptrT_IObserver_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IObservable_attachObserver" "', argument " "2"" of type '" "IObservable::observer_t""'"); 
     }  
@@ -45332,10 +43859,11 @@ SWIGINTERN PyObject *_wrap_IObservable_notifyObservers(PyObject *SWIGUNUSEDPARM(
   IObservable *arg1 = (IObservable *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IObservable_notifyObservers",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IObservable, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IObservable, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IObservable_notifyObservers" "', argument " "1"" of type '" "IObservable *""'"); 
   }
@@ -45352,7 +43880,7 @@ SWIGINTERN PyObject *_wrap_new_IObservable(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   IObservable *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IObservable")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IObservable", 0, 0, 0)) SWIG_fail;
   result = (IObservable *)new IObservable();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IObservable, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -45363,20 +43891,25 @@ fail:
 
 SWIGINTERN PyObject *IObservable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IObservable, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IObservable_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IIntensityFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IIntensityFunction *arg1 = (IIntensityFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IIntensityFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityFunction, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityFunction, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IIntensityFunction" "', argument " "1"" of type '" "IIntensityFunction *""'"); 
   }
@@ -45394,11 +43927,12 @@ SWIGINTERN PyObject *_wrap_IIntensityFunction_clone(PyObject *SWIGUNUSEDPARM(sel
   IIntensityFunction *arg1 = (IIntensityFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IIntensityFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IIntensityFunction_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityFunction_clone" "', argument " "1"" of type '" "IIntensityFunction const *""'"); 
   }
@@ -45419,17 +43953,16 @@ SWIGINTERN PyObject *_wrap_IIntensityFunction_evaluate(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IIntensityFunction_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IIntensityFunction_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityFunction_evaluate" "', argument " "1"" of type '" "IIntensityFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IIntensityFunction * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IIntensityFunction_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -45444,7 +43977,7 @@ fail:
 
 SWIGINTERN PyObject *IIntensityFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IIntensityFunction, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45454,11 +43987,12 @@ SWIGINTERN PyObject *_wrap_IntensityFunctionLog_clone(PyObject *SWIGUNUSEDPARM(s
   IntensityFunctionLog *arg1 = (IntensityFunctionLog *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IntensityFunctionLog *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityFunctionLog_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionLog, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionLog, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityFunctionLog_clone" "', argument " "1"" of type '" "IntensityFunctionLog const *""'"); 
   }
@@ -45479,17 +44013,16 @@ SWIGINTERN PyObject *_wrap_IntensityFunctionLog_evaluate(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityFunctionLog_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionLog, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityFunctionLog_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionLog, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityFunctionLog_evaluate" "', argument " "1"" of type '" "IntensityFunctionLog const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityFunctionLog * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityFunctionLog_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -45506,7 +44039,7 @@ SWIGINTERN PyObject *_wrap_new_IntensityFunctionLog(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IntensityFunctionLog *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityFunctionLog")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IntensityFunctionLog", 0, 0, 0)) SWIG_fail;
   result = (IntensityFunctionLog *)new IntensityFunctionLog();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IntensityFunctionLog, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -45520,10 +44053,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityFunctionLog(PyObject *SWIGUNUSEDPARM(
   IntensityFunctionLog *arg1 = (IntensityFunctionLog *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityFunctionLog",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionLog, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionLog, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityFunctionLog" "', argument " "1"" of type '" "IntensityFunctionLog *""'"); 
   }
@@ -45538,21 +44072,26 @@ fail:
 
 SWIGINTERN PyObject *IntensityFunctionLog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IntensityFunctionLog, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IntensityFunctionLog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IntensityFunctionSqrt_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IntensityFunctionSqrt *arg1 = (IntensityFunctionSqrt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IntensityFunctionSqrt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityFunctionSqrt_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionSqrt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionSqrt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityFunctionSqrt_clone" "', argument " "1"" of type '" "IntensityFunctionSqrt const *""'"); 
   }
@@ -45573,17 +44112,16 @@ SWIGINTERN PyObject *_wrap_IntensityFunctionSqrt_evaluate(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityFunctionSqrt_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionSqrt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityFunctionSqrt_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionSqrt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityFunctionSqrt_evaluate" "', argument " "1"" of type '" "IntensityFunctionSqrt const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityFunctionSqrt * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityFunctionSqrt_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -45600,7 +44138,7 @@ SWIGINTERN PyObject *_wrap_new_IntensityFunctionSqrt(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IntensityFunctionSqrt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityFunctionSqrt")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IntensityFunctionSqrt", 0, 0, 0)) SWIG_fail;
   result = (IntensityFunctionSqrt *)new IntensityFunctionSqrt();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IntensityFunctionSqrt, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -45614,10 +44152,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityFunctionSqrt(PyObject *SWIGUNUSEDPARM
   IntensityFunctionSqrt *arg1 = (IntensityFunctionSqrt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityFunctionSqrt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityFunctionSqrt, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityFunctionSqrt, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityFunctionSqrt" "', argument " "1"" of type '" "IntensityFunctionSqrt *""'"); 
   }
@@ -45632,20 +44171,25 @@ fail:
 
 SWIGINTERN PyObject *IntensityFunctionSqrt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IntensityFunctionSqrt, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IntensityFunctionSqrt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IIntensityNormalizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IIntensityNormalizer *arg1 = (IIntensityNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IIntensityNormalizer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityNormalizer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityNormalizer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IIntensityNormalizer" "', argument " "1"" of type '" "IIntensityNormalizer *""'"); 
   }
@@ -45663,11 +44207,12 @@ SWIGINTERN PyObject *_wrap_IIntensityNormalizer_clone(PyObject *SWIGUNUSEDPARM(s
   IIntensityNormalizer *arg1 = (IIntensityNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IIntensityNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IIntensityNormalizer_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityNormalizer_clone" "', argument " "1"" of type '" "IIntensityNormalizer const *""'"); 
   }
@@ -45688,17 +44233,16 @@ SWIGINTERN PyObject *_wrap_IIntensityNormalizer_createNormalizedData(PyObject *S
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IIntensityNormalizer_createNormalizedData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IIntensityNormalizer_createNormalizedData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityNormalizer_createNormalizedData" "', argument " "1"" of type '" "IIntensityNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IIntensityNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IIntensityNormalizer_createNormalizedData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -45722,16 +44266,15 @@ SWIGINTERN PyObject *_wrap_IIntensityNormalizer_apply(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IIntensityNormalizer_apply",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IIntensityNormalizer_apply", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityNormalizer_apply" "', argument " "1"" of type '" "IIntensityNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IIntensityNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IIntensityNormalizer_apply" "', argument " "2"" of type '" "OutputData< double > &""'"); 
   }
@@ -45755,16 +44298,15 @@ SWIGINTERN PyObject *_wrap_IIntensityNormalizer_setMaximumIntensity(PyObject *SW
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IIntensityNormalizer_setMaximumIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IIntensityNormalizer_setMaximumIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IIntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IIntensityNormalizer_setMaximumIntensity" "', argument " "1"" of type '" "IIntensityNormalizer *""'"); 
   }
   arg1 = reinterpret_cast< IIntensityNormalizer * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IIntensityNormalizer_setMaximumIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -45779,12 +44321,12 @@ fail:
 
 SWIGINTERN PyObject *IIntensityNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IIntensityNormalizer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -45792,17 +44334,15 @@ SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_0(PyObject *SWIGUNUSEDP
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IntensityNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IntensityNormalizer",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IntensityNormalizer" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IntensityNormalizer" "', argument " "2"" of type '" "double""'");
   } 
@@ -45815,16 +44355,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   IntensityNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IntensityNormalizer",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IntensityNormalizer" "', argument " "1"" of type '" "double""'");
   } 
@@ -45837,11 +44376,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IntensityNormalizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   IntensityNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityNormalizer")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (IntensityNormalizer *)new IntensityNormalizer();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IntensityNormalizer, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -45855,15 +44394,11 @@ SWIGINTERN PyObject *_wrap_new_IntensityNormalizer(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_IntensityNormalizer", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_IntensityNormalizer__SWIG_2(self, args);
+    return _wrap_new_IntensityNormalizer__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -45872,7 +44407,7 @@ SWIGINTERN PyObject *_wrap_new_IntensityNormalizer(PyObject *self, PyObject *arg
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_IntensityNormalizer__SWIG_1(self, args);
+      return _wrap_new_IntensityNormalizer__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -45887,13 +44422,13 @@ SWIGINTERN PyObject *_wrap_new_IntensityNormalizer(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_IntensityNormalizer__SWIG_0(self, args);
+        return _wrap_new_IntensityNormalizer__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_IntensityNormalizer'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_IntensityNormalizer'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityNormalizer::IntensityNormalizer(double,double)\n"
     "    IntensityNormalizer::IntensityNormalizer(double)\n"
@@ -45907,10 +44442,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityNormalizer(PyObject *SWIGUNUSEDPARM(s
   IntensityNormalizer *arg1 = (IntensityNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityNormalizer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityNormalizer" "', argument " "1"" of type '" "IntensityNormalizer *""'"); 
   }
@@ -45928,11 +44464,12 @@ SWIGINTERN PyObject *_wrap_IntensityNormalizer_clone(PyObject *SWIGUNUSEDPARM(se
   IntensityNormalizer *arg1 = (IntensityNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IntensityNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityNormalizer_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityNormalizer_clone" "', argument " "1"" of type '" "IntensityNormalizer const *""'"); 
   }
@@ -45953,16 +44490,15 @@ SWIGINTERN PyObject *_wrap_IntensityNormalizer_accept(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityNormalizer_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityNormalizer_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityNormalizer_accept" "', argument " "1"" of type '" "IntensityNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityNormalizer_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -45983,17 +44519,16 @@ SWIGINTERN PyObject *_wrap_IntensityNormalizer_createNormalizedData(PyObject *SW
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityNormalizer_createNormalizedData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityNormalizer_createNormalizedData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityNormalizer_createNormalizedData" "', argument " "1"" of type '" "IntensityNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityNormalizer_createNormalizedData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -46017,16 +44552,15 @@ SWIGINTERN PyObject *_wrap_IntensityNormalizer_apply(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityNormalizer_apply",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityNormalizer_apply", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityNormalizer_apply" "', argument " "1"" of type '" "IntensityNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityNormalizer_apply" "', argument " "2"" of type '" "OutputData< double > &""'"); 
   }
@@ -46050,16 +44584,15 @@ SWIGINTERN PyObject *_wrap_IntensityNormalizer_setMaximumIntensity(PyObject *SWI
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityNormalizer_setMaximumIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityNormalizer_setMaximumIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityNormalizer_setMaximumIntensity" "', argument " "1"" of type '" "IntensityNormalizer *""'"); 
   }
   arg1 = reinterpret_cast< IntensityNormalizer * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityNormalizer_setMaximumIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -46074,12 +44607,16 @@ fail:
 
 SWIGINTERN PyObject *IntensityNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IntensityNormalizer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IntensityNormalizer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -46087,17 +44624,15 @@ SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_0(PyObject
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IntensityScaleAndShiftNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IntensityScaleAndShiftNormalizer",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IntensityScaleAndShiftNormalizer" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IntensityScaleAndShiftNormalizer" "', argument " "2"" of type '" "double""'");
   } 
@@ -46110,16 +44645,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   IntensityScaleAndShiftNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IntensityScaleAndShiftNormalizer",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IntensityScaleAndShiftNormalizer" "', argument " "1"" of type '" "double""'");
   } 
@@ -46132,11 +44666,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   IntensityScaleAndShiftNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityScaleAndShiftNormalizer")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (IntensityScaleAndShiftNormalizer *)new IntensityScaleAndShiftNormalizer();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IntensityScaleAndShiftNormalizer, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -46150,15 +44684,11 @@ SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer(PyObject *self,
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_IntensityScaleAndShiftNormalizer", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_2(self, args);
+    return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -46167,7 +44697,7 @@ SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer(PyObject *self,
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_1(self, args);
+      return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -46182,13 +44712,13 @@ SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer(PyObject *self,
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_0(self, args);
+        return _wrap_new_IntensityScaleAndShiftNormalizer__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_IntensityScaleAndShiftNormalizer'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_IntensityScaleAndShiftNormalizer'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityScaleAndShiftNormalizer::IntensityScaleAndShiftNormalizer(double,double)\n"
     "    IntensityScaleAndShiftNormalizer::IntensityScaleAndShiftNormalizer(double)\n"
@@ -46202,10 +44732,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityScaleAndShiftNormalizer(PyObject *SWI
   IntensityScaleAndShiftNormalizer *arg1 = (IntensityScaleAndShiftNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityScaleAndShiftNormalizer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityScaleAndShiftNormalizer" "', argument " "1"" of type '" "IntensityScaleAndShiftNormalizer *""'"); 
   }
@@ -46226,16 +44757,15 @@ SWIGINTERN PyObject *_wrap_IntensityScaleAndShiftNormalizer_accept(PyObject *SWI
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityScaleAndShiftNormalizer_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityScaleAndShiftNormalizer_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityScaleAndShiftNormalizer_accept" "', argument " "1"" of type '" "IntensityScaleAndShiftNormalizer const *""'"); 
   }
   arg1 = reinterpret_cast< IntensityScaleAndShiftNormalizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityScaleAndShiftNormalizer_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -46256,16 +44786,15 @@ SWIGINTERN PyObject *_wrap_IntensityScaleAndShiftNormalizer_setMaximumIntensity(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityScaleAndShiftNormalizer_setMaximumIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityScaleAndShiftNormalizer_setMaximumIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityScaleAndShiftNormalizer_setMaximumIntensity" "', argument " "1"" of type '" "IntensityScaleAndShiftNormalizer *""'"); 
   }
   arg1 = reinterpret_cast< IntensityScaleAndShiftNormalizer * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityScaleAndShiftNormalizer_setMaximumIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -46283,11 +44812,12 @@ SWIGINTERN PyObject *_wrap_IntensityScaleAndShiftNormalizer_clone(PyObject *SWIG
   IntensityScaleAndShiftNormalizer *arg1 = (IntensityScaleAndShiftNormalizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IntensityScaleAndShiftNormalizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityScaleAndShiftNormalizer_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityScaleAndShiftNormalizer_clone" "', argument " "1"" of type '" "IntensityScaleAndShiftNormalizer const *""'"); 
   }
@@ -46302,20 +44832,25 @@ fail:
 
 SWIGINTERN PyObject *IntensityScaleAndShiftNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IntensityScaleAndShiftNormalizer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IntensityScaleAndShiftNormalizer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IVarianceFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IVarianceFunction *arg1 = (IVarianceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IVarianceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IVarianceFunction, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IVarianceFunction, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IVarianceFunction" "', argument " "1"" of type '" "IVarianceFunction *""'"); 
   }
@@ -46333,11 +44868,12 @@ SWIGINTERN PyObject *_wrap_IVarianceFunction_clone(PyObject *SWIGUNUSEDPARM(self
   IVarianceFunction *arg1 = (IVarianceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IVarianceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IVarianceFunction_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IVarianceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IVarianceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IVarianceFunction_clone" "', argument " "1"" of type '" "IVarianceFunction const *""'"); 
   }
@@ -46361,23 +44897,21 @@ SWIGINTERN PyObject *_wrap_IVarianceFunction_variance(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IVarianceFunction_variance",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IVarianceFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IVarianceFunction_variance", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IVarianceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IVarianceFunction_variance" "', argument " "1"" of type '" "IVarianceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IVarianceFunction * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IVarianceFunction_variance" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IVarianceFunction_variance" "', argument " "3"" of type '" "double""'");
   } 
@@ -46392,7 +44926,7 @@ fail:
 
 SWIGINTERN PyObject *IVarianceFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IVarianceFunction, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -46402,11 +44936,12 @@ SWIGINTERN PyObject *_wrap_VarianceConstantFunction_clone(PyObject *SWIGUNUSEDPA
   VarianceConstantFunction *arg1 = (VarianceConstantFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VarianceConstantFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VarianceConstantFunction_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceConstantFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceConstantFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VarianceConstantFunction_clone" "', argument " "1"" of type '" "VarianceConstantFunction const *""'"); 
   }
@@ -46430,23 +44965,21 @@ SWIGINTERN PyObject *_wrap_VarianceConstantFunction_variance(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VarianceConstantFunction_variance",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceConstantFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VarianceConstantFunction_variance", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceConstantFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VarianceConstantFunction_variance" "', argument " "1"" of type '" "VarianceConstantFunction const *""'"); 
   }
   arg1 = reinterpret_cast< VarianceConstantFunction * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VarianceConstantFunction_variance" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "VarianceConstantFunction_variance" "', argument " "3"" of type '" "double""'");
   } 
@@ -46463,7 +44996,7 @@ SWIGINTERN PyObject *_wrap_new_VarianceConstantFunction(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   VarianceConstantFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_VarianceConstantFunction")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_VarianceConstantFunction", 0, 0, 0)) SWIG_fail;
   result = (VarianceConstantFunction *)new VarianceConstantFunction();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VarianceConstantFunction, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -46477,10 +45010,11 @@ SWIGINTERN PyObject *_wrap_delete_VarianceConstantFunction(PyObject *SWIGUNUSEDP
   VarianceConstantFunction *arg1 = (VarianceConstantFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VarianceConstantFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceConstantFunction, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceConstantFunction, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VarianceConstantFunction" "', argument " "1"" of type '" "VarianceConstantFunction *""'"); 
   }
@@ -46495,21 +45029,24 @@ fail:
 
 SWIGINTERN PyObject *VarianceConstantFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VarianceConstantFunction, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_VarianceSimFunction__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *VarianceConstantFunction_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_VarianceSimFunction__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   VarianceSimFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_VarianceSimFunction",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_VarianceSimFunction" "', argument " "1"" of type '" "double""'");
   } 
@@ -46522,11 +45059,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VarianceSimFunction__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_VarianceSimFunction__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   VarianceSimFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_VarianceSimFunction")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (VarianceSimFunction *)new VarianceSimFunction();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VarianceSimFunction, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -46540,15 +45077,11 @@ SWIGINTERN PyObject *_wrap_new_VarianceSimFunction(PyObject *self, PyObject *arg
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_VarianceSimFunction", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_VarianceSimFunction__SWIG_1(self, args);
+    return _wrap_new_VarianceSimFunction__SWIG_1(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -46557,12 +45090,12 @@ SWIGINTERN PyObject *_wrap_new_VarianceSimFunction(PyObject *self, PyObject *arg
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_VarianceSimFunction__SWIG_0(self, args);
+      return _wrap_new_VarianceSimFunction__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_VarianceSimFunction'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_VarianceSimFunction'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    VarianceSimFunction::VarianceSimFunction(double)\n"
     "    VarianceSimFunction::VarianceSimFunction()\n");
@@ -46575,11 +45108,12 @@ SWIGINTERN PyObject *_wrap_VarianceSimFunction_clone(PyObject *SWIGUNUSEDPARM(se
   VarianceSimFunction *arg1 = (VarianceSimFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VarianceSimFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VarianceSimFunction_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceSimFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceSimFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VarianceSimFunction_clone" "', argument " "1"" of type '" "VarianceSimFunction const *""'"); 
   }
@@ -46603,23 +45137,21 @@ SWIGINTERN PyObject *_wrap_VarianceSimFunction_variance(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VarianceSimFunction_variance",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceSimFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VarianceSimFunction_variance", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceSimFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VarianceSimFunction_variance" "', argument " "1"" of type '" "VarianceSimFunction const *""'"); 
   }
   arg1 = reinterpret_cast< VarianceSimFunction * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VarianceSimFunction_variance" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "VarianceSimFunction_variance" "', argument " "3"" of type '" "double""'");
   } 
@@ -46637,10 +45169,11 @@ SWIGINTERN PyObject *_wrap_delete_VarianceSimFunction(PyObject *SWIGUNUSEDPARM(s
   VarianceSimFunction *arg1 = (VarianceSimFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VarianceSimFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VarianceSimFunction, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VarianceSimFunction, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VarianceSimFunction" "', argument " "1"" of type '" "VarianceSimFunction *""'"); 
   }
@@ -46655,16 +45188,20 @@ fail:
 
 SWIGINTERN PyObject *VarianceSimFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VarianceSimFunction, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ChiSquaredModule__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *VarianceSimFunction_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ChiSquaredModule__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   ChiSquaredModule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ChiSquaredModule")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (ChiSquaredModule *)new ChiSquaredModule();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChiSquaredModule, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -46673,16 +45210,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ChiSquaredModule__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ChiSquaredModule__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ChiSquaredModule *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   ChiSquaredModule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ChiSquaredModule",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ChiSquaredModule,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_ChiSquaredModule,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ChiSquaredModule" "', argument " "1"" of type '" "ChiSquaredModule const &""'"); 
   }
@@ -46703,27 +45239,23 @@ SWIGINTERN PyObject *_wrap_new_ChiSquaredModule(PyObject *self, PyObject *args)
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ChiSquaredModule", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_ChiSquaredModule__SWIG_0(self, args);
+    return _wrap_new_ChiSquaredModule__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ChiSquaredModule, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ChiSquaredModule, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_ChiSquaredModule__SWIG_1(self, args);
+      return _wrap_new_ChiSquaredModule__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ChiSquaredModule'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ChiSquaredModule'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ChiSquaredModule::ChiSquaredModule()\n"
     "    ChiSquaredModule::ChiSquaredModule(ChiSquaredModule const &)\n");
@@ -46736,10 +45268,11 @@ SWIGINTERN PyObject *_wrap_delete_ChiSquaredModule(PyObject *SWIGUNUSEDPARM(self
   ChiSquaredModule *arg1 = (ChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ChiSquaredModule",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChiSquaredModule, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ChiSquaredModule, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ChiSquaredModule" "', argument " "1"" of type '" "ChiSquaredModule *""'"); 
   }
@@ -46757,11 +45290,12 @@ SWIGINTERN PyObject *_wrap_ChiSquaredModule_clone(PyObject *SWIGUNUSEDPARM(self)
   ChiSquaredModule *arg1 = (ChiSquaredModule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ChiSquaredModule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ChiSquaredModule_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChiSquaredModule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChiSquaredModule_clone" "', argument " "1"" of type '" "ChiSquaredModule const *""'"); 
   }
@@ -46788,29 +45322,26 @@ SWIGINTERN PyObject *_wrap_ChiSquaredModule_residual(PyObject *SWIGUNUSEDPARM(se
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:ChiSquaredModule_residual",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChiSquaredModule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ChiSquaredModule_residual", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ChiSquaredModule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChiSquaredModule_residual" "', argument " "1"" of type '" "ChiSquaredModule *""'"); 
   }
   arg1 = reinterpret_cast< ChiSquaredModule * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ChiSquaredModule_residual" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ChiSquaredModule_residual" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ChiSquaredModule_residual" "', argument " "4"" of type '" "double""'");
   } 
@@ -46825,16 +45356,20 @@ fail:
 
 SWIGINTERN PyObject *ChiSquaredModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChiSquaredModule, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ChiSquaredModule_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FitOptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FitOptions *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_FitOptions")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_FitOptions", 0, 0, 0)) SWIG_fail;
   result = (FitOptions *)new FitOptions();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FitOptions, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -46848,11 +45383,12 @@ SWIGINTERN PyObject *_wrap_FitOptions_derivEpsilon(PyObject *SWIGUNUSEDPARM(self
   FitOptions *arg1 = (FitOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitOptions_derivEpsilon",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitOptions_derivEpsilon" "', argument " "1"" of type '" "FitOptions const *""'"); 
   }
@@ -46873,16 +45409,15 @@ SWIGINTERN PyObject *_wrap_FitOptions_setDerivEpsilon(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitOptions_setDerivEpsilon",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitOptions_setDerivEpsilon", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitOptions_setDerivEpsilon" "', argument " "1"" of type '" "FitOptions *""'"); 
   }
   arg1 = reinterpret_cast< FitOptions * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitOptions_setDerivEpsilon" "', argument " "2"" of type '" "double""'");
   } 
@@ -46900,11 +45435,12 @@ SWIGINTERN PyObject *_wrap_FitOptions_stepFactor(PyObject *SWIGUNUSEDPARM(self),
   FitOptions *arg1 = (FitOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitOptions_stepFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitOptions_stepFactor" "', argument " "1"" of type '" "FitOptions const *""'"); 
   }
@@ -46925,16 +45461,15 @@ SWIGINTERN PyObject *_wrap_FitOptions_setStepFactor(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitOptions_setStepFactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitOptions_setStepFactor", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitOptions_setStepFactor" "', argument " "1"" of type '" "FitOptions *""'"); 
   }
   arg1 = reinterpret_cast< FitOptions * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitOptions_setStepFactor" "', argument " "2"" of type '" "double""'");
   } 
@@ -46952,10 +45487,11 @@ SWIGINTERN PyObject *_wrap_delete_FitOptions(PyObject *SWIGUNUSEDPARM(self), PyO
   FitOptions *arg1 = (FitOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FitOptions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitOptions, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitOptions, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FitOptions" "', argument " "1"" of type '" "FitOptions *""'"); 
   }
@@ -46970,19 +45506,24 @@ fail:
 
 SWIGINTERN PyObject *FitOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FitOptions, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FitOptions_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_PyBuilderCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyBuilderCallback *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_PyBuilderCallback",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (PyBuilderCallback *)new SwigDirector_PyBuilderCallback(arg1); 
@@ -47002,10 +45543,11 @@ SWIGINTERN PyObject *_wrap_delete_PyBuilderCallback(PyObject *SWIGUNUSEDPARM(sel
   PyBuilderCallback *arg1 = (PyBuilderCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PyBuilderCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PyBuilderCallback" "', argument " "1"" of type '" "PyBuilderCallback *""'"); 
   }
@@ -47026,20 +45568,19 @@ SWIGINTERN PyObject *_wrap_PyBuilderCallback_build_simulation(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   Simulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PyBuilderCallback_build_simulation",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyBuilderCallback, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PyBuilderCallback_build_simulation", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyBuilderCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyBuilderCallback_build_simulation" "', argument " "1"" of type '" "PyBuilderCallback *""'"); 
   }
   arg1 = reinterpret_cast< PyBuilderCallback * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyBuilderCallback_build_simulation" "', argument " "2"" of type '" "Fit::Parameters""'"); 
     }  
@@ -47052,7 +45593,7 @@ SWIGINTERN PyObject *_wrap_PyBuilderCallback_build_simulation(PyObject *SWIGUNUS
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (Simulation *)(arg1)->PyBuilderCallback::build_simulation(arg2);
@@ -47077,10 +45618,11 @@ SWIGINTERN PyObject *_wrap_disown_PyBuilderCallback(PyObject *SWIGUNUSEDPARM(sel
   PyBuilderCallback *arg1 = (PyBuilderCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_PyBuilderCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyBuilderCallback, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyBuilderCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_PyBuilderCallback" "', argument " "1"" of type '" "PyBuilderCallback *""'"); 
   }
@@ -47099,19 +45641,24 @@ fail:
 
 SWIGINTERN PyObject *PyBuilderCallback_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PyBuilderCallback, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyBuilderCallback_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_PyObserverCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObserverCallback *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_PyObserverCallback",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (PyObserverCallback *)new SwigDirector_PyObserverCallback(arg1); 
@@ -47131,10 +45678,11 @@ SWIGINTERN PyObject *_wrap_delete_PyObserverCallback(PyObject *SWIGUNUSEDPARM(se
   PyObserverCallback *arg1 = (PyObserverCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PyObserverCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyObserverCallback, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyObserverCallback, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PyObserverCallback" "', argument " "1"" of type '" "PyObserverCallback *""'"); 
   }
@@ -47155,18 +45703,17 @@ SWIGINTERN PyObject *_wrap_PyObserverCallback_update(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PyObserverCallback_update",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyObserverCallback, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PyObserverCallback_update", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyObserverCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyObserverCallback_update" "', argument " "1"" of type '" "PyObserverCallback *""'"); 
   }
   arg1 = reinterpret_cast< PyObserverCallback * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_FitObjective,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_FitObjective,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyObserverCallback_update" "', argument " "2"" of type '" "FitObjective const &""'"); 
   }
@@ -47175,7 +45722,7 @@ SWIGINTERN PyObject *_wrap_PyObserverCallback_update(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< FitObjective * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       (arg1)->PyObserverCallback::update((FitObjective const &)*arg2);
@@ -47197,10 +45744,11 @@ SWIGINTERN PyObject *_wrap_disown_PyObserverCallback(PyObject *SWIGUNUSEDPARM(se
   PyObserverCallback *arg1 = (PyObserverCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_PyObserverCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyObserverCallback, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyObserverCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_PyObserverCallback" "', argument " "1"" of type '" "PyObserverCallback *""'"); 
   }
@@ -47219,19 +45767,24 @@ fail:
 
 SWIGINTERN PyObject *PyObserverCallback_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PyObserverCallback, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyObserverCallback_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FitObjective(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FitObjective *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FitObjective",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (FitObjective *)new SwigDirector_FitObjective(arg1); 
@@ -47251,10 +45804,11 @@ SWIGINTERN PyObject *_wrap_delete_FitObjective(PyObject *SWIGUNUSEDPARM(self), P
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FitObjective",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FitObjective" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
@@ -47275,19 +45829,18 @@ SWIGINTERN PyObject *_wrap_FitObjective_evaluate_cpp(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_evaluate_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_evaluate_cpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_evaluate_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_evaluate_cpp" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -47296,7 +45849,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_evaluate_cpp(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< Fit::Parameters * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)(arg1)->FitObjective::evaluate((Fit::Parameters const &)*arg2);
@@ -47321,19 +45874,18 @@ SWIGINTERN PyObject *_wrap_FitObjective_evaluate_residuals_cpp(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_evaluate_residuals_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_evaluate_residuals_cpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_evaluate_residuals_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_evaluate_residuals_cpp" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -47342,7 +45894,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_evaluate_residuals_cpp(PyObject *SWIGUNU
   }
   arg2 = reinterpret_cast< Fit::Parameters * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (arg1)->FitObjective::evaluate_residuals((Fit::Parameters const &)*arg2);
@@ -47364,11 +45916,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_numberOfFitElements(PyObject *SWIGUNUSED
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_numberOfFitElements",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_numberOfFitElements" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47381,7 +45934,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_simulationResult__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_simulationResult__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   size_t arg2 ;
@@ -47389,17 +45942,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_simulationResult__SWIG_0(PyObject *SWIGU
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_simulationResult",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_simulationResult" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_simulationResult" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -47412,16 +45963,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_simulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_simulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_simulationResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_simulationResult" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47439,20 +45989,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_simulationResult(PyObject *self, PyObjec
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_simulationResult", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FitObjective_simulationResult__SWIG_1(self, args);
+      return _wrap_FitObjective_simulationResult__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -47466,13 +46012,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_simulationResult(PyObject *self, PyObjec
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FitObjective_simulationResult__SWIG_0(self, args);
+        return _wrap_FitObjective_simulationResult__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_simulationResult'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_simulationResult'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::simulationResult(size_t) const\n"
     "    FitObjective::simulationResult() const\n");
@@ -47480,7 +46026,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_experimentalData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_experimentalData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   size_t arg2 ;
@@ -47488,17 +46034,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_experimentalData__SWIG_0(PyObject *SWIGU
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_experimentalData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_experimentalData" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_experimentalData" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -47511,16 +46055,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_experimentalData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_experimentalData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_experimentalData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_experimentalData" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47538,20 +46081,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_experimentalData(PyObject *self, PyObjec
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_experimentalData", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FitObjective_experimentalData__SWIG_1(self, args);
+      return _wrap_FitObjective_experimentalData__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -47565,13 +46104,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_experimentalData(PyObject *self, PyObjec
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FitObjective_experimentalData__SWIG_0(self, args);
+        return _wrap_FitObjective_experimentalData__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_experimentalData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_experimentalData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::experimentalData(size_t) const\n"
     "    FitObjective::experimentalData() const\n");
@@ -47579,7 +46118,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   size_t arg2 ;
@@ -47587,17 +46126,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp__SWIG_0(PyObject *SW
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_uncertaintyData_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_uncertaintyData_cpp" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_uncertaintyData_cpp" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -47610,16 +46147,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_uncertaintyData_cpp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_uncertaintyData_cpp" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47637,20 +46173,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_uncertaintyData_cpp", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FitObjective_uncertaintyData_cpp__SWIG_1(self, args);
+      return _wrap_FitObjective_uncertaintyData_cpp__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -47664,13 +46196,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_uncertaintyData_cpp(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FitObjective_uncertaintyData_cpp__SWIG_0(self, args);
+        return _wrap_FitObjective_uncertaintyData_cpp__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_uncertaintyData_cpp'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_uncertaintyData_cpp'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::uncertaintyData(size_t) const\n"
     "    FitObjective::uncertaintyData() const\n");
@@ -47678,7 +46210,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   size_t arg2 ;
@@ -47686,17 +46218,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference__SWIG_0(PyObject *SWI
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_relativeDifference",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_relativeDifference" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_relativeDifference" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -47709,16 +46239,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_relativeDifference",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_relativeDifference" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47736,20 +46265,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference(PyObject *self, PyObj
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_relativeDifference", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FitObjective_relativeDifference__SWIG_1(self, args);
+      return _wrap_FitObjective_relativeDifference__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -47763,13 +46288,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_relativeDifference(PyObject *self, PyObj
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FitObjective_relativeDifference__SWIG_0(self, args);
+        return _wrap_FitObjective_relativeDifference__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_relativeDifference'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_relativeDifference'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::relativeDifference(size_t) const\n"
     "    FitObjective::relativeDifference() const\n");
@@ -47777,7 +46302,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   size_t arg2 ;
@@ -47785,17 +46310,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference__SWIG_0(PyObject *SWI
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_absoluteDifference",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_absoluteDifference" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_absoluteDifference" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -47808,16 +46331,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_absoluteDifference",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_absoluteDifference" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47835,20 +46357,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference(PyObject *self, PyObj
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_absoluteDifference", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FitObjective_absoluteDifference__SWIG_1(self, args);
+      return _wrap_FitObjective_absoluteDifference__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -47862,13 +46380,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_absoluteDifference(PyObject *self, PyObj
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FitObjective_absoluteDifference__SWIG_0(self, args);
+        return _wrap_FitObjective_absoluteDifference__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_absoluteDifference'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_absoluteDifference'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::absoluteDifference(size_t) const\n"
     "    FitObjective::absoluteDifference() const\n");
@@ -47881,11 +46399,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_experimental_array(PyObject *SWIGUNUSEDP
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_experimental_array",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_experimental_array" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47903,11 +46422,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_simulation_array(PyObject *SWIGUNUSEDPAR
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_simulation_array",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_simulation_array" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47925,11 +46445,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_uncertainties_cpp(PyObject *SWIGUNUSEDPA
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_uncertainties_cpp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_uncertainties_cpp" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47947,11 +46468,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_weights_array(PyObject *SWIGUNUSEDPARM(s
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_weights_array",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_weights_array" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -47972,16 +46494,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_initPrint(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_initPrint",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_initPrint", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_initPrint" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_initPrint" "', argument " "2"" of type '" "int""'");
   } 
@@ -48005,22 +46526,20 @@ SWIGINTERN PyObject *_wrap_FitObjective_initPlot_cpp(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FitObjective_initPlot_cpp",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_initPlot_cpp", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_initPlot_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_initPlot_cpp" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_PyObserverCallback,  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_PyObserverCallback,  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_initPlot_cpp" "', argument " "3"" of type '" "PyObserverCallback &""'"); 
   }
@@ -48041,11 +46560,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_iterationInfo(PyObject *SWIGUNUSEDPARM(s
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IterationInfo result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_iterationInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_iterationInfo" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -48063,11 +46583,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_minimizerResult(PyObject *SWIGUNUSEDPARM
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Fit::MinimizerResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_minimizerResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_minimizerResult" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -48088,16 +46609,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_finalize_cpp(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_finalize_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_finalize_cpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_finalize_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__MinimizerResult,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__MinimizerResult,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_finalize_cpp" "', argument " "2"" of type '" "Fit::MinimizerResult const &""'"); 
   }
@@ -48118,11 +46638,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_fitObjectCount(PyObject *SWIGUNUSEDPARM(
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_fitObjectCount",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_fitObjectCount" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -48143,16 +46664,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_run_simulations(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_run_simulations",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_run_simulations", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_run_simulations" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_run_simulations" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -48176,16 +46696,15 @@ SWIGINTERN PyObject *_wrap_FitObjective_setChiSquaredModule(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_setChiSquaredModule",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_setChiSquaredModule", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_setChiSquaredModule" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IChiSquaredModule,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IChiSquaredModule,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_setChiSquaredModule" "', argument " "2"" of type '" "IChiSquaredModule const &""'"); 
   }
@@ -48201,25 +46720,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_setObjectiveMetric",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_setObjectiveMetric" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_setObjectiveMetric" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -48238,7 +46755,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   std::string *arg2 = 0 ;
@@ -48247,19 +46764,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_1(PyObject *SWI
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FitObjective_setObjectiveMetric",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_setObjectiveMetric" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_setObjectiveMetric" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -48270,7 +46784,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric__SWIG_1(PyObject *SWI
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_setObjectiveMetric" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -48296,13 +46810,9 @@ SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric(PyObject *self, PyObj
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_setObjectiveMetric", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -48312,7 +46822,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric(PyObject *self, PyObj
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_FitObjective_setObjectiveMetric__SWIG_0(self, args);
+        return _wrap_FitObjective_setObjectiveMetric__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -48328,14 +46838,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_setObjectiveMetric(PyObject *self, PyObj
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_FitObjective_setObjectiveMetric__SWIG_1(self, args);
+          return _wrap_FitObjective_setObjectiveMetric__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_setObjectiveMetric'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_setObjectiveMetric'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::setObjectiveMetric(std::string const &)\n"
     "    FitObjective::setObjectiveMetric(std::string const &,std::string const &)\n");
@@ -48351,17 +46861,16 @@ SWIGINTERN PyObject *_wrap_FitObjective_containsUncertainties_cpp(PyObject *SWIG
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FitObjective_containsUncertainties_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_containsUncertainties_cpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_containsUncertainties_cpp" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitObjective_containsUncertainties_cpp" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -48379,11 +46888,12 @@ SWIGINTERN PyObject *_wrap_FitObjective_allPairsHaveUncertainties_cpp(PyObject *
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FitObjective_allPairsHaveUncertainties_cpp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_allPairsHaveUncertainties_cpp" "', argument " "1"" of type '" "FitObjective const *""'"); 
   }
@@ -48400,7 +46910,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_availableMetricOptions(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)":FitObjective_availableMetricOptions")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "FitObjective_availableMetricOptions", 0, 0, 0)) SWIG_fail;
   result = FitObjective::availableMetricOptions();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
@@ -48409,7 +46919,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48422,18 +46932,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObjec
   int res3 = SWIG_OLDOBJ ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48443,7 +46949,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48452,7 +46958,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObjec
     }
     arg3 = ptr;
   }
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "double""'");
   } 
@@ -48467,7 +46973,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48477,17 +46983,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(PyObjec
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48497,7 +47000,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48516,7 +47019,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48531,19 +47034,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObjec
   int res4 = SWIG_OLDOBJ ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48553,7 +47051,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48564,7 +47062,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObjec
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48573,7 +47071,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObjec
     }
     arg4 = ptr;
   }
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "5"" of type '" "double""'");
   } 
@@ -48590,7 +47088,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48602,18 +47100,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObjec
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48623,7 +47117,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48634,7 +47128,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObjec
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -48655,7 +47149,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48668,18 +47162,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(PyObjec
   int res3 = SWIG_OLDOBJ ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48689,7 +47179,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48698,7 +47188,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(PyObjec
     }
     arg3 = ptr;
   }
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "double""'");
   } 
@@ -48713,7 +47203,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48723,17 +47213,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(PyObjec
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48743,7 +47230,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(PyObjec
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48762,7 +47249,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48777,19 +47264,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObje
   int res4 = SWIG_OLDOBJ ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48799,7 +47281,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObje
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48810,7 +47292,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObje
   }
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48819,7 +47301,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(PyObje
     }
     arg4 = ptr;
   }
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "5"" of type '" "double""'");
   } 
@@ -48836,7 +47318,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FitObjective *arg1 = (FitObjective *) 0 ;
   PyBuilderCallback *arg2 = 0 ;
@@ -48848,18 +47330,14 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(PyObje
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:FitObjective_addSimulationAndData_cpp",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
   arg1 = reinterpret_cast< FitObjective * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback &""'"); 
   }
@@ -48869,7 +47347,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(PyObje
   arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48880,7 +47358,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(PyObje
   }
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -48906,13 +47384,9 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_addSimulationAndData_cpp", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -48920,13 +47394,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(self, args);
+          return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(self, argc, argv);
         }
       }
     }
@@ -48938,13 +47412,13 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(self, args);
+          return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_9(self, argc, argv);
         }
       }
     }
@@ -48956,7 +47430,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -48967,7 +47441,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(self, args);
+            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_8(self, argc, argv);
           }
         }
       }
@@ -48980,7 +47454,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
@@ -48991,7 +47465,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(self, args);
+            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(self, argc, argv);
           }
         }
       }
@@ -49004,7 +47478,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
@@ -49013,7 +47487,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(self, args);
+            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(self, argc, argv);
           }
         }
       }
@@ -49026,7 +47500,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -49035,7 +47509,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
           int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(self, args);
+            return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_11(self, argc, argv);
           }
         }
       }
@@ -49048,7 +47522,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -49062,7 +47536,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(self, args);
+              return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_10(self, argc, argv);
             }
           }
         }
@@ -49076,7 +47550,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
@@ -49090,7 +47564,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(self, args);
+              return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(self, argc, argv);
             }
           }
         }
@@ -49099,7 +47573,7 @@ SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitObjective_addSimulationAndData_cpp'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_addSimulationAndData_cpp'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FitObjective::addSimulationAndData< std::vector< double > >(PyBuilderCallback &,std::vector< double,std::allocator< double > > const &,double)\n"
     "    FitObjective::addSimulationAndData< std::vector< double > >(PyBuilderCallback &,std::vector< double,std::allocator< double > > const &)\n"
@@ -49118,10 +47592,11 @@ SWIGINTERN PyObject *_wrap_disown_FitObjective(PyObject *SWIGUNUSEDPARM(self), P
   FitObjective *arg1 = (FitObjective *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_FitObjective",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_FitObjective" "', argument " "1"" of type '" "FitObjective *""'"); 
   }
@@ -49140,21 +47615,26 @@ fail:
 
 SWIGINTERN PyObject *FitObjective_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FitObjective, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FitObjective_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_StandardNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:StandardNormal",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "StandardNormal" "', argument " "1"" of type '" "double""'");
   } 
@@ -49178,23 +47658,21 @@ SWIGINTERN PyObject *_wrap_Gaussian(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Gaussian",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Gaussian", 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 '" "Gaussian" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Gaussian" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Gaussian" "', argument " "3"" of type '" "double""'");
   } 
@@ -49218,23 +47696,21 @@ SWIGINTERN PyObject *_wrap_IntegratedGaussian(PyObject *SWIGUNUSEDPARM(self), Py
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntegratedGaussian",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "IntegratedGaussian", 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 '" "IntegratedGaussian" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntegratedGaussian" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntegratedGaussian" "', argument " "3"" of type '" "double""'");
   } 
@@ -49252,11 +47728,12 @@ SWIGINTERN PyObject *_wrap_cot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cot",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "cot" "', argument " "1"" of type '" "double""'");
   } 
@@ -49274,11 +47751,12 @@ SWIGINTERN PyObject *_wrap_Si(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Si",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "Si" "', argument " "1"" of type '" "double""'");
   } 
@@ -49291,16 +47769,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sinc__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sinc__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:sinc",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "sinc" "', argument " "1"" of type '" "double""'");
   } 
@@ -49313,16 +47790,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sinc__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sinc__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:sinc",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "sinc" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -49340,13 +47816,9 @@ SWIGINTERN PyObject *_wrap_sinc(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "sinc", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -49354,7 +47826,7 @@ SWIGINTERN PyObject *_wrap_sinc(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_sinc__SWIG_0(self, args);
+      return _wrap_sinc__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -49364,12 +47836,12 @@ SWIGINTERN PyObject *_wrap_sinc(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_sinc__SWIG_1(self, args);
+      return _wrap_sinc__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'sinc'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'sinc'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MathFunctions::sinc(double)\n"
     "    MathFunctions::sinc(complex_t const)\n");
@@ -49382,11 +47854,12 @@ SWIGINTERN PyObject *_wrap_tanhc(PyObject *SWIGUNUSEDPARM(self), PyObject *args)
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:tanhc",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "tanhc" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -49407,17 +47880,16 @@ SWIGINTERN PyObject *_wrap_Laue(PyObject *SWIGUNUSEDPARM(self), PyObject *args)
   int ecode1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Laue",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Laue", 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 '" "Laue" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Laue" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -49435,11 +47907,12 @@ SWIGINTERN PyObject *_wrap_erf(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:erf",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "erf" "', argument " "1"" of type '" "double""'");
   } 
@@ -49452,16 +47925,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J0__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J0__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J0",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J0" "', argument " "1"" of type '" "double""'");
   } 
@@ -49474,16 +47946,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J1",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J1" "', argument " "1"" of type '" "double""'");
   } 
@@ -49496,16 +47967,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J1c__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J1c__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J1c",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J1c" "', argument " "1"" of type '" "double""'");
   } 
@@ -49523,11 +47993,12 @@ SWIGINTERN PyObject *_wrap_Bessel_I0(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_I0",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "Bessel_I0" "', argument " "1"" of type '" "double""'");
   } 
@@ -49540,16 +48011,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J0__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J0__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J0",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J0" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -49567,13 +48037,9 @@ SWIGINTERN PyObject *_wrap_Bessel_J0(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Bessel_J0", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -49581,7 +48047,7 @@ SWIGINTERN PyObject *_wrap_Bessel_J0(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J0__SWIG_0(self, args);
+      return _wrap_Bessel_J0__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -49591,12 +48057,12 @@ SWIGINTERN PyObject *_wrap_Bessel_J0(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J0__SWIG_1(self, args);
+      return _wrap_Bessel_J0__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Bessel_J0'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Bessel_J0'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MathFunctions::Bessel_J0(double)\n"
     "    MathFunctions::Bessel_J0(complex_t const)\n");
@@ -49604,16 +48070,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J1",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J1" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -49631,13 +48096,9 @@ SWIGINTERN PyObject *_wrap_Bessel_J1(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Bessel_J1", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -49645,7 +48106,7 @@ SWIGINTERN PyObject *_wrap_Bessel_J1(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J1__SWIG_0(self, args);
+      return _wrap_Bessel_J1__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -49655,12 +48116,12 @@ SWIGINTERN PyObject *_wrap_Bessel_J1(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J1__SWIG_1(self, args);
+      return _wrap_Bessel_J1__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Bessel_J1'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Bessel_J1'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MathFunctions::Bessel_J1(double)\n"
     "    MathFunctions::Bessel_J1(complex_t const)\n");
@@ -49668,16 +48129,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Bessel_J1c__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Bessel_J1c__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   complex_t arg1 ;
   std::complex< double > val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Bessel_J1c",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Bessel_J1c" "', argument " "1"" of type '" "complex_t""'");
   } 
@@ -49695,13 +48155,9 @@ SWIGINTERN PyObject *_wrap_Bessel_J1c(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Bessel_J1c", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -49709,7 +48165,7 @@ SWIGINTERN PyObject *_wrap_Bessel_J1c(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J1c__SWIG_0(self, args);
+      return _wrap_Bessel_J1c__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -49719,12 +48175,12 @@ SWIGINTERN PyObject *_wrap_Bessel_J1c(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_Bessel_J1c__SWIG_1(self, args);
+      return _wrap_Bessel_J1c__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Bessel_J1c'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Bessel_J1c'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MathFunctions::Bessel_J1c(double)\n"
     "    MathFunctions::Bessel_J1c(complex_t const)\n");
@@ -49732,21 +48188,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< complex_t,std::allocator< complex_t > > *arg1 = 0 ;
   MathFunctions::EFFTDirection arg2 ;
   int res1 = SWIG_OLDOBJ ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< complex_t,std::allocator< complex_t > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FastFourierTransform",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FastFourierTransform" "', argument " "1"" of type '" "std::vector< complex_t,std::allocator< complex_t > > const &""'"); 
     }
@@ -49755,7 +48209,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FastFourierTransform" "', argument " "2"" of type '" "MathFunctions::EFFTDirection""'");
   } 
@@ -49770,21 +48224,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double,std::allocator< double > > *arg1 = 0 ;
   MathFunctions::EFFTDirection arg2 ;
   int res1 = SWIG_OLDOBJ ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< complex_t,std::allocator< complex_t > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FastFourierTransform",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FastFourierTransform" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -49793,7 +48245,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FastFourierTransform" "', argument " "2"" of type '" "MathFunctions::EFFTDirection""'");
   } 
@@ -49813,13 +48265,9 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FastFourierTransform", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -49830,7 +48278,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FastFourierTransform__SWIG_0(self, args);
+        return _wrap_FastFourierTransform__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -49844,13 +48292,13 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FastFourierTransform__SWIG_1(self, args);
+        return _wrap_FastFourierTransform__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FastFourierTransform'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FastFourierTransform'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MathFunctions::FastFourierTransform(std::vector< complex_t,std::allocator< complex_t > > const &,MathFunctions::EFFTDirection)\n"
     "    MathFunctions::FastFourierTransform(std::vector< double,std::allocator< double > > const &,MathFunctions::EFFTDirection)\n");
@@ -49864,14 +48312,13 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
   int res1 = SWIG_OLDOBJ ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::vector< complex_t,std::allocator< complex_t > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ConvolveFFT",&obj0,&obj1)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "ConvolveFFT", 2, 2, swig_obj)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvolveFFT" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -49882,7 +48329,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvolveFFT" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -49907,7 +48354,7 @@ SWIGINTERN PyObject *_wrap_GenerateUniformRandom(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GenerateUniformRandom")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GenerateUniformRandom", 0, 0, 0)) SWIG_fail;
   result = (double)MathFunctions::GenerateUniformRandom();
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
@@ -49920,7 +48367,7 @@ SWIGINTERN PyObject *_wrap_GenerateStandardNormalRandom(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)":GenerateStandardNormalRandom")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "GenerateStandardNormalRandom", 0, 0, 0)) SWIG_fail;
   result = (double)MathFunctions::GenerateStandardNormalRandom();
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
@@ -49937,17 +48384,16 @@ SWIGINTERN PyObject *_wrap_GenerateNormalRandom(PyObject *SWIGUNUSEDPARM(self),
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:GenerateNormalRandom",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "GenerateNormalRandom", 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 '" "GenerateNormalRandom" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GenerateNormalRandom" "', argument " "2"" of type '" "double""'");
   } 
@@ -49965,11 +48411,12 @@ SWIGINTERN PyObject *_wrap_GeneratePoissonRandom(PyObject *SWIGUNUSEDPARM(self),
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GeneratePoissonRandom",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "GeneratePoissonRandom" "', argument " "1"" of type '" "double""'");
   } 
@@ -49985,11 +48432,12 @@ fail:
 SWIGINTERN PyObject *_wrap_new_IMultiLayerBuilder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IMultiLayerBuilder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IMultiLayerBuilder",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (IMultiLayerBuilder *)new SwigDirector_IMultiLayerBuilder(arg1); 
@@ -50015,17 +48463,18 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_buildSample(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder const > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder const > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_buildSample",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_buildSample" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_buildSample" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr< const IMultiLayerBuilder > * >(argp1);
@@ -50037,7 +48486,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_buildSample(PyObject *SWIGUNUSEDPA
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IMultiLayerBuilder::buildSample");
@@ -50057,7 +48506,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ;
   size_t arg2 ;
@@ -50067,18 +48516,16 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWI
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Swig::Director *director = 0;
   bool upcall = false;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IMultiLayerBuilder_createSample",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createSample" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createSample" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50089,13 +48536,13 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWI
       arg1 = const_cast< IMultiLayerBuilder * >((smartarg1 ? smartarg1->get() : 0));
     }
   }
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IMultiLayerBuilder_createSample" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (MultiLayer *)(arg1)->IMultiLayerBuilder::createSample(arg2);
@@ -50115,24 +48562,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
   Swig::Director *director = 0;
   bool upcall = false;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_createSample",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createSample" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createSample" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50144,7 +48590,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_1(PyObject *SWI
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (MultiLayer *)(arg1)->IMultiLayerBuilder::createSample();
@@ -50169,19 +48615,15 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample(PyObject *self, PyObj
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IMultiLayerBuilder_createSample", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IMultiLayerBuilder_createSample__SWIG_1(self, args);
+      return _wrap_IMultiLayerBuilder_createSample__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -50194,13 +48636,13 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample(PyObject *self, PyObj
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IMultiLayerBuilder_createSample__SWIG_0(self, args);
+        return _wrap_IMultiLayerBuilder_createSample__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IMultiLayerBuilder_createSample'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IMultiLayerBuilder_createSample'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IMultiLayerBuilder::createSample(size_t)\n"
     "    IMultiLayerBuilder::createSample()\n");
@@ -50215,17 +48657,18 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_size(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_size",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_size" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_size" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50237,7 +48680,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_size(PyObject *SWIGUNUSEDPARM(self
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (arg1)->IMultiLayerBuilder::size();
@@ -50266,17 +48709,15 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_registerParameter(PyObject *SWIGUN
   int res2 = SWIG_OLDOBJ ;
   long long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IMultiLayerBuilder_registerParameter",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IMultiLayerBuilder_registerParameter", 3, 3, swig_obj)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_registerParameter" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_registerParameter" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50289,7 +48730,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_registerParameter(PyObject *SWIGUN
   }
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IMultiLayerBuilder_registerParameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -50298,7 +48739,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_registerParameter(PyObject *SWIGUN
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_long_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_long_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IMultiLayerBuilder_registerParameter" "', argument " "3"" of type '" "int64_t""'");
   } 
@@ -50325,16 +48766,14 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_setParameterValue(PyObject *SWIGUN
   int res2 = SWIG_OLDOBJ ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IMultiLayerBuilder_setParameterValue",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IMultiLayerBuilder_setParameterValue", 3, 3, swig_obj)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_setParameterValue" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_setParameterValue" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50347,7 +48786,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_setParameterValue(PyObject *SWIGUN
   }
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IMultiLayerBuilder_setParameterValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -50356,7 +48795,7 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_setParameterValue(PyObject *SWIGUN
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IMultiLayerBuilder_setParameterValue" "', argument " "3"" of type '" "double""'");
   } 
@@ -50378,15 +48817,16 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_parametersToString(PyObject *SWIGU
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder const > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder const > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_parametersToString",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_parametersToString" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_parametersToString" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr< const IMultiLayerBuilder > * >(argp1);
@@ -50412,15 +48852,16 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createParameterTree(PyObject *SWIG
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder const > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder const > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_createParameterTree",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createParameterTree" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createParameterTree" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr< const IMultiLayerBuilder > * >(argp1);
@@ -50446,15 +48887,16 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_parameterPool(PyObject *SWIGUNUSED
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder const > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder const > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_parameterPool",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_parameterPool" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_parameterPool" "', argument " "1"" of type '" "IMultiLayerBuilder const *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr< const IMultiLayerBuilder > * >(argp1);
@@ -50480,14 +48922,15 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_onChange(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMultiLayerBuilder_onChange",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_onChange" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_onChange" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50513,14 +48956,15 @@ SWIGINTERN PyObject *_wrap_delete_IMultiLayerBuilder(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IMultiLayerBuilder",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IMultiLayerBuilder" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IMultiLayerBuilder" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50546,14 +48990,15 @@ SWIGINTERN PyObject *_wrap_disown_IMultiLayerBuilder(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
   std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_IMultiLayerBuilder",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 |  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IMultiLayerBuilder" "', argument " "1"" of type '" "IMultiLayerBuilder *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IMultiLayerBuilder" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
     }
     if (newmem & SWIG_CAST_NEW_MEMORY) {
       tempshared1 = *reinterpret_cast< std::shared_ptr<  IMultiLayerBuilder > * >(argp1);
@@ -50578,16 +49023,20 @@ fail:
 
 SWIGINTERN PyObject *IMultiLayerBuilder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IMultiLayerBuilder_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_INodeVisitor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   INodeVisitor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_INodeVisitor")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_INodeVisitor", 0, 0, 0)) SWIG_fail;
   result = (INodeVisitor *)new INodeVisitor();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_INodeVisitor, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -50601,10 +49050,11 @@ SWIGINTERN PyObject *_wrap_delete_INodeVisitor(PyObject *SWIGUNUSEDPARM(self), P
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_INodeVisitor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_INodeVisitor" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
@@ -50617,7 +49067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   BasicLattice *arg2 = (BasicLattice *) 0 ;
@@ -50625,16 +49075,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "BasicLattice const *""'"); 
   }
@@ -50647,7 +49095,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   Beam *arg2 = (Beam *) 0 ;
@@ -50655,16 +49103,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Beam, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_Beam, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "Beam const *""'"); 
   }
@@ -50677,7 +49123,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ConstantBackground *arg2 = (ConstantBackground *) 0 ;
@@ -50685,16 +49131,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_2(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ConstantBackground, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ConstantBackground, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ConstantBackground const *""'"); 
   }
@@ -50707,7 +49151,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ConvolutionDetectorResolution *arg2 = (ConvolutionDetectorResolution *) 0 ;
@@ -50715,16 +49159,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_3(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ConvolutionDetectorResolution, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ConvolutionDetectorResolution, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ConvolutionDetectorResolution const *""'"); 
   }
@@ -50737,7 +49179,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   Crystal *arg2 = (Crystal *) 0 ;
@@ -50745,16 +49187,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_4(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Crystal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "Crystal const *""'"); 
   }
@@ -50767,7 +49207,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionCosine *arg2 = (DistributionCosine *) 0 ;
@@ -50775,16 +49215,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_5(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionCosine const *""'"); 
   }
@@ -50797,7 +49235,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionGate *arg2 = (DistributionGate *) 0 ;
@@ -50805,16 +49243,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_6(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionGate const *""'"); 
   }
@@ -50827,7 +49263,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionGaussian *arg2 = (DistributionGaussian *) 0 ;
@@ -50835,16 +49271,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_7(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionGaussian const *""'"); 
   }
@@ -50857,7 +49291,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_8(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionLogNormal *arg2 = (DistributionLogNormal *) 0 ;
@@ -50865,16 +49299,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_8(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -50887,7 +49319,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_9(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionLorentz *arg2 = (DistributionLorentz *) 0 ;
@@ -50895,16 +49327,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_9(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionLorentz const *""'"); 
   }
@@ -50917,7 +49347,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_10(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   DistributionTrapezoid *arg2 = (DistributionTrapezoid *) 0 ;
@@ -50925,16 +49355,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_10(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -50947,7 +49375,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_11(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FootprintFactorGaussian *arg2 = (FootprintFactorGaussian *) 0 ;
@@ -50955,16 +49383,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_11(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FootprintFactorGaussian const *""'"); 
   }
@@ -50977,7 +49403,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_12(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_12(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FootprintFactorSquare *arg2 = (FootprintFactorSquare *) 0 ;
@@ -50985,16 +49411,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_12(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FootprintFactorSquare const *""'"); 
   }
@@ -51007,7 +49431,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_13(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_13(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorAnisoPyramid *arg2 = (FormFactorAnisoPyramid *) 0 ;
@@ -51015,16 +49439,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_13(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -51037,7 +49459,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_14(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_14(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorBox *arg2 = (FormFactorBox *) 0 ;
@@ -51045,16 +49467,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_14(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorBox const *""'"); 
   }
@@ -51067,7 +49487,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_15(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_15(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCone *arg2 = (FormFactorCone *) 0 ;
@@ -51075,16 +49495,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_15(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCone const *""'"); 
   }
@@ -51097,7 +49515,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_16(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_16(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCone6 *arg2 = (FormFactorCone6 *) 0 ;
@@ -51105,16 +49523,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_16(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCone6 const *""'"); 
   }
@@ -51127,7 +49543,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_17(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_17(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCoreShell *arg2 = (FormFactorCoreShell *) 0 ;
@@ -51135,16 +49551,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_17(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCoreShell, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCoreShell const *""'"); 
   }
@@ -51157,7 +49571,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_18(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_18(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCrystal *arg2 = (FormFactorCrystal *) 0 ;
@@ -51165,16 +49579,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_18(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCrystal const *""'"); 
   }
@@ -51187,7 +49599,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_19(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_19(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCuboctahedron *arg2 = (FormFactorCuboctahedron *) 0 ;
@@ -51195,16 +49607,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_19(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -51217,7 +49627,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_20(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_20(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorCylinder *arg2 = (FormFactorCylinder *) 0 ;
@@ -51225,16 +49635,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_20(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCylinder const *""'"); 
   }
@@ -51247,7 +49655,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_21(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_21(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDecoratorMaterial *arg2 = (FormFactorDecoratorMaterial *) 0 ;
@@ -51255,16 +49663,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_21(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDecoratorMaterial, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDecoratorMaterial, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDecoratorMaterial const *""'"); 
   }
@@ -51277,7 +49683,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_22(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_22(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDecoratorPositionFactor *arg2 = (FormFactorDecoratorPositionFactor *) 0 ;
@@ -51285,16 +49691,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_22(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDecoratorPositionFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDecoratorPositionFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDecoratorPositionFactor const *""'"); 
   }
@@ -51307,7 +49711,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_23(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_23(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDecoratorRotation *arg2 = (FormFactorDecoratorRotation *) 0 ;
@@ -51315,16 +49719,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_23(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDecoratorRotation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDecoratorRotation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDecoratorRotation const *""'"); 
   }
@@ -51337,7 +49739,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_24(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_24(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDodecahedron *arg2 = (FormFactorDodecahedron *) 0 ;
@@ -51345,16 +49747,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_24(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDodecahedron const *""'"); 
   }
@@ -51367,7 +49767,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_25(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_25(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDWBA *arg2 = (FormFactorDWBA *) 0 ;
@@ -51375,16 +49775,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_25(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDWBA, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDWBA, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDWBA const *""'"); 
   }
@@ -51397,7 +49795,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_26(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_26(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDWBAPol *arg2 = (FormFactorDWBAPol *) 0 ;
@@ -51405,16 +49803,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_26(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDWBAPol, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDWBAPol, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDWBAPol const *""'"); 
   }
@@ -51427,7 +49823,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_27(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_27(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorEllipsoidalCylinder *arg2 = (FormFactorEllipsoidalCylinder *) 0 ;
@@ -51435,16 +49831,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_27(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -51457,7 +49851,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_28(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_28(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorFullSphere *arg2 = (FormFactorFullSphere *) 0 ;
@@ -51465,16 +49859,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_28(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorFullSphere const *""'"); 
   }
@@ -51487,7 +49879,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_29(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_29(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorFullSpheroid *arg2 = (FormFactorFullSpheroid *) 0 ;
@@ -51495,16 +49887,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_29(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
@@ -51517,7 +49907,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_30(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_30(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorGauss *arg2 = (FormFactorGauss *) 0 ;
@@ -51525,16 +49915,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_30(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorGauss const *""'"); 
   }
@@ -51547,7 +49935,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_31(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_31(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorHemiEllipsoid *arg2 = (FormFactorHemiEllipsoid *) 0 ;
@@ -51555,16 +49943,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_31(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -51577,7 +49963,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_32(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_32(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorIcosahedron *arg2 = (FormFactorIcosahedron *) 0 ;
@@ -51585,16 +49971,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_32(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorIcosahedron const *""'"); 
   }
@@ -51607,7 +49991,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_33(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_33(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorLongBox *arg2 = (FormFactorLongBox *) 0 ;
@@ -51615,16 +49999,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_33(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -51637,7 +50019,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_34(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_34(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorLongBoxGauss *arg2 = (FormFactorLongBoxGauss *) 0 ;
@@ -51645,16 +50027,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_34(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -51667,7 +50047,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_35(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_35(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorLongBoxLorentz *arg2 = (FormFactorLongBoxLorentz *) 0 ;
@@ -51675,16 +50055,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_35(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -51697,7 +50075,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_36(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_36(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorLorentz *arg2 = (FormFactorLorentz *) 0 ;
@@ -51705,16 +50083,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_36(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorLorentz const *""'"); 
   }
@@ -51727,7 +50103,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_37(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_37(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorPrism3 *arg2 = (FormFactorPrism3 *) 0 ;
@@ -51735,16 +50111,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_37(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorPrism3 const *""'"); 
   }
@@ -51757,7 +50131,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_38(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_38(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorPrism6 *arg2 = (FormFactorPrism6 *) 0 ;
@@ -51765,16 +50139,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_38(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorPrism6 const *""'"); 
   }
@@ -51787,7 +50159,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_39(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_39(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorPyramid *arg2 = (FormFactorPyramid *) 0 ;
@@ -51795,16 +50167,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_39(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorPyramid const *""'"); 
   }
@@ -51817,7 +50187,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_40(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_40(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorRipple1 *arg2 = (FormFactorRipple1 *) 0 ;
@@ -51825,16 +50195,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_40(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -51847,7 +50215,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_41(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_41(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorRipple2 *arg2 = (FormFactorRipple2 *) 0 ;
@@ -51855,16 +50223,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_41(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -51877,7 +50243,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_42(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_42(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorSphereGaussianRadius *arg2 = (FormFactorSphereGaussianRadius *) 0 ;
@@ -51885,16 +50251,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_42(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
@@ -51907,7 +50271,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_43(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_43(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorSphereLogNormalRadius *arg2 = (FormFactorSphereLogNormalRadius *) 0 ;
@@ -51915,16 +50279,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_43(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
@@ -51937,7 +50299,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_44(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_44(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorTetrahedron *arg2 = (FormFactorTetrahedron *) 0 ;
@@ -51945,16 +50307,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_44(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorTetrahedron const *""'"); 
   }
@@ -51967,7 +50327,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_45(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_45(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorDot *arg2 = (FormFactorDot *) 0 ;
@@ -51975,16 +50335,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_45(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorDot, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorDot, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorDot const *""'"); 
   }
@@ -51997,7 +50355,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_46(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_46(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorTruncatedCube *arg2 = (FormFactorTruncatedCube *) 0 ;
@@ -52005,16 +50363,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_46(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorTruncatedCube const *""'"); 
   }
@@ -52027,7 +50383,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_47(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_47(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorTruncatedSphere *arg2 = (FormFactorTruncatedSphere *) 0 ;
@@ -52035,16 +50391,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_47(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -52057,7 +50411,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_48(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_48(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorTruncatedSpheroid *arg2 = (FormFactorTruncatedSpheroid *) 0 ;
@@ -52065,16 +50419,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_48(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -52087,7 +50439,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_49(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_49(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FormFactorWeighted *arg2 = (FormFactorWeighted *) 0 ;
@@ -52095,16 +50447,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_49(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorWeighted const *""'"); 
   }
@@ -52117,7 +50467,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_50(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_50(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction1DCauchy *arg2 = (FTDecayFunction1DCauchy *) 0 ;
@@ -52125,16 +50475,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_50(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction1DCauchy const *""'"); 
   }
@@ -52147,7 +50495,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_51(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_51(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction1DGauss *arg2 = (FTDecayFunction1DGauss *) 0 ;
@@ -52155,16 +50503,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_51(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction1DGauss const *""'"); 
   }
@@ -52177,7 +50523,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_52(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_52(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction1DTriangle *arg2 = (FTDecayFunction1DTriangle *) 0 ;
@@ -52185,16 +50531,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_52(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction1DTriangle const *""'"); 
   }
@@ -52207,7 +50551,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_53(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_53(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction1DVoigt *arg2 = (FTDecayFunction1DVoigt *) 0 ;
@@ -52215,16 +50559,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_53(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction1DVoigt const *""'"); 
   }
@@ -52237,7 +50579,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_54(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_54(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction2DCauchy *arg2 = (FTDecayFunction2DCauchy *) 0 ;
@@ -52245,16 +50587,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_54(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction2DCauchy const *""'"); 
   }
@@ -52267,7 +50607,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_55(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_55(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction2DGauss *arg2 = (FTDecayFunction2DGauss *) 0 ;
@@ -52275,16 +50615,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_55(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction2DGauss const *""'"); 
   }
@@ -52297,7 +50635,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_56(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_56(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDecayFunction2DVoigt *arg2 = (FTDecayFunction2DVoigt *) 0 ;
@@ -52305,16 +50643,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_56(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDecayFunction2DVoigt const *""'"); 
   }
@@ -52327,7 +50663,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_57(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_57(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DCauchy *arg2 = (FTDistribution1DCauchy *) 0 ;
@@ -52335,16 +50671,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_57(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DCauchy const *""'"); 
   }
@@ -52357,7 +50691,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_58(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_58(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DCosine *arg2 = (FTDistribution1DCosine *) 0 ;
@@ -52365,16 +50699,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_58(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DCosine const *""'"); 
   }
@@ -52387,7 +50719,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_59(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_59(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DGate *arg2 = (FTDistribution1DGate *) 0 ;
@@ -52395,16 +50727,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_59(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DGate const *""'"); 
   }
@@ -52417,7 +50747,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_60(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_60(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DGauss *arg2 = (FTDistribution1DGauss *) 0 ;
@@ -52425,16 +50755,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_60(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DGauss const *""'"); 
   }
@@ -52447,7 +50775,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_61(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_61(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DTriangle *arg2 = (FTDistribution1DTriangle *) 0 ;
@@ -52455,16 +50783,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_61(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DTriangle const *""'"); 
   }
@@ -52477,7 +50803,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_62(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_62(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution1DVoigt *arg2 = (FTDistribution1DVoigt *) 0 ;
@@ -52485,16 +50811,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_62(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
@@ -52507,7 +50831,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_63(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_63(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution2DCauchy *arg2 = (FTDistribution2DCauchy *) 0 ;
@@ -52515,16 +50839,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_63(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution2DCauchy const *""'"); 
   }
@@ -52537,7 +50859,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_64(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_64(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution2DCone *arg2 = (FTDistribution2DCone *) 0 ;
@@ -52545,16 +50867,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_64(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution2DCone const *""'"); 
   }
@@ -52567,7 +50887,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_65(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_65(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution2DGate *arg2 = (FTDistribution2DGate *) 0 ;
@@ -52575,16 +50895,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_65(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution2DGate const *""'"); 
   }
@@ -52597,7 +50915,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_66(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_66(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution2DGauss *arg2 = (FTDistribution2DGauss *) 0 ;
@@ -52605,16 +50923,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_66(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution2DGauss const *""'"); 
   }
@@ -52627,7 +50943,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_67(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_67(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   FTDistribution2DVoigt *arg2 = (FTDistribution2DVoigt *) 0 ;
@@ -52635,16 +50951,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_67(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FTDistribution2DVoigt const *""'"); 
   }
@@ -52657,7 +50971,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_68(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_68(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   GISASSimulation *arg2 = (GISASSimulation *) 0 ;
@@ -52665,16 +50979,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_68(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "GISASSimulation const *""'"); 
   }
@@ -52687,7 +50999,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_69(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_69(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   HexagonalLattice *arg2 = (HexagonalLattice *) 0 ;
@@ -52695,16 +51007,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_69(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -52717,7 +51027,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_70(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_70(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IAbstractParticle *arg2 = (IAbstractParticle *) 0 ;
@@ -52725,16 +51035,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_70(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IAbstractParticle const *""'"); 
   }
@@ -52747,7 +51055,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_71(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_71(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IClusteredParticles *arg2 = (IClusteredParticles *) 0 ;
@@ -52755,16 +51063,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_71(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IClusteredParticles const *""'"); 
   }
@@ -52777,7 +51083,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_72(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_72(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IdentityRotation *arg2 = (IdentityRotation *) 0 ;
@@ -52785,16 +51091,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_72(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IdentityRotation const *""'"); 
   }
@@ -52807,7 +51111,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_73(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_73(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IFormFactor *arg2 = (IFormFactor *) 0 ;
@@ -52815,16 +51119,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_73(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IFormFactor const *""'"); 
   }
@@ -52837,7 +51139,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_74(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_74(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IFormFactorBorn *arg2 = (IFormFactorBorn *) 0 ;
@@ -52845,16 +51147,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_74(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IFormFactorBorn const *""'"); 
   }
@@ -52867,7 +51167,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_75(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_75(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IFormFactorDecorator *arg2 = (IFormFactorDecorator *) 0 ;
@@ -52875,16 +51175,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_75(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IFormFactorDecorator const *""'"); 
   }
@@ -52897,7 +51195,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_76(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_76(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IInterferenceFunction *arg2 = (IInterferenceFunction *) 0 ;
@@ -52905,16 +51203,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_76(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IInterferenceFunction const *""'"); 
   }
@@ -52927,7 +51223,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_77(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_77(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ILayout *arg2 = (ILayout *) 0 ;
@@ -52935,16 +51231,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_77(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ILayout, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ILayout const *""'"); 
   }
@@ -52957,7 +51251,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_78(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_78(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   INode *arg2 = (INode *) 0 ;
@@ -52965,16 +51259,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_78(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "INode const *""'"); 
   }
@@ -52987,7 +51279,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_79(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_79(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   Instrument *arg2 = (Instrument *) 0 ;
@@ -52995,16 +51287,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_79(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Instrument, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "Instrument const *""'"); 
   }
@@ -53017,7 +51307,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_80(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_80(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IntensityNormalizer *arg2 = (IntensityNormalizer *) 0 ;
@@ -53025,16 +51315,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_80(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IntensityNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IntensityNormalizer const *""'"); 
   }
@@ -53047,7 +51335,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_81(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_81(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IntensityScaleAndShiftNormalizer *arg2 = (IntensityScaleAndShiftNormalizer *) 0 ;
@@ -53055,16 +51343,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_81(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IntensityScaleAndShiftNormalizer const *""'"); 
   }
@@ -53077,7 +51363,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_82(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_82(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunction1DLattice *arg2 = (InterferenceFunction1DLattice *) 0 ;
@@ -53085,16 +51371,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_82(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunction1DLattice const *""'"); 
   }
@@ -53107,7 +51391,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_83(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_83(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunction2DLattice *arg2 = (InterferenceFunction2DLattice *) 0 ;
@@ -53115,16 +51399,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_83(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -53137,7 +51419,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_84(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_84(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunction2DParaCrystal *arg2 = (InterferenceFunction2DParaCrystal *) 0 ;
@@ -53145,16 +51427,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_84(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -53167,7 +51447,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_85(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_85(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunction2DSuperLattice *arg2 = (InterferenceFunction2DSuperLattice *) 0 ;
@@ -53175,16 +51455,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_85(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -53197,7 +51475,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_86(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_86(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunction3DLattice *arg2 = (InterferenceFunction3DLattice *) 0 ;
@@ -53205,16 +51483,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_86(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
@@ -53227,7 +51503,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_87(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_87(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionFinite2DLattice *arg2 = (InterferenceFunctionFinite2DLattice *) 0 ;
@@ -53235,16 +51511,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_87(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -53257,7 +51531,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_88(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_88(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionFinite3DLattice *arg2 = (InterferenceFunctionFinite3DLattice *) 0 ;
@@ -53265,16 +51539,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_88(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -53287,7 +51559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_89(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_89(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionHardDisk *arg2 = (InterferenceFunctionHardDisk *) 0 ;
@@ -53295,16 +51567,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_89(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
@@ -53317,7 +51587,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_90(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_90(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionRadialParaCrystal *arg2 = (InterferenceFunctionRadialParaCrystal *) 0 ;
@@ -53325,16 +51595,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_90(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -53347,7 +51615,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_91(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_91(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionTwin *arg2 = (InterferenceFunctionTwin *) 0 ;
@@ -53355,16 +51623,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_91(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
@@ -53377,7 +51643,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_92(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_92(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   InterferenceFunctionNone *arg2 = (InterferenceFunctionNone *) 0 ;
@@ -53385,16 +51651,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_92(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "InterferenceFunctionNone const *""'"); 
   }
@@ -53407,7 +51671,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_93(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_93(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IParticle *arg2 = (IParticle *) 0 ;
@@ -53415,16 +51679,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_93(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IParticle, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IParticle const *""'"); 
   }
@@ -53437,7 +51699,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_94(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_94(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IPeakShape *arg2 = (IPeakShape *) 0 ;
@@ -53445,16 +51707,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_94(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IPeakShape, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IPeakShape const *""'"); 
   }
@@ -53467,7 +51727,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_95(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_95(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IRotation *arg2 = (IRotation *) 0 ;
@@ -53475,16 +51735,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_95(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IRotation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IRotation const *""'"); 
   }
@@ -53497,7 +51755,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_96(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_96(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ISample *arg2 = (ISample *) 0 ;
@@ -53505,16 +51763,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_96(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ISample, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ISample, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ISample const *""'"); 
   }
@@ -53527,7 +51783,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_97(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_97(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   IsGISAXSDetector *arg2 = (IsGISAXSDetector *) 0 ;
@@ -53535,16 +51791,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_97(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "IsGISAXSDetector const *""'"); 
   }
@@ -53557,7 +51811,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_98(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_98(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   Layer *arg2 = (Layer *) 0 ;
@@ -53565,16 +51819,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_98(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Layer, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "Layer const *""'"); 
   }
@@ -53587,7 +51839,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_99(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_99(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   LayerInterface *arg2 = (LayerInterface *) 0 ;
@@ -53595,16 +51847,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_99(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_LayerInterface, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_LayerInterface, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "LayerInterface const *""'"); 
   }
@@ -53617,7 +51867,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_100(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_100(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   LayerRoughness *arg2 = (LayerRoughness *) 0 ;
@@ -53625,16 +51875,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_100(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "LayerRoughness const *""'"); 
   }
@@ -53647,7 +51895,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_101(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_101(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   MesoCrystal *arg2 = (MesoCrystal *) 0 ;
@@ -53655,16 +51903,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_101(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_MesoCrystal, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_MesoCrystal, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "MesoCrystal const *""'"); 
   }
@@ -53677,7 +51923,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_102(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_102(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   MultiLayer *arg2 = (MultiLayer *) 0 ;
@@ -53685,16 +51931,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_102(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "MultiLayer const *""'"); 
   }
@@ -53707,7 +51951,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_103(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_103(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   OffSpecSimulation *arg2 = (OffSpecSimulation *) 0 ;
@@ -53715,16 +51959,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_103(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "OffSpecSimulation const *""'"); 
   }
@@ -53737,7 +51979,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_104(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_104(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   Particle *arg2 = (Particle *) 0 ;
@@ -53745,16 +51987,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_104(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Particle, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "Particle const *""'"); 
   }
@@ -53767,7 +52007,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_105(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_105(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ParticleComposition *arg2 = (ParticleComposition *) 0 ;
@@ -53775,16 +52015,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_105(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ParticleComposition const *""'"); 
   }
@@ -53797,7 +52035,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_106(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_106(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ParticleCoreShell *arg2 = (ParticleCoreShell *) 0 ;
@@ -53805,16 +52043,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_106(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ParticleCoreShell const *""'"); 
   }
@@ -53827,7 +52063,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_107(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_107(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ParticleDistribution *arg2 = (ParticleDistribution *) 0 ;
@@ -53835,16 +52071,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_107(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -53857,7 +52091,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_108(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_108(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ParticleLayout *arg2 = (ParticleLayout *) 0 ;
@@ -53865,16 +52099,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_108(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ParticleLayout const *""'"); 
   }
@@ -53887,7 +52119,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_109(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_109(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   PoissonNoiseBackground *arg2 = (PoissonNoiseBackground *) 0 ;
@@ -53895,16 +52127,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_109(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "PoissonNoiseBackground const *""'"); 
   }
@@ -53917,7 +52147,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_110(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_110(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   RectangularDetector *arg2 = (RectangularDetector *) 0 ;
@@ -53925,16 +52155,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_110(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "RectangularDetector const *""'"); 
   }
@@ -53947,7 +52175,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_111(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_111(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   ResolutionFunction2DGaussian *arg2 = (ResolutionFunction2DGaussian *) 0 ;
@@ -53955,16 +52183,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_111(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
@@ -53977,7 +52203,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_112(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_112(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   RotationEuler *arg2 = (RotationEuler *) 0 ;
@@ -53985,16 +52211,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_112(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "RotationEuler const *""'"); 
   }
@@ -54007,7 +52231,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_113(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_113(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   RotationX *arg2 = (RotationX *) 0 ;
@@ -54015,16 +52239,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_113(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RotationX, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "RotationX const *""'"); 
   }
@@ -54037,7 +52259,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_114(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_114(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   RotationY *arg2 = (RotationY *) 0 ;
@@ -54045,16 +52267,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_114(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RotationY, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "RotationY const *""'"); 
   }
@@ -54067,7 +52287,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_115(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_115(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   RotationZ *arg2 = (RotationZ *) 0 ;
@@ -54075,16 +52295,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_115(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RotationZ, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "RotationZ const *""'"); 
   }
@@ -54097,7 +52315,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_116(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_116(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   SpecularDetector1D *arg2 = (SpecularDetector1D *) 0 ;
@@ -54105,16 +52323,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_116(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SpecularDetector1D, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_SpecularDetector1D, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "SpecularDetector1D const *""'"); 
   }
@@ -54127,7 +52343,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_117(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_117(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   SpecularSimulation *arg2 = (SpecularSimulation *) 0 ;
@@ -54135,16 +52351,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_117(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -54157,7 +52371,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_118(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_118(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   SphericalDetector *arg2 = (SphericalDetector *) 0 ;
@@ -54165,16 +52379,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_118(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SphericalDetector, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_SphericalDetector, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "SphericalDetector const *""'"); 
   }
@@ -54187,7 +52399,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_119(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_119(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   SquareLattice *arg2 = (SquareLattice *) 0 ;
@@ -54195,16 +52407,14 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_119(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_visit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "SquareLattice const *""'"); 
   }
@@ -54222,13 +52432,9 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "INodeVisitor_visit", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -54239,7 +52445,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_BasicLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_0(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -54253,7 +52459,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_Beam, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_1(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -54267,7 +52473,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ConstantBackground, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_2(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -54281,7 +52487,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ConvolutionDetectorResolution, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_3(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -54295,7 +52501,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_Crystal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_4(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_4(self, argc, argv);
       }
     }
   }
@@ -54309,7 +52515,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionCosine, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_5(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_5(self, argc, argv);
       }
     }
   }
@@ -54323,7 +52529,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionGate, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_6(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_6(self, argc, argv);
       }
     }
   }
@@ -54337,7 +52543,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionGaussian, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_7(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_7(self, argc, argv);
       }
     }
   }
@@ -54351,7 +52557,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionLogNormal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_8(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_8(self, argc, argv);
       }
     }
   }
@@ -54365,7 +52571,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionLorentz, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_9(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_9(self, argc, argv);
       }
     }
   }
@@ -54379,7 +52585,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_DistributionTrapezoid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_10(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_10(self, argc, argv);
       }
     }
   }
@@ -54393,7 +52599,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FootprintFactorGaussian, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_11(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_11(self, argc, argv);
       }
     }
   }
@@ -54407,7 +52613,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FootprintFactorSquare, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_12(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_12(self, argc, argv);
       }
     }
   }
@@ -54421,7 +52627,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorAnisoPyramid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_13(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_13(self, argc, argv);
       }
     }
   }
@@ -54435,7 +52641,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorBox, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_14(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_14(self, argc, argv);
       }
     }
   }
@@ -54449,7 +52655,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCone, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_15(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_15(self, argc, argv);
       }
     }
   }
@@ -54463,7 +52669,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCone6, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_16(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_16(self, argc, argv);
       }
     }
   }
@@ -54477,7 +52683,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCoreShell, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_17(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_17(self, argc, argv);
       }
     }
   }
@@ -54491,7 +52697,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCrystal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_18(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_18(self, argc, argv);
       }
     }
   }
@@ -54505,7 +52711,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCuboctahedron, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_19(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_19(self, argc, argv);
       }
     }
   }
@@ -54519,7 +52725,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCylinder, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_20(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_20(self, argc, argv);
       }
     }
   }
@@ -54533,7 +52739,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDecoratorMaterial, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_21(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_21(self, argc, argv);
       }
     }
   }
@@ -54547,7 +52753,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDecoratorPositionFactor, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_22(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_22(self, argc, argv);
       }
     }
   }
@@ -54561,7 +52767,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDecoratorRotation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_23(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_23(self, argc, argv);
       }
     }
   }
@@ -54575,7 +52781,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDodecahedron, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_24(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_24(self, argc, argv);
       }
     }
   }
@@ -54589,7 +52795,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDWBA, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_25(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_25(self, argc, argv);
       }
     }
   }
@@ -54603,7 +52809,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDWBAPol, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_26(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_26(self, argc, argv);
       }
     }
   }
@@ -54617,7 +52823,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_27(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_27(self, argc, argv);
       }
     }
   }
@@ -54631,7 +52837,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorFullSphere, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_28(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_28(self, argc, argv);
       }
     }
   }
@@ -54645,7 +52851,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorFullSpheroid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_29(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_29(self, argc, argv);
       }
     }
   }
@@ -54659,7 +52865,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_30(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_30(self, argc, argv);
       }
     }
   }
@@ -54673,7 +52879,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorHemiEllipsoid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_31(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_31(self, argc, argv);
       }
     }
   }
@@ -54687,7 +52893,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorIcosahedron, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_32(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_32(self, argc, argv);
       }
     }
   }
@@ -54701,7 +52907,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorLongBox, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_33(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_33(self, argc, argv);
       }
     }
   }
@@ -54715,7 +52921,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorLongBoxGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_34(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_34(self, argc, argv);
       }
     }
   }
@@ -54729,7 +52935,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorLongBoxLorentz, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_35(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_35(self, argc, argv);
       }
     }
   }
@@ -54743,7 +52949,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorLorentz, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_36(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_36(self, argc, argv);
       }
     }
   }
@@ -54757,7 +52963,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorPrism3, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_37(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_37(self, argc, argv);
       }
     }
   }
@@ -54771,7 +52977,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorPrism6, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_38(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_38(self, argc, argv);
       }
     }
   }
@@ -54785,7 +52991,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorPyramid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_39(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_39(self, argc, argv);
       }
     }
   }
@@ -54799,7 +53005,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple1, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_40(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_40(self, argc, argv);
       }
     }
   }
@@ -54813,7 +53019,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple2, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_41(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_41(self, argc, argv);
       }
     }
   }
@@ -54827,7 +53033,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorSphereGaussianRadius, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_42(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_42(self, argc, argv);
       }
     }
   }
@@ -54841,7 +53047,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_43(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_43(self, argc, argv);
       }
     }
   }
@@ -54855,7 +53061,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorTetrahedron, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_44(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_44(self, argc, argv);
       }
     }
   }
@@ -54869,7 +53075,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorDot, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_45(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_45(self, argc, argv);
       }
     }
   }
@@ -54883,7 +53089,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorTruncatedCube, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_46(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_46(self, argc, argv);
       }
     }
   }
@@ -54897,7 +53103,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorTruncatedSphere, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_47(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_47(self, argc, argv);
       }
     }
   }
@@ -54911,7 +53117,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorTruncatedSpheroid, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_48(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_48(self, argc, argv);
       }
     }
   }
@@ -54925,7 +53131,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorWeighted, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_49(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_49(self, argc, argv);
       }
     }
   }
@@ -54939,7 +53145,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction1DCauchy, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_50(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_50(self, argc, argv);
       }
     }
   }
@@ -54953,7 +53159,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction1DGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_51(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_51(self, argc, argv);
       }
     }
   }
@@ -54967,7 +53173,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction1DTriangle, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_52(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_52(self, argc, argv);
       }
     }
   }
@@ -54981,7 +53187,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction1DVoigt, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_53(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_53(self, argc, argv);
       }
     }
   }
@@ -54995,7 +53201,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction2DCauchy, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_54(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_54(self, argc, argv);
       }
     }
   }
@@ -55009,7 +53215,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction2DGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_55(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_55(self, argc, argv);
       }
     }
   }
@@ -55023,7 +53229,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDecayFunction2DVoigt, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_56(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_56(self, argc, argv);
       }
     }
   }
@@ -55037,7 +53243,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DCauchy, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_57(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_57(self, argc, argv);
       }
     }
   }
@@ -55051,7 +53257,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DCosine, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_58(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_58(self, argc, argv);
       }
     }
   }
@@ -55065,7 +53271,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DGate, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_59(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_59(self, argc, argv);
       }
     }
   }
@@ -55079,7 +53285,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_60(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_60(self, argc, argv);
       }
     }
   }
@@ -55093,7 +53299,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DTriangle, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_61(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_61(self, argc, argv);
       }
     }
   }
@@ -55107,7 +53313,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution1DVoigt, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_62(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_62(self, argc, argv);
       }
     }
   }
@@ -55121,7 +53327,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution2DCauchy, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_63(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_63(self, argc, argv);
       }
     }
   }
@@ -55135,7 +53341,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution2DCone, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_64(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_64(self, argc, argv);
       }
     }
   }
@@ -55149,7 +53355,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution2DGate, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_65(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_65(self, argc, argv);
       }
     }
   }
@@ -55163,7 +53369,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution2DGauss, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_66(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_66(self, argc, argv);
       }
     }
   }
@@ -55177,7 +53383,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FTDistribution2DVoigt, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_67(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_67(self, argc, argv);
       }
     }
   }
@@ -55191,7 +53397,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_GISASSimulation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_68(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_68(self, argc, argv);
       }
     }
   }
@@ -55205,7 +53411,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_HexagonalLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_69(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_69(self, argc, argv);
       }
     }
   }
@@ -55219,7 +53425,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_MesoCrystal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_101(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_101(self, argc, argv);
       }
     }
   }
@@ -55233,7 +53439,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IClusteredParticles, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_71(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_71(self, argc, argv);
       }
     }
   }
@@ -55247,7 +53453,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IdentityRotation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_72(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_72(self, argc, argv);
       }
     }
   }
@@ -55261,7 +53467,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IFormFactorBorn, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_74(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_74(self, argc, argv);
       }
     }
   }
@@ -55275,7 +53481,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IFormFactorDecorator, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_75(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_75(self, argc, argv);
       }
     }
   }
@@ -55289,7 +53495,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IFormFactor, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_73(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_73(self, argc, argv);
       }
     }
   }
@@ -55303,7 +53509,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunction1DLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_82(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_82(self, argc, argv);
       }
     }
   }
@@ -55317,7 +53523,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ParticleLayout, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_108(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_108(self, argc, argv);
       }
     }
   }
@@ -55331,7 +53537,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_Instrument, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_79(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_79(self, argc, argv);
       }
     }
   }
@@ -55345,7 +53551,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IntensityScaleAndShiftNormalizer, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_81(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_81(self, argc, argv);
       }
     }
   }
@@ -55359,7 +53565,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IntensityNormalizer, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_80(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_80(self, argc, argv);
       }
     }
   }
@@ -55373,7 +53579,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunction2DLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_83(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_83(self, argc, argv);
       }
     }
   }
@@ -55387,7 +53593,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_84(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_84(self, argc, argv);
       }
     }
   }
@@ -55401,7 +53607,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_85(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_85(self, argc, argv);
       }
     }
   }
@@ -55415,7 +53621,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunction3DLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_86(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_86(self, argc, argv);
       }
     }
   }
@@ -55429,7 +53635,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_87(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_87(self, argc, argv);
       }
     }
   }
@@ -55443,7 +53649,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_88(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_88(self, argc, argv);
       }
     }
   }
@@ -55457,7 +53663,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionHardDisk, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_89(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_89(self, argc, argv);
       }
     }
   }
@@ -55471,7 +53677,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_90(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_90(self, argc, argv);
       }
     }
   }
@@ -55485,7 +53691,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionTwin, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_91(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_91(self, argc, argv);
       }
     }
   }
@@ -55499,7 +53705,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_InterferenceFunctionNone, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_92(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_92(self, argc, argv);
       }
     }
   }
@@ -55513,7 +53719,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IInterferenceFunction, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_76(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_76(self, argc, argv);
       }
     }
   }
@@ -55527,7 +53733,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_Particle, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_104(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_104(self, argc, argv);
       }
     }
   }
@@ -55541,7 +53747,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IPeakShape, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_94(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_94(self, argc, argv);
       }
     }
   }
@@ -55555,7 +53761,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_RotationEuler, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_112(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_112(self, argc, argv);
       }
     }
   }
@@ -55569,7 +53775,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_Layer, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_98(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_98(self, argc, argv);
       }
     }
   }
@@ -55583,7 +53789,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IsGISAXSDetector, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_97(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_97(self, argc, argv);
       }
     }
   }
@@ -55597,7 +53803,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_LayerRoughness, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_100(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_100(self, argc, argv);
       }
     }
   }
@@ -55611,7 +53817,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ParticleComposition, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_105(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_105(self, argc, argv);
       }
     }
   }
@@ -55625,7 +53831,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_LayerInterface, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_99(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_99(self, argc, argv);
       }
     }
   }
@@ -55639,7 +53845,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_MultiLayer, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_102(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_102(self, argc, argv);
       }
     }
   }
@@ -55653,7 +53859,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ParticleCoreShell, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_106(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_106(self, argc, argv);
       }
     }
   }
@@ -55667,7 +53873,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_OffSpecSimulation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_103(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_103(self, argc, argv);
       }
     }
   }
@@ -55681,7 +53887,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IParticle, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_93(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_93(self, argc, argv);
       }
     }
   }
@@ -55695,7 +53901,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ParticleDistribution, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_107(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_107(self, argc, argv);
       }
     }
   }
@@ -55709,7 +53915,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IAbstractParticle, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_70(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_70(self, argc, argv);
       }
     }
   }
@@ -55723,7 +53929,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ILayout, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_77(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_77(self, argc, argv);
       }
     }
   }
@@ -55737,7 +53943,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_RotationX, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_113(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_113(self, argc, argv);
       }
     }
   }
@@ -55751,7 +53957,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_PoissonNoiseBackground, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_109(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_109(self, argc, argv);
       }
     }
   }
@@ -55765,7 +53971,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_RectangularDetector, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_110(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_110(self, argc, argv);
       }
     }
   }
@@ -55779,7 +53985,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ResolutionFunction2DGaussian, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_111(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_111(self, argc, argv);
       }
     }
   }
@@ -55793,7 +53999,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_RotationY, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_114(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_114(self, argc, argv);
       }
     }
   }
@@ -55807,7 +54013,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_RotationZ, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_115(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_115(self, argc, argv);
       }
     }
   }
@@ -55821,7 +54027,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IRotation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_95(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_95(self, argc, argv);
       }
     }
   }
@@ -55835,7 +54041,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ISample, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_96(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_96(self, argc, argv);
       }
     }
   }
@@ -55849,7 +54055,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SpecularSimulation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_117(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_117(self, argc, argv);
       }
     }
   }
@@ -55863,7 +54069,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SpecularDetector1D, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_116(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_116(self, argc, argv);
       }
     }
   }
@@ -55877,7 +54083,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SphericalDetector, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_118(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_118(self, argc, argv);
       }
     }
   }
@@ -55891,7 +54097,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SquareLattice, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_119(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_119(self, argc, argv);
       }
     }
   }
@@ -55905,13 +54111,13 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_INode, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_INodeVisitor_visit__SWIG_78(self, args);
+        return _wrap_INodeVisitor_visit__SWIG_78(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'INodeVisitor_visit'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'INodeVisitor_visit'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    INodeVisitor::visit(BasicLattice const *)\n"
     "    INodeVisitor::visit(Beam const *)\n"
@@ -56042,11 +54248,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_depth(PyObject *SWIGUNUSEDPARM(self), Py
   INodeVisitor *arg1 = (INodeVisitor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:INodeVisitor_depth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_depth" "', argument " "1"" of type '" "INodeVisitor const *""'"); 
   }
@@ -56067,16 +54274,15 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_setDepth(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:INodeVisitor_setDepth",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "INodeVisitor_setDepth", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_setDepth" "', argument " "1"" of type '" "INodeVisitor *""'"); 
   }
   arg1 = reinterpret_cast< INodeVisitor * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "INodeVisitor_setDepth" "', argument " "2"" of type '" "int""'");
   } 
@@ -56091,11 +54297,15 @@ fail:
 
 SWIGINTERN PyObject *INodeVisitor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_INodeVisitor, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *INodeVisitor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_VisitNodesPreorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   INode *arg1 = 0 ;
@@ -56104,11 +54314,10 @@ SWIGINTERN PyObject *_wrap_VisitNodesPreorder(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VisitNodesPreorder",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_INode,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "VisitNodesPreorder", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_INode,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisitNodesPreorder" "', argument " "1"" of type '" "INode const &""'"); 
   }
@@ -56116,7 +54325,7 @@ SWIGINTERN PyObject *_wrap_VisitNodesPreorder(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "VisitNodesPreorder" "', argument " "1"" of type '" "INode const &""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_INodeVisitor,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_INodeVisitor,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisitNodesPreorder" "', argument " "2"" of type '" "INodeVisitor &""'"); 
   }
@@ -56140,11 +54349,10 @@ SWIGINTERN PyObject *_wrap_VisitNodesPostorder(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VisitNodesPostorder",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_INode,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "VisitNodesPostorder", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_INode,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisitNodesPostorder" "', argument " "1"" of type '" "INode const &""'"); 
   }
@@ -56152,7 +54360,7 @@ SWIGINTERN PyObject *_wrap_VisitNodesPostorder(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "VisitNodesPostorder" "', argument " "1"" of type '" "INode const &""'"); 
   }
   arg1 = reinterpret_cast< INode * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_INodeVisitor,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_INodeVisitor,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisitNodesPostorder" "', argument " "2"" of type '" "INodeVisitor &""'"); 
   }
@@ -56173,11 +54381,12 @@ SWIGINTERN PyObject *_wrap_IClusteredParticles_clone(PyObject *SWIGUNUSEDPARM(se
   IClusteredParticles *arg1 = (IClusteredParticles *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IClusteredParticles *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IClusteredParticles_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IClusteredParticles_clone" "', argument " "1"" of type '" "IClusteredParticles const *""'"); 
   }
@@ -56198,16 +54407,15 @@ SWIGINTERN PyObject *_wrap_IClusteredParticles_accept(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IClusteredParticles_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IClusteredParticles_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IClusteredParticles_accept" "', argument " "1"" of type '" "IClusteredParticles const *""'"); 
   }
   arg1 = reinterpret_cast< IClusteredParticles * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IClusteredParticles_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -56234,19 +54442,16 @@ SWIGINTERN PyObject *_wrap_IClusteredParticles_createTotalFormFactor(PyObject *S
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IClusteredParticles_createTotalFormFactor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IClusteredParticles_createTotalFormFactor", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IClusteredParticles_createTotalFormFactor" "', argument " "1"" of type '" "IClusteredParticles const *""'"); 
   }
   arg1 = reinterpret_cast< IClusteredParticles * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IClusteredParticles_createTotalFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -56254,12 +54459,12 @@ SWIGINTERN PyObject *_wrap_IClusteredParticles_createTotalFormFactor(PyObject *S
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IClusteredParticles_createTotalFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IRotation, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IClusteredParticles_createTotalFormFactor" "', argument " "3"" of type '" "IRotation const *""'"); 
   }
   arg3 = reinterpret_cast< IRotation * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IClusteredParticles_createTotalFormFactor" "', argument " "4"" of type '" "kvector_t const &""'"); 
   }
@@ -56280,11 +54485,12 @@ SWIGINTERN PyObject *_wrap_IClusteredParticles_homogeneousRegions(PyObject *SWIG
   IClusteredParticles *arg1 = (IClusteredParticles *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IClusteredParticles_homogeneousRegions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IClusteredParticles, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IClusteredParticles_homogeneousRegions" "', argument " "1"" of type '" "IClusteredParticles const *""'"); 
   }
@@ -56302,10 +54508,11 @@ SWIGINTERN PyObject *_wrap_delete_IClusteredParticles(PyObject *SWIGUNUSEDPARM(s
   IClusteredParticles *arg1 = (IClusteredParticles *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IClusteredParticles",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IClusteredParticles, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IClusteredParticles, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IClusteredParticles" "', argument " "1"" of type '" "IClusteredParticles *""'"); 
   }
@@ -56320,7 +54527,7 @@ fail:
 
 SWIGINTERN PyObject *IClusteredParticles_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IClusteredParticles, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -56333,12 +54540,11 @@ SWIGINTERN PyObject *_wrap_new_Crystal(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Crystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Crystal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IParticle,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_Crystal", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Crystal" "', argument " "1"" of type '" "IParticle const &""'"); 
   }
@@ -56346,7 +54552,7 @@ SWIGINTERN PyObject *_wrap_new_Crystal(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Crystal" "', argument " "1"" of type '" "IParticle const &""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Lattice,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Crystal" "', argument " "2"" of type '" "Lattice const &""'"); 
   }
@@ -56367,10 +54573,11 @@ SWIGINTERN PyObject *_wrap_delete_Crystal(PyObject *SWIGUNUSEDPARM(self), PyObje
   Crystal *arg1 = (Crystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Crystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Crystal" "', argument " "1"" of type '" "Crystal *""'"); 
   }
@@ -56388,11 +54595,12 @@ SWIGINTERN PyObject *_wrap_Crystal_clone(PyObject *SWIGUNUSEDPARM(self), PyObjec
   Crystal *arg1 = (Crystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Crystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Crystal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_clone" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
@@ -56413,16 +54621,15 @@ SWIGINTERN PyObject *_wrap_Crystal_accept(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Crystal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Crystal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_accept" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
   arg1 = reinterpret_cast< Crystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Crystal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -56449,19 +54656,16 @@ SWIGINTERN PyObject *_wrap_Crystal_createTotalFormFactor(PyObject *SWIGUNUSEDPAR
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Crystal_createTotalFormFactor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Crystal_createTotalFormFactor", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_createTotalFormFactor" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
   arg1 = reinterpret_cast< Crystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Crystal_createTotalFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -56469,12 +54673,12 @@ SWIGINTERN PyObject *_wrap_Crystal_createTotalFormFactor(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Crystal_createTotalFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IRotation, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Crystal_createTotalFormFactor" "', argument " "3"" of type '" "IRotation const *""'"); 
   }
   arg3 = reinterpret_cast< IRotation * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Crystal_createTotalFormFactor" "', argument " "4"" of type '" "kvector_t const &""'"); 
   }
@@ -56495,11 +54699,12 @@ SWIGINTERN PyObject *_wrap_Crystal_homogeneousRegions(PyObject *SWIGUNUSEDPARM(s
   Crystal *arg1 = (Crystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Crystal_homogeneousRegions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_homogeneousRegions" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
@@ -56512,7 +54717,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Crystal_transformedLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Crystal_transformedLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Crystal *arg1 = (Crystal *) 0 ;
   IRotation *arg2 = (IRotation *) 0 ;
@@ -56520,17 +54725,15 @@ SWIGINTERN PyObject *_wrap_Crystal_transformedLattice__SWIG_0(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Crystal_transformedLattice",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_transformedLattice" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
   arg1 = reinterpret_cast< Crystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IRotation, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Crystal_transformedLattice" "', argument " "2"" of type '" "IRotation const *""'"); 
   }
@@ -56543,16 +54746,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Crystal_transformedLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Crystal_transformedLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Crystal *arg1 = (Crystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Crystal_transformedLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_transformedLattice" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
@@ -56570,20 +54772,16 @@ SWIGINTERN PyObject *_wrap_Crystal_transformedLattice(PyObject *self, PyObject *
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Crystal_transformedLattice", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Crystal, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Crystal_transformedLattice__SWIG_1(self, args);
+      return _wrap_Crystal_transformedLattice__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -56596,13 +54794,13 @@ SWIGINTERN PyObject *_wrap_Crystal_transformedLattice(PyObject *self, PyObject *
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IRotation, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Crystal_transformedLattice__SWIG_0(self, args);
+        return _wrap_Crystal_transformedLattice__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Crystal_transformedLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Crystal_transformedLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Crystal::transformedLattice(IRotation const *) const\n"
     "    Crystal::transformedLattice() const\n");
@@ -56618,16 +54816,15 @@ SWIGINTERN PyObject *_wrap_Crystal_setPositionVariance(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Crystal_setPositionVariance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Crystal_setPositionVariance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_setPositionVariance" "', argument " "1"" of type '" "Crystal *""'"); 
   }
   arg1 = reinterpret_cast< Crystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Crystal_setPositionVariance" "', argument " "2"" of type '" "double""'");
   } 
@@ -56645,11 +54842,12 @@ SWIGINTERN PyObject *_wrap_Crystal_getChildren(PyObject *SWIGUNUSEDPARM(self), P
   Crystal *arg1 = (Crystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Crystal_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Crystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Crystal_getChildren" "', argument " "1"" of type '" "Crystal const *""'"); 
   }
@@ -56664,20 +54862,25 @@ fail:
 
 SWIGINTERN PyObject *Crystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Crystal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Crystal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IDistribution1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IDistribution1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IDistribution1D" "', argument " "1"" of type '" "IDistribution1D *""'"); 
   }
@@ -56695,11 +54898,12 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_clone(PyObject *SWIGUNUSEDPARM(self),
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IDistribution1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDistribution1D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_clone" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
@@ -56720,17 +54924,16 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_probabilityDensity(PyObject *SWIGUNUS
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDistribution1D_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDistribution1D_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_probabilityDensity" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -56748,11 +54951,12 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_getMean(PyObject *SWIGUNUSEDPARM(self
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDistribution1D_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_getMean" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
@@ -56765,7 +54969,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   size_t arg2 ;
@@ -56779,29 +54983,25 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_0(PyObject *
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IDistribution1D_equidistantSamples",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantSamples" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantSamples" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantSamples" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IDistribution1D_equidistantSamples" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -56817,7 +55017,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   size_t arg2 ;
@@ -56828,23 +55028,20 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_1(PyObject *
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDistribution1D_equidistantSamples",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantSamples" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantSamples" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantSamples" "', argument " "3"" of type '" "double""'");
   } 
@@ -56857,7 +55054,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   size_t arg2 ;
@@ -56865,17 +55062,15 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples__SWIG_2(PyObject *
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDistribution1D_equidistantSamples",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantSamples" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantSamples" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -56893,13 +55088,9 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples(PyObject *self, Py
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IDistribution1D_equidistantSamples", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -56911,7 +55102,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples(PyObject *self, Py
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IDistribution1D_equidistantSamples__SWIG_2(self, args);
+        return _wrap_IDistribution1D_equidistantSamples__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -56931,7 +55122,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples(PyObject *self, Py
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IDistribution1D_equidistantSamples__SWIG_1(self, args);
+          return _wrap_IDistribution1D_equidistantSamples__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -56952,10 +55143,10 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples(PyObject *self, Py
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_IDistribution1D_equidistantSamples__SWIG_0(self, args);
+            return _wrap_IDistribution1D_equidistantSamples__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -56963,7 +55154,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamples(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IDistribution1D_equidistantSamples'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IDistribution1D_equidistantSamples'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IDistribution1D::equidistantSamples(size_t,double,RealLimits const &) const\n"
     "    IDistribution1D::equidistantSamples(size_t,double) const\n"
@@ -56986,29 +55177,26 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantSamplesInRange(PyObject *S
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IDistribution1D_equidistantSamplesInRange",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDistribution1D_equidistantSamplesInRange", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantSamplesInRange" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantSamplesInRange" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantSamplesInRange" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IDistribution1D_equidistantSamplesInRange" "', argument " "4"" of type '" "double""'");
   } 
@@ -57021,7 +55209,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   size_t arg2 ;
@@ -57035,29 +55223,25 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_0(PyObject *S
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IDistribution1D_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantPoints" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IDistribution1D_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -57073,7 +55257,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   size_t arg2 ;
@@ -57084,23 +55268,20 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints__SWIG_1(PyObject *S
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDistribution1D_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantPoints" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -57118,13 +55299,9 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints(PyObject *self, PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IDistribution1D_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -57141,7 +55318,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IDistribution1D_equidistantPoints__SWIG_1(self, args);
+          return _wrap_IDistribution1D_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -57162,10 +55339,10 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_IDistribution1D_equidistantPoints__SWIG_0(self, args);
+            return _wrap_IDistribution1D_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -57173,7 +55350,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPoints(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IDistribution1D_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IDistribution1D_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IDistribution1D::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    IDistribution1D::equidistantPoints(size_t,double) const\n");
@@ -57195,29 +55372,26 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_equidistantPointsInRange(PyObject *SW
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IDistribution1D_equidistantPointsInRange",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDistribution1D_equidistantPointsInRange", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_equidistantPointsInRange" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDistribution1D_equidistantPointsInRange" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDistribution1D_equidistantPointsInRange" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IDistribution1D_equidistantPointsInRange" "', argument " "4"" of type '" "double""'");
   } 
@@ -57235,11 +55409,12 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_isDelta(PyObject *SWIGUNUSEDPARM(self
   IDistribution1D *arg1 = (IDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDistribution1D_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_isDelta" "', argument " "1"" of type '" "IDistribution1D const *""'"); 
   }
@@ -57259,18 +55434,17 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_setUnits(PyObject *SWIGUNUSEDPARM(sel
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDistribution1D_setUnits",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDistribution1D_setUnits", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDistribution1D_setUnits" "', argument " "1"" of type '" "IDistribution1D *""'"); 
   }
   arg1 = reinterpret_cast< IDistribution1D * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDistribution1D_setUnits" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -57291,16 +55465,16 @@ fail:
 
 SWIGINTERN PyObject *IDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IDistribution1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DistributionGate")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DistributionGate *)new DistributionGate();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGate, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -57309,7 +55483,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -57317,17 +55491,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_1(PyObject *SWIGUNUSEDPARM
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   DistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_DistributionGate",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionGate" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionGate" "', argument " "2"" of type '" "double""'");
   } 
@@ -57345,15 +55517,11 @@ SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionGate", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DistributionGate__SWIG_0(self, args);
+    return _wrap_new_DistributionGate__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -57367,13 +55535,13 @@ SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_DistributionGate__SWIG_1(self, args);
+        return _wrap_new_DistributionGate__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionGate'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionGate'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionGate::DistributionGate()\n"
     "    DistributionGate::DistributionGate(double,double)\n");
@@ -57386,10 +55554,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionGate(PyObject *SWIGUNUSEDPARM(self
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionGate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionGate" "', argument " "1"" of type '" "DistributionGate *""'"); 
   }
@@ -57407,11 +55576,12 @@ SWIGINTERN PyObject *_wrap_DistributionGate_clone(PyObject *SWIGUNUSEDPARM(self)
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGate_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_clone" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
@@ -57432,17 +55602,16 @@ SWIGINTERN PyObject *_wrap_DistributionGate_probabilityDensity(PyObject *SWIGUNU
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionGate_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionGate_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_probabilityDensity" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGate * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGate_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -57460,11 +55629,12 @@ SWIGINTERN PyObject *_wrap_DistributionGate_getMean(PyObject *SWIGUNUSEDPARM(sel
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGate_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_getMean" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
@@ -57482,11 +55652,12 @@ SWIGINTERN PyObject *_wrap_DistributionGate_getMin(PyObject *SWIGUNUSEDPARM(self
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGate_getMin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_getMin" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
@@ -57504,11 +55675,12 @@ SWIGINTERN PyObject *_wrap_DistributionGate_getMax(PyObject *SWIGUNUSEDPARM(self
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGate_getMax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_getMax" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
@@ -57521,7 +55693,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   size_t arg2 ;
@@ -57535,29 +55707,25 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_0(PyObject *
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionGate_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_equidistantPoints" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGate * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGate_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionGate_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionGate_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -57573,7 +55741,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   size_t arg2 ;
@@ -57584,23 +55752,20 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints__SWIG_1(PyObject *
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionGate_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_equidistantPoints" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGate * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGate_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionGate_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -57618,13 +55783,9 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints(PyObject *self, Py
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionGate_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -57641,7 +55802,7 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints(PyObject *self, Py
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionGate_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionGate_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -57662,10 +55823,10 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints(PyObject *self, Py
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionGate_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionGate_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -57673,7 +55834,7 @@ SWIGINTERN PyObject *_wrap_DistributionGate_equidistantPoints(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionGate_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionGate_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionGate::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionGate::equidistantPoints(size_t,double) const\n");
@@ -57686,11 +55847,12 @@ SWIGINTERN PyObject *_wrap_DistributionGate_isDelta(PyObject *SWIGUNUSEDPARM(sel
   DistributionGate *arg1 = (DistributionGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGate_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_isDelta" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
@@ -57711,16 +55873,15 @@ SWIGINTERN PyObject *_wrap_DistributionGate_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionGate_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionGate_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGate_accept" "', argument " "1"" of type '" "DistributionGate const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGate * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionGate_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -57735,16 +55896,20 @@ fail:
 
 SWIGINTERN PyObject *DistributionGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionGate, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionGate_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DistributionLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DistributionLorentz")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DistributionLorentz *)new DistributionLorentz();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionLorentz, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -57753,7 +55918,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -57761,17 +55926,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   DistributionLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_DistributionLorentz",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionLorentz" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionLorentz" "', argument " "2"" of type '" "double""'");
   } 
@@ -57789,15 +55952,11 @@ SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionLorentz", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DistributionLorentz__SWIG_0(self, args);
+    return _wrap_new_DistributionLorentz__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -57811,13 +55970,13 @@ SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_DistributionLorentz__SWIG_1(self, args);
+        return _wrap_new_DistributionLorentz__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionLorentz'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionLorentz'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionLorentz::DistributionLorentz()\n"
     "    DistributionLorentz::DistributionLorentz(double,double)\n");
@@ -57830,10 +55989,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionLorentz(PyObject *SWIGUNUSEDPARM(s
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionLorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionLorentz" "', argument " "1"" of type '" "DistributionLorentz *""'"); 
   }
@@ -57851,11 +56011,12 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_clone(PyObject *SWIGUNUSEDPARM(se
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_clone" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
@@ -57876,17 +56037,16 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_probabilityDensity(PyObject *SWIG
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionLorentz_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionLorentz_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_probabilityDensity" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLorentz * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLorentz_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -57904,11 +56064,12 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_getMean(PyObject *SWIGUNUSEDPARM(
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLorentz_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_getMean" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
@@ -57926,11 +56087,12 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_getHWHM(PyObject *SWIGUNUSEDPARM(
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLorentz_getHWHM",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_getHWHM" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
@@ -57943,7 +56105,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   size_t arg2 ;
@@ -57957,29 +56119,25 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_0(PyObjec
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionLorentz_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLorentz * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -57995,7 +56153,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   size_t arg2 ;
@@ -58006,23 +56164,20 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints__SWIG_1(PyObjec
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionLorentz_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLorentz * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionLorentz_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -58040,13 +56195,9 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints(PyObject *self,
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionLorentz_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -58063,7 +56214,7 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionLorentz_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionLorentz_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -58084,10 +56235,10 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionLorentz_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionLorentz_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -58095,7 +56246,7 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_equidistantPoints(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionLorentz_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionLorentz_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionLorentz::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionLorentz::equidistantPoints(size_t,double) const\n");
@@ -58108,11 +56259,12 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_isDelta(PyObject *SWIGUNUSEDPARM(
   DistributionLorentz *arg1 = (DistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLorentz_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_isDelta" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
@@ -58133,16 +56285,15 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_accept(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionLorentz_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionLorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLorentz_accept" "', argument " "1"" of type '" "DistributionLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLorentz * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionLorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -58157,16 +56308,20 @@ fail:
 
 SWIGINTERN PyObject *DistributionLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionLorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DistributionGaussian")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DistributionGaussian *)new DistributionGaussian();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGaussian, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -58175,7 +56330,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -58183,17 +56338,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_1(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   DistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_DistributionGaussian",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionGaussian" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionGaussian" "', argument " "2"" of type '" "double""'");
   } 
@@ -58211,15 +56364,11 @@ SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionGaussian", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DistributionGaussian__SWIG_0(self, args);
+    return _wrap_new_DistributionGaussian__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -58233,13 +56382,13 @@ SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_DistributionGaussian__SWIG_1(self, args);
+        return _wrap_new_DistributionGaussian__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionGaussian'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionGaussian'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionGaussian::DistributionGaussian()\n"
     "    DistributionGaussian::DistributionGaussian(double,double)\n");
@@ -58252,10 +56401,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionGaussian(PyObject *SWIGUNUSEDPARM(
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionGaussian",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionGaussian" "', argument " "1"" of type '" "DistributionGaussian *""'"); 
   }
@@ -58273,11 +56423,12 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_clone(PyObject *SWIGUNUSEDPARM(s
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGaussian_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_clone" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
@@ -58298,17 +56449,16 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_probabilityDensity(PyObject *SWI
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionGaussian_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionGaussian_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_probabilityDensity" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGaussian * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGaussian_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -58326,11 +56476,12 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_getMean(PyObject *SWIGUNUSEDPARM
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGaussian_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_getMean" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
@@ -58348,11 +56499,12 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_getStdDev(PyObject *SWIGUNUSEDPA
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGaussian_getStdDev",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_getStdDev" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
@@ -58365,7 +56517,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   size_t arg2 ;
@@ -58379,29 +56531,25 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_0(PyObje
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionGaussian_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGaussian * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -58417,7 +56565,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   size_t arg2 ;
@@ -58428,23 +56576,20 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints__SWIG_1(PyObje
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionGaussian_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGaussian * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionGaussian_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -58462,13 +56607,9 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints(PyObject *self
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionGaussian_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -58485,7 +56626,7 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints(PyObject *self
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionGaussian_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionGaussian_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -58506,10 +56647,10 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints(PyObject *self
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionGaussian_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionGaussian_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -58517,7 +56658,7 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_equidistantPoints(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionGaussian_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionGaussian_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionGaussian::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionGaussian::equidistantPoints(size_t,double) const\n");
@@ -58530,11 +56671,12 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_isDelta(PyObject *SWIGUNUSEDPARM
   DistributionGaussian *arg1 = (DistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionGaussian_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_isDelta" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
@@ -58555,16 +56697,15 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionGaussian_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionGaussian_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionGaussian_accept" "', argument " "1"" of type '" "DistributionGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionGaussian * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionGaussian_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -58579,21 +56720,24 @@ fail:
 
 SWIGINTERN PyObject *DistributionGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionGaussian, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionGaussian_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   DistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_DistributionLogNormal",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionLogNormal" "', argument " "1"" of type '" "double""'");
   } 
@@ -58606,7 +56750,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -58614,17 +56758,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_1(PyObject *SWIGUNUSE
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   DistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_DistributionLogNormal",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionLogNormal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionLogNormal" "', argument " "2"" of type '" "double""'");
   } 
@@ -58642,13 +56784,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *self, PyObject *a
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionLogNormal", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -58656,7 +56794,7 @@ SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *self, PyObject *a
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_DistributionLogNormal__SWIG_0(self, args);
+      return _wrap_new_DistributionLogNormal__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -58671,13 +56809,13 @@ SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *self, PyObject *a
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_DistributionLogNormal__SWIG_1(self, args);
+        return _wrap_new_DistributionLogNormal__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionLogNormal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionLogNormal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionLogNormal::DistributionLogNormal(double)\n"
     "    DistributionLogNormal::DistributionLogNormal(double,double)\n");
@@ -58690,10 +56828,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionLogNormal(PyObject *SWIGUNUSEDPARM
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionLogNormal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionLogNormal" "', argument " "1"" of type '" "DistributionLogNormal *""'"); 
   }
@@ -58711,11 +56850,12 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_clone(PyObject *SWIGUNUSEDPARM(
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLogNormal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_clone" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -58736,17 +56876,16 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_probabilityDensity(PyObject *SW
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionLogNormal_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionLogNormal_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_probabilityDensity" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLogNormal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLogNormal_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -58764,11 +56903,12 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_getMean(PyObject *SWIGUNUSEDPAR
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLogNormal_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_getMean" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -58786,11 +56926,12 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_getMedian(PyObject *SWIGUNUSEDP
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLogNormal_getMedian",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_getMedian" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -58808,11 +56949,12 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_getScalePar(PyObject *SWIGUNUSE
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLogNormal_getScalePar",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_getScalePar" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -58825,7 +56967,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   size_t arg2 ;
@@ -58839,29 +56981,25 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_0(PyObj
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionLogNormal_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLogNormal * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -58877,7 +57015,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   size_t arg2 ;
@@ -58888,23 +57026,20 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints__SWIG_1(PyObj
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionLogNormal_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLogNormal * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionLogNormal_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -58922,13 +57057,9 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints(PyObject *sel
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionLogNormal_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -58945,7 +57076,7 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints(PyObject *sel
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionLogNormal_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionLogNormal_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -58966,10 +57097,10 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints(PyObject *sel
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionLogNormal_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionLogNormal_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -58977,7 +57108,7 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_equidistantPoints(PyObject *sel
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionLogNormal_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionLogNormal_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionLogNormal::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionLogNormal::equidistantPoints(size_t,double) const\n");
@@ -58990,11 +57121,12 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_isDelta(PyObject *SWIGUNUSEDPAR
   DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionLogNormal_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_isDelta" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
@@ -59015,16 +57147,15 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionLogNormal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionLogNormal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_accept" "', argument " "1"" of type '" "DistributionLogNormal const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLogNormal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionLogNormal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -59044,18 +57175,17 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_setUnits(PyObject *SWIGUNUSEDPA
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionLogNormal_setUnits",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionLogNormal_setUnits", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionLogNormal_setUnits" "', argument " "1"" of type '" "DistributionLogNormal *""'"); 
   }
   arg1 = reinterpret_cast< DistributionLogNormal * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionLogNormal_setUnits" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -59076,16 +57206,20 @@ fail:
 
 SWIGINTERN PyObject *DistributionLogNormal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionLogNormal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionLogNormal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DistributionCosine")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DistributionCosine *)new DistributionCosine();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionCosine, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -59094,7 +57228,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -59102,17 +57236,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_1(PyObject *SWIGUNUSEDPA
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   DistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_DistributionCosine",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionCosine" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionCosine" "', argument " "2"" of type '" "double""'");
   } 
@@ -59130,15 +57262,11 @@ SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionCosine", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DistributionCosine__SWIG_0(self, args);
+    return _wrap_new_DistributionCosine__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -59152,13 +57280,13 @@ SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_DistributionCosine__SWIG_1(self, args);
+        return _wrap_new_DistributionCosine__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionCosine'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionCosine'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionCosine::DistributionCosine()\n"
     "    DistributionCosine::DistributionCosine(double,double)\n");
@@ -59171,10 +57299,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionCosine(PyObject *SWIGUNUSEDPARM(se
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionCosine",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionCosine" "', argument " "1"" of type '" "DistributionCosine *""'"); 
   }
@@ -59192,11 +57321,12 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_clone(PyObject *SWIGUNUSEDPARM(sel
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionCosine_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_clone" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
@@ -59217,17 +57347,16 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_probabilityDensity(PyObject *SWIGU
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionCosine_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionCosine_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_probabilityDensity" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionCosine * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionCosine_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -59245,11 +57374,12 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_getMean(PyObject *SWIGUNUSEDPARM(s
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionCosine_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_getMean" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
@@ -59267,11 +57397,12 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_getSigma(PyObject *SWIGUNUSEDPARM(
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionCosine_getSigma",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_getSigma" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
@@ -59284,7 +57415,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   size_t arg2 ;
@@ -59298,29 +57429,25 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_0(PyObject
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionCosine_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_equidistantPoints" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionCosine * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionCosine_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionCosine_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionCosine_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -59336,7 +57463,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   size_t arg2 ;
@@ -59347,23 +57474,20 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints__SWIG_1(PyObject
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionCosine_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_equidistantPoints" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionCosine * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionCosine_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionCosine_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -59381,13 +57505,9 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints(PyObject *self,
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionCosine_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -59404,7 +57524,7 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionCosine_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionCosine_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -59425,10 +57545,10 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionCosine_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionCosine_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -59436,7 +57556,7 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_equidistantPoints(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionCosine_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionCosine_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionCosine::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionCosine::equidistantPoints(size_t,double) const\n");
@@ -59449,11 +57569,12 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_isDelta(PyObject *SWIGUNUSEDPARM(s
   DistributionCosine *arg1 = (DistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionCosine_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_isDelta" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
@@ -59474,16 +57595,15 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_accept(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionCosine_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionCosine_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionCosine_accept" "', argument " "1"" of type '" "DistributionCosine const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionCosine * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionCosine_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -59498,16 +57618,20 @@ fail:
 
 SWIGINTERN PyObject *DistributionCosine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionCosine, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionCosine_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DistributionTrapezoid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DistributionTrapezoid")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DistributionTrapezoid *)new DistributionTrapezoid();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionTrapezoid, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -59516,7 +57640,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -59530,29 +57654,25 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_1(PyObject *SWIGUNUSE
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   DistributionTrapezoid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_DistributionTrapezoid",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionTrapezoid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DistributionTrapezoid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_DistributionTrapezoid" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_DistributionTrapezoid" "', argument " "4"" of type '" "double""'");
   } 
@@ -59570,15 +57690,11 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionTrapezoid", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DistributionTrapezoid__SWIG_0(self, args);
+    return _wrap_new_DistributionTrapezoid__SWIG_0(self, argc, argv);
   }
   if (argc == 4) {
     int _v;
@@ -59602,7 +57718,7 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_DistributionTrapezoid__SWIG_1(self, args);
+            return _wrap_new_DistributionTrapezoid__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -59610,7 +57726,7 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DistributionTrapezoid'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionTrapezoid'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionTrapezoid::DistributionTrapezoid()\n"
     "    DistributionTrapezoid::DistributionTrapezoid(double,double,double,double)\n");
@@ -59623,10 +57739,11 @@ SWIGINTERN PyObject *_wrap_delete_DistributionTrapezoid(PyObject *SWIGUNUSEDPARM
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DistributionTrapezoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DistributionTrapezoid" "', argument " "1"" of type '" "DistributionTrapezoid *""'"); 
   }
@@ -59644,11 +57761,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_clone(PyObject *SWIGUNUSEDPARM(
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionTrapezoid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_clone" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59669,17 +57787,16 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_probabilityDensity(PyObject *SW
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionTrapezoid_probabilityDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionTrapezoid_probabilityDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_probabilityDensity" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionTrapezoid * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionTrapezoid_probabilityDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -59697,11 +57814,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_getMean(PyObject *SWIGUNUSEDPAR
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_getMean",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_getMean" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59719,11 +57837,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_getLeftWidth(PyObject *SWIGUNUS
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_getLeftWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_getLeftWidth" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59741,11 +57860,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_getMiddleWidth(PyObject *SWIGUN
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_getMiddleWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_getMiddleWidth" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59763,11 +57883,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_getRightWidth(PyObject *SWIGUNU
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_getRightWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_getRightWidth" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59780,7 +57901,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   size_t arg2 ;
@@ -59794,29 +57915,25 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_0(PyObj
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DistributionTrapezoid_equidistantPoints",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionTrapezoid * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "4"" of type '" "RealLimits const &""'"); 
   }
@@ -59832,7 +57949,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   size_t arg2 ;
@@ -59843,23 +57960,20 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints__SWIG_1(PyObj
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DistributionTrapezoid_equidistantPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionTrapezoid * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DistributionTrapezoid_equidistantPoints" "', argument " "3"" of type '" "double""'");
   } 
@@ -59877,13 +57991,9 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints(PyObject *sel
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DistributionTrapezoid_equidistantPoints", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -59900,7 +58010,7 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints(PyObject *sel
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_DistributionTrapezoid_equidistantPoints__SWIG_1(self, args);
+          return _wrap_DistributionTrapezoid_equidistantPoints__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -59921,10 +58031,10 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints(PyObject *sel
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_DistributionTrapezoid_equidistantPoints__SWIG_0(self, args);
+            return _wrap_DistributionTrapezoid_equidistantPoints__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -59932,7 +58042,7 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_equidistantPoints(PyObject *sel
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DistributionTrapezoid_equidistantPoints'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DistributionTrapezoid_equidistantPoints'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DistributionTrapezoid::equidistantPoints(size_t,double,RealLimits const &) const\n"
     "    DistributionTrapezoid::equidistantPoints(size_t,double) const\n");
@@ -59945,11 +58055,12 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_isDelta(PyObject *SWIGUNUSEDPAR
   DistributionTrapezoid *arg1 = (DistributionTrapezoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DistributionTrapezoid_isDelta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_isDelta" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
@@ -59970,16 +58081,15 @@ SWIGINTERN PyObject *_wrap_DistributionTrapezoid_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DistributionTrapezoid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DistributionTrapezoid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DistributionTrapezoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DistributionTrapezoid_accept" "', argument " "1"" of type '" "DistributionTrapezoid const *""'"); 
   }
   arg1 = reinterpret_cast< DistributionTrapezoid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DistributionTrapezoid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -59994,16 +58104,20 @@ fail:
 
 SWIGINTERN PyObject *DistributionTrapezoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DistributionTrapezoid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DetectorMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DistributionTrapezoid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_DetectorMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DetectorMask *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DetectorMask")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DetectorMask *)new DetectorMask();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DetectorMask, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -60012,16 +58126,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DetectorMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DetectorMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DetectorMask *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   DetectorMask *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_DetectorMask",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_DetectorMask,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_DetectorMask,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DetectorMask" "', argument " "1"" of type '" "DetectorMask const &""'"); 
   }
@@ -60042,27 +58155,23 @@ SWIGINTERN PyObject *_wrap_new_DetectorMask(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DetectorMask", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DetectorMask__SWIG_0(self, args);
+    return _wrap_new_DetectorMask__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_DetectorMask, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_DetectorMask, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_DetectorMask__SWIG_1(self, args);
+      return _wrap_new_DetectorMask__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DetectorMask'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DetectorMask'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DetectorMask::DetectorMask()\n"
     "    DetectorMask::DetectorMask(DetectorMask const &)\n");
@@ -60081,17 +58190,15 @@ SWIGINTERN PyObject *_wrap_DetectorMask_addMask(PyObject *SWIGUNUSEDPARM(self),
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DetectorMask_addMask",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DetectorMask_addMask", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_addMask" "', argument " "1"" of type '" "DetectorMask *""'"); 
   }
   arg1 = reinterpret_cast< DetectorMask * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DetectorMask_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
@@ -60099,7 +58206,7 @@ SWIGINTERN PyObject *_wrap_DetectorMask_addMask(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DetectorMask_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
   arg2 = reinterpret_cast< IShape2D * >(argp2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DetectorMask_addMask" "', argument " "3"" of type '" "bool""'");
   } 
@@ -60112,7 +58219,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   IDetector2D *arg2 = 0 ;
@@ -60120,16 +58227,14 @@ SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_0(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DetectorMask_initMaskData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_initMaskData" "', argument " "1"" of type '" "DetectorMask *""'"); 
   }
   arg1 = reinterpret_cast< DetectorMask * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDetector2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetector2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DetectorMask_initMaskData" "', argument " "2"" of type '" "IDetector2D const &""'"); 
   }
@@ -60145,7 +58250,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   OutputData< double > *arg2 = 0 ;
@@ -60153,16 +58258,14 @@ SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData__SWIG_1(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DetectorMask_initMaskData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_initMaskData" "', argument " "1"" of type '" "DetectorMask *""'"); 
   }
   arg1 = reinterpret_cast< DetectorMask * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DetectorMask_initMaskData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -60183,23 +58286,19 @@ SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData(PyObject *self, PyObject *a
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DetectorMask_initMaskData", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DetectorMask, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDetector2D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDetector2D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_DetectorMask_initMaskData__SWIG_0(self, args);
+        return _wrap_DetectorMask_initMaskData__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -60209,16 +58308,16 @@ SWIGINTERN PyObject *_wrap_DetectorMask_initMaskData(PyObject *self, PyObject *a
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_DetectorMask, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_DetectorMask_initMaskData__SWIG_1(self, args);
+        return _wrap_DetectorMask_initMaskData__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DetectorMask_initMaskData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DetectorMask_initMaskData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DetectorMask::initMaskData(IDetector2D const &)\n"
     "    DetectorMask::initMaskData(OutputData< double > const &)\n");
@@ -60234,17 +58333,16 @@ SWIGINTERN PyObject *_wrap_DetectorMask_isMasked(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DetectorMask_isMasked",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DetectorMask_isMasked", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_isMasked" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
   arg1 = reinterpret_cast< DetectorMask * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DetectorMask_isMasked" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -60262,11 +58360,12 @@ SWIGINTERN PyObject *_wrap_DetectorMask_getMaskData(PyObject *SWIGUNUSEDPARM(sel
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OutputData< bool > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_getMaskData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_getMaskData" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
@@ -60284,11 +58383,12 @@ SWIGINTERN PyObject *_wrap_DetectorMask_createHistogram(PyObject *SWIGUNUSEDPARM
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_createHistogram",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_createHistogram" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
@@ -60306,10 +58406,11 @@ SWIGINTERN PyObject *_wrap_DetectorMask_removeMasks(PyObject *SWIGUNUSEDPARM(sel
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_removeMasks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_removeMasks" "', argument " "1"" of type '" "DetectorMask *""'"); 
   }
@@ -60327,11 +58428,12 @@ SWIGINTERN PyObject *_wrap_DetectorMask_hasMasks(PyObject *SWIGUNUSEDPARM(self),
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_hasMasks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_hasMasks" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
@@ -60349,11 +58451,12 @@ SWIGINTERN PyObject *_wrap_DetectorMask_numberOfMaskedChannels(PyObject *SWIGUNU
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_numberOfMaskedChannels",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_numberOfMaskedChannels" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
@@ -60371,11 +58474,12 @@ SWIGINTERN PyObject *_wrap_DetectorMask_numberOfMasks(PyObject *SWIGUNUSEDPARM(s
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_numberOfMasks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_numberOfMasks" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
@@ -60399,23 +58503,21 @@ SWIGINTERN PyObject *_wrap_DetectorMask_getMaskShape(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   IShape2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:DetectorMask_getMaskShape",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DetectorMask_getMaskShape", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_getMaskShape" "', argument " "1"" of type '" "DetectorMask const *""'"); 
   }
   arg1 = reinterpret_cast< DetectorMask * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DetectorMask_getMaskShape" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_bool,  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_bool,  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DetectorMask_getMaskShape" "', argument " "3"" of type '" "bool &""'"); 
   }
@@ -60436,10 +58538,11 @@ SWIGINTERN PyObject *_wrap_delete_DetectorMask(PyObject *SWIGUNUSEDPARM(self), P
   DetectorMask *arg1 = (DetectorMask *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DetectorMask",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DetectorMask, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DetectorMask" "', argument " "1"" of type '" "DetectorMask *""'"); 
   }
@@ -60454,12 +58557,16 @@ fail:
 
 SWIGINTERN PyObject *DetectorMask_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DetectorMask, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DetectorMask_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -60476,35 +58583,30 @@ SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   Ellipse *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_Ellipse",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Ellipse" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Ellipse" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Ellipse" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Ellipse" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_Ellipse" "', argument " "5"" of type '" "double""'");
   } 
@@ -60517,7 +58619,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -60531,29 +58633,25 @@ SWIGINTERN PyObject *_wrap_new_Ellipse__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   Ellipse *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_Ellipse",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Ellipse" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Ellipse" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Ellipse" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Ellipse" "', argument " "4"" of type '" "double""'");
   } 
@@ -60571,13 +58669,9 @@ SWIGINTERN PyObject *_wrap_new_Ellipse(PyObject *self, PyObject *args) {
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Ellipse", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 4) {
     int _v;
     {
@@ -60600,7 +58694,7 @@ SWIGINTERN PyObject *_wrap_new_Ellipse(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_Ellipse__SWIG_1(self, args);
+            return _wrap_new_Ellipse__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -60633,7 +58727,7 @@ SWIGINTERN PyObject *_wrap_new_Ellipse(PyObject *self, PyObject *args) {
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_new_Ellipse__SWIG_0(self, args);
+              return _wrap_new_Ellipse__SWIG_0(self, argc, argv);
             }
           }
         }
@@ -60642,7 +58736,7 @@ SWIGINTERN PyObject *_wrap_new_Ellipse(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Ellipse'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Ellipse'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Ellipse::Ellipse(double,double,double,double,double)\n"
     "    Ellipse::Ellipse(double,double,double,double)\n");
@@ -60655,11 +58749,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_clone(PyObject *SWIGUNUSEDPARM(self), PyObjec
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Ellipse *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_clone" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60672,7 +58767,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Ellipse *arg1 = (Ellipse *) 0 ;
   double arg2 ;
@@ -60683,23 +58778,20 @@ SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Ellipse_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_contains" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
   arg1 = reinterpret_cast< Ellipse * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Ellipse_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Ellipse_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -60712,7 +58804,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Ellipse *arg1 = (Ellipse *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -60723,18 +58815,15 @@ SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Ellipse_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_contains" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
   arg1 = reinterpret_cast< Ellipse * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Ellipse_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -60742,7 +58831,7 @@ SWIGINTERN PyObject *_wrap_Ellipse_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Ellipse_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Ellipse_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -60763,26 +58852,22 @@ SWIGINTERN PyObject *_wrap_Ellipse_contains(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Ellipse_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Ellipse, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Ellipse_contains__SWIG_1(self, args);
+          return _wrap_Ellipse_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -60803,14 +58888,14 @@ SWIGINTERN PyObject *_wrap_Ellipse_contains(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Ellipse_contains__SWIG_0(self, args);
+          return _wrap_Ellipse_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Ellipse_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Ellipse_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Ellipse::contains(double,double) const\n"
     "    Ellipse::contains(Bin1D const &,Bin1D const &) const\n");
@@ -60823,11 +58908,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_getCenterX(PyObject *SWIGUNUSEDPARM(self), Py
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_getCenterX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_getCenterX" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60845,11 +58931,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_getCenterY(PyObject *SWIGUNUSEDPARM(self), Py
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_getCenterY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_getCenterY" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60867,11 +58954,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_getRadiusX(PyObject *SWIGUNUSEDPARM(self), Py
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_getRadiusX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_getRadiusX" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60889,11 +58977,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_getRadiusY(PyObject *SWIGUNUSEDPARM(self), Py
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_getRadiusY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_getRadiusY" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60911,11 +59000,12 @@ SWIGINTERN PyObject *_wrap_Ellipse_getTheta(PyObject *SWIGUNUSEDPARM(self), PyOb
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Ellipse_getTheta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Ellipse_getTheta" "', argument " "1"" of type '" "Ellipse const *""'"); 
   }
@@ -60933,10 +59023,11 @@ SWIGINTERN PyObject *_wrap_delete_Ellipse(PyObject *SWIGUNUSEDPARM(self), PyObje
   Ellipse *arg1 = (Ellipse *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Ellipse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Ellipse, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Ellipse, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Ellipse" "', argument " "1"" of type '" "Ellipse *""'"); 
   }
@@ -60951,21 +59042,26 @@ fail:
 
 SWIGINTERN PyObject *Ellipse_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Ellipse, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Ellipse_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IFTDecayFunction1D_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFTDecayFunction1D *arg1 = (IFTDecayFunction1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDecayFunction1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction1D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction1D_clone" "', argument " "1"" of type '" "IFTDecayFunction1D const *""'"); 
   }
@@ -60986,17 +59082,16 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction1D_evaluate(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFTDecayFunction1D_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDecayFunction1D_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction1D_evaluate" "', argument " "1"" of type '" "IFTDecayFunction1D const *""'"); 
   }
   arg1 = reinterpret_cast< IFTDecayFunction1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDecayFunction1D_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -61014,11 +59109,12 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction1D_decayLength(PyObject *SWIGUNUSEDPA
   IFTDecayFunction1D *arg1 = (IFTDecayFunction1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction1D_decayLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction1D_decayLength" "', argument " "1"" of type '" "IFTDecayFunction1D const *""'"); 
   }
@@ -61036,10 +59132,11 @@ SWIGINTERN PyObject *_wrap_delete_IFTDecayFunction1D(PyObject *SWIGUNUSEDPARM(se
   IFTDecayFunction1D *arg1 = (IFTDecayFunction1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFTDecayFunction1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction1D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction1D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFTDecayFunction1D" "', argument " "1"" of type '" "IFTDecayFunction1D *""'"); 
   }
@@ -61054,7 +59151,7 @@ fail:
 
 SWIGINTERN PyObject *IFTDecayFunction1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFTDecayFunction1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -61064,11 +59161,12 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DCauchy(PyObject *SWIGUNUSEDPARM(
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDecayFunction1DCauchy",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDecayFunction1DCauchy" "', argument " "1"" of type '" "double""'");
   } 
@@ -61086,11 +59184,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DCauchy_clone(PyObject *SWIGUNUSEDPAR
   FTDecayFunction1DCauchy *arg1 = (FTDecayFunction1DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction1DCauchy_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DCauchy_clone" "', argument " "1"" of type '" "FTDecayFunction1DCauchy const *""'"); 
   }
@@ -61111,16 +59210,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DCauchy_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DCauchy_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DCauchy_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DCauchy_accept" "', argument " "1"" of type '" "FTDecayFunction1DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DCauchy * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction1DCauchy_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -61141,17 +59239,16 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DCauchy_evaluate(PyObject *SWIGUNUSED
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DCauchy_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DCauchy_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DCauchy_evaluate" "', argument " "1"" of type '" "FTDecayFunction1DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DCauchy * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction1DCauchy_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -61169,10 +59266,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction1DCauchy(PyObject *SWIGUNUSEDPA
   FTDecayFunction1DCauchy *arg1 = (FTDecayFunction1DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction1DCauchy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DCauchy, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction1DCauchy" "', argument " "1"" of type '" "FTDecayFunction1DCauchy *""'"); 
   }
@@ -61187,21 +59285,26 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction1DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DCauchy, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDecayFunction1DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDecayFunction1DGauss",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDecayFunction1DGauss" "', argument " "1"" of type '" "double""'");
   } 
@@ -61219,11 +59322,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DGauss_clone(PyObject *SWIGUNUSEDPARM
   FTDecayFunction1DGauss *arg1 = (FTDecayFunction1DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction1DGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DGauss_clone" "', argument " "1"" of type '" "FTDecayFunction1DGauss const *""'"); 
   }
@@ -61244,16 +59348,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DGauss_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DGauss_accept" "', argument " "1"" of type '" "FTDecayFunction1DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction1DGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -61274,17 +59377,16 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DGauss_evaluate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DGauss_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DGauss_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DGauss_evaluate" "', argument " "1"" of type '" "FTDecayFunction1DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DGauss * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction1DGauss_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -61302,10 +59404,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction1DGauss(PyObject *SWIGUNUSEDPAR
   FTDecayFunction1DGauss *arg1 = (FTDecayFunction1DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction1DGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction1DGauss" "', argument " "1"" of type '" "FTDecayFunction1DGauss *""'"); 
   }
@@ -61320,21 +59423,26 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction1DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDecayFunction1DGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DTriangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DTriangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDecayFunction1DTriangle",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDecayFunction1DTriangle" "', argument " "1"" of type '" "double""'");
   } 
@@ -61352,11 +59460,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DTriangle_clone(PyObject *SWIGUNUSEDP
   FTDecayFunction1DTriangle *arg1 = (FTDecayFunction1DTriangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DTriangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction1DTriangle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DTriangle_clone" "', argument " "1"" of type '" "FTDecayFunction1DTriangle const *""'"); 
   }
@@ -61377,16 +59486,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DTriangle_accept(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DTriangle_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DTriangle_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DTriangle_accept" "', argument " "1"" of type '" "FTDecayFunction1DTriangle const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DTriangle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction1DTriangle_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -61407,17 +59515,16 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DTriangle_evaluate(PyObject *SWIGUNUS
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DTriangle_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DTriangle_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DTriangle_evaluate" "', argument " "1"" of type '" "FTDecayFunction1DTriangle const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DTriangle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction1DTriangle_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -61435,10 +59542,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction1DTriangle(PyObject *SWIGUNUSED
   FTDecayFunction1DTriangle *arg1 = (FTDecayFunction1DTriangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction1DTriangle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DTriangle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction1DTriangle" "', argument " "1"" of type '" "FTDecayFunction1DTriangle *""'"); 
   }
@@ -61453,11 +59561,15 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction1DTriangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DTriangle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDecayFunction1DTriangle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -61466,17 +59578,16 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt(PyObject *SWIGUNUSEDPARM(s
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FTDecayFunction1DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDecayFunction1DVoigt",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DVoigt", 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 '" "new_FTDecayFunction1DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction1DVoigt" "', argument " "2"" of type '" "double""'");
   } 
@@ -61494,11 +59605,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DVoigt_clone(PyObject *SWIGUNUSEDPARM
   FTDecayFunction1DVoigt *arg1 = (FTDecayFunction1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction1DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction1DVoigt_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DVoigt_clone" "', argument " "1"" of type '" "FTDecayFunction1DVoigt const *""'"); 
   }
@@ -61519,16 +59631,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DVoigt_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DVoigt_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DVoigt_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DVoigt_accept" "', argument " "1"" of type '" "FTDecayFunction1DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DVoigt * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction1DVoigt_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -61549,17 +59660,16 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DVoigt_evaluate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction1DVoigt_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction1DVoigt_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DVoigt_evaluate" "', argument " "1"" of type '" "FTDecayFunction1DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction1DVoigt * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction1DVoigt_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -61577,11 +59687,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction1DVoigt_eEta(PyObject *SWIGUNUSEDPARM(
   FTDecayFunction1DVoigt *arg1 = (FTDecayFunction1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction1DVoigt_eEta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction1DVoigt_eEta" "', argument " "1"" of type '" "FTDecayFunction1DVoigt const *""'"); 
   }
@@ -61599,10 +59710,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction1DVoigt(PyObject *SWIGUNUSEDPAR
   FTDecayFunction1DVoigt *arg1 = (FTDecayFunction1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction1DVoigt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction1DVoigt, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction1DVoigt" "', argument " "1"" of type '" "FTDecayFunction1DVoigt *""'"); 
   }
@@ -61617,21 +59729,26 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction1DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DVoigt, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDecayFunction1DVoigt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDecayFunction2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_clone" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
@@ -61652,16 +59769,15 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_setGamma(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFTDecayFunction2D_setGamma",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDecayFunction2D_setGamma", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_setGamma" "', argument " "1"" of type '" "IFTDecayFunction2D *""'"); 
   }
   arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDecayFunction2D_setGamma" "', argument " "2"" of type '" "double""'");
   } 
@@ -61679,11 +59795,12 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_gamma(PyObject *SWIGUNUSEDPARM(sel
   IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction2D_gamma",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_gamma" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
@@ -61701,11 +59818,12 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthX(PyObject *SWIGUNUSEDP
   IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction2D_decayLengthX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthX" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
@@ -61723,11 +59841,12 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthY(PyObject *SWIGUNUSEDP
   IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDecayFunction2D_decayLengthY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthY" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
@@ -61751,23 +59870,21 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_evaluate(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IFTDecayFunction2D_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDecayFunction2D_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_evaluate" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
   arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDecayFunction2D_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IFTDecayFunction2D_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -61800,41 +59917,36 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_boundingReciprocalLatticeCoordinat
   int ecode5 = 0 ;
   double val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
+  PyObject *swig_obj[6] ;
   std::pair< double,double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:IFTDecayFunction2D_boundingReciprocalLatticeCoordinates",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates", 6, 6, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'"); 
   }
   arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates" "', argument " "6"" of type '" "double""'");
   } 
@@ -61852,10 +59964,11 @@ SWIGINTERN PyObject *_wrap_delete_IFTDecayFunction2D(PyObject *SWIGUNUSEDPARM(se
   IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFTDecayFunction2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDecayFunction2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFTDecayFunction2D" "', argument " "1"" of type '" "IFTDecayFunction2D *""'"); 
   }
@@ -61870,12 +59983,12 @@ fail:
 
 SWIGINTERN PyObject *IFTDecayFunction2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFTDecayFunction2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -61886,23 +59999,20 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_0(PyObject *SWIGUNU
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDecayFunction2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDecayFunction2DCauchy",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "3"" of type '" "double""'");
   } 
@@ -61915,7 +60025,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -61923,17 +60033,15 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_1(PyObject *SWIGUNU
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDecayFunction2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDecayFunction2DCauchy",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "2"" of type '" "double""'");
   } 
@@ -61951,13 +60059,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DCauchy", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -61970,7 +60074,7 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDecayFunction2DCauchy__SWIG_1(self, args);
+        return _wrap_new_FTDecayFunction2DCauchy__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -61991,14 +60095,14 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDecayFunction2DCauchy__SWIG_0(self, args);
+          return _wrap_new_FTDecayFunction2DCauchy__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DCauchy'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DCauchy'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double,double,double)\n"
     "    FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double,double)\n");
@@ -62011,11 +60115,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DCauchy_clone(PyObject *SWIGUNUSEDPAR
   FTDecayFunction2DCauchy *arg1 = (FTDecayFunction2DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction2DCauchy_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DCauchy_clone" "', argument " "1"" of type '" "FTDecayFunction2DCauchy const *""'"); 
   }
@@ -62036,16 +60141,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DCauchy_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction2DCauchy_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DCauchy_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DCauchy_accept" "', argument " "1"" of type '" "FTDecayFunction2DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DCauchy * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction2DCauchy_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -62069,23 +60173,21 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DCauchy_evaluate(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDecayFunction2DCauchy_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DCauchy_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DCauchy_evaluate" "', argument " "1"" of type '" "FTDecayFunction2DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DCauchy * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction2DCauchy_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDecayFunction2DCauchy_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -62103,10 +60205,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction2DCauchy(PyObject *SWIGUNUSEDPA
   FTDecayFunction2DCauchy *arg1 = (FTDecayFunction2DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction2DCauchy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DCauchy, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction2DCauchy" "', argument " "1"" of type '" "FTDecayFunction2DCauchy *""'"); 
   }
@@ -62121,12 +60224,16 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction2DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DCauchy, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDecayFunction2DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -62137,23 +60244,20 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_0(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDecayFunction2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDecayFunction2DGauss",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DGauss" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDecayFunction2DGauss" "', argument " "3"" of type '" "double""'");
   } 
@@ -62166,7 +60270,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -62174,17 +60278,15 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_1(PyObject *SWIGUNUS
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDecayFunction2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDecayFunction2DGauss",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DGauss" "', argument " "2"" of type '" "double""'");
   } 
@@ -62202,13 +60304,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DGauss", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -62221,7 +60319,7 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *self, PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDecayFunction2DGauss__SWIG_1(self, args);
+        return _wrap_new_FTDecayFunction2DGauss__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -62242,14 +60340,14 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDecayFunction2DGauss__SWIG_0(self, args);
+          return _wrap_new_FTDecayFunction2DGauss__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DGauss'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DGauss'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDecayFunction2DGauss::FTDecayFunction2DGauss(double,double,double)\n"
     "    FTDecayFunction2DGauss::FTDecayFunction2DGauss(double,double)\n");
@@ -62262,11 +60360,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DGauss_clone(PyObject *SWIGUNUSEDPARM
   FTDecayFunction2DGauss *arg1 = (FTDecayFunction2DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction2DGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DGauss_clone" "', argument " "1"" of type '" "FTDecayFunction2DGauss const *""'"); 
   }
@@ -62287,16 +60386,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DGauss_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction2DGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DGauss_accept" "', argument " "1"" of type '" "FTDecayFunction2DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction2DGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -62320,23 +60418,21 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DGauss_evaluate(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDecayFunction2DGauss_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DGauss_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DGauss_evaluate" "', argument " "1"" of type '" "FTDecayFunction2DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DGauss * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction2DGauss_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDecayFunction2DGauss_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -62354,10 +60450,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction2DGauss(PyObject *SWIGUNUSEDPAR
   FTDecayFunction2DGauss *arg1 = (FTDecayFunction2DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction2DGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction2DGauss" "', argument " "1"" of type '" "FTDecayFunction2DGauss *""'"); 
   }
@@ -62372,12 +60469,16 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction2DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDecayFunction2DGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -62391,29 +60492,25 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_0(PyObject *SWIGUNUS
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   FTDecayFunction2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FTDecayFunction2DVoigt",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "4"" of type '" "double""'");
   } 
@@ -62426,7 +60523,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -62437,23 +60534,20 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_1(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDecayFunction2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDecayFunction2DVoigt",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "3"" of type '" "double""'");
   } 
@@ -62471,13 +60565,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *self, PyObject *
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DVoigt", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     {
@@ -62495,7 +60585,7 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDecayFunction2DVoigt__SWIG_1(self, args);
+          return _wrap_new_FTDecayFunction2DVoigt__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -62522,7 +60612,7 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *self, PyObject *
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_FTDecayFunction2DVoigt__SWIG_0(self, args);
+            return _wrap_new_FTDecayFunction2DVoigt__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -62530,7 +60620,7 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DVoigt'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DVoigt'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double,double,double,double)\n"
     "    FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double,double,double)\n");
@@ -62543,11 +60633,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DVoigt_clone(PyObject *SWIGUNUSEDPARM
   FTDecayFunction2DVoigt *arg1 = (FTDecayFunction2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDecayFunction2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction2DVoigt_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DVoigt_clone" "', argument " "1"" of type '" "FTDecayFunction2DVoigt const *""'"); 
   }
@@ -62568,16 +60659,15 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DVoigt_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDecayFunction2DVoigt_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DVoigt_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DVoigt_accept" "', argument " "1"" of type '" "FTDecayFunction2DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DVoigt * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDecayFunction2DVoigt_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -62601,23 +60691,21 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DVoigt_evaluate(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDecayFunction2DVoigt_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDecayFunction2DVoigt_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DVoigt_evaluate" "', argument " "1"" of type '" "FTDecayFunction2DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDecayFunction2DVoigt * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDecayFunction2DVoigt_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDecayFunction2DVoigt_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -62635,11 +60723,12 @@ SWIGINTERN PyObject *_wrap_FTDecayFunction2DVoigt_eta(PyObject *SWIGUNUSEDPARM(s
   FTDecayFunction2DVoigt *arg1 = (FTDecayFunction2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDecayFunction2DVoigt_eta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDecayFunction2DVoigt_eta" "', argument " "1"" of type '" "FTDecayFunction2DVoigt const *""'"); 
   }
@@ -62657,10 +60746,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDecayFunction2DVoigt(PyObject *SWIGUNUSEDPAR
   FTDecayFunction2DVoigt *arg1 = (FTDecayFunction2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDecayFunction2DVoigt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDecayFunction2DVoigt, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDecayFunction2DVoigt" "', argument " "1"" of type '" "FTDecayFunction2DVoigt *""'"); 
   }
@@ -62675,20 +60765,25 @@ fail:
 
 SWIGINTERN PyObject *FTDecayFunction2DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DVoigt, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDecayFunction2DVoigt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IFTDistribution1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFTDistribution1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFTDistribution1D" "', argument " "1"" of type '" "IFTDistribution1D *""'"); 
   }
@@ -62706,11 +60801,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution1D_clone(PyObject *SWIGUNUSEDPARM(self
   IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDistribution1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution1D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_clone" "', argument " "1"" of type '" "IFTDistribution1D const *""'"); 
   }
@@ -62731,17 +60827,16 @@ SWIGINTERN PyObject *_wrap_IFTDistribution1D_evaluate(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFTDistribution1D_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDistribution1D_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_evaluate" "', argument " "1"" of type '" "IFTDistribution1D const *""'"); 
   }
   arg1 = reinterpret_cast< IFTDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution1D_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -62762,16 +60857,15 @@ SWIGINTERN PyObject *_wrap_IFTDistribution1D_setOmega(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFTDistribution1D_setOmega",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDistribution1D_setOmega", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_setOmega" "', argument " "1"" of type '" "IFTDistribution1D *""'"); 
   }
   arg1 = reinterpret_cast< IFTDistribution1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution1D_setOmega" "', argument " "2"" of type '" "double""'");
   } 
@@ -62789,11 +60883,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution1D_omega(PyObject *SWIGUNUSEDPARM(self
   IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution1D_omega",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_omega" "', argument " "1"" of type '" "IFTDistribution1D const *""'"); 
   }
@@ -62811,11 +60906,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution1D_qSecondDerivative(PyObject *SWIGUNU
   IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution1D_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_qSecondDerivative" "', argument " "1"" of type '" "IFTDistribution1D const *""'"); 
   }
@@ -62830,7 +60926,7 @@ fail:
 
 SWIGINTERN PyObject *IFTDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFTDistribution1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -62840,11 +60936,12 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution1DCauchy(PyObject *SWIGUNUSEDPARM(s
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDistribution1DCauchy",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDistribution1DCauchy" "', argument " "1"" of type '" "double""'");
   } 
@@ -62862,11 +60959,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCauchy_clone(PyObject *SWIGUNUSEDPARM
   FTDistribution1DCauchy *arg1 = (FTDistribution1DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DCauchy_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCauchy_clone" "', argument " "1"" of type '" "FTDistribution1DCauchy const *""'"); 
   }
@@ -62887,16 +60985,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCauchy_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DCauchy_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DCauchy_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCauchy_accept" "', argument " "1"" of type '" "FTDistribution1DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DCauchy * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DCauchy_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -62917,17 +61014,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCauchy_evaluate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DCauchy_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DCauchy_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCauchy_evaluate" "', argument " "1"" of type '" "FTDistribution1DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DCauchy * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DCauchy_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -62945,11 +61041,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCauchy_qSecondDerivative(PyObject *SW
   FTDistribution1DCauchy *arg1 = (FTDistribution1DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DCauchy_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCauchy_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DCauchy const *""'"); 
   }
@@ -62967,10 +61064,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DCauchy(PyObject *SWIGUNUSEDPAR
   FTDistribution1DCauchy *arg1 = (FTDistribution1DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DCauchy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCauchy, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCauchy, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DCauchy" "', argument " "1"" of type '" "FTDistribution1DCauchy *""'"); 
   }
@@ -62985,21 +61083,26 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DCauchy, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDistribution1DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDistribution1DGauss",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDistribution1DGauss" "', argument " "1"" of type '" "double""'");
   } 
@@ -63017,11 +61120,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGauss_clone(PyObject *SWIGUNUSEDPARM(
   FTDistribution1DGauss *arg1 = (FTDistribution1DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGauss_clone" "', argument " "1"" of type '" "FTDistribution1DGauss const *""'"); 
   }
@@ -63042,16 +61146,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGauss_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGauss_accept" "', argument " "1"" of type '" "FTDistribution1DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -63072,17 +61175,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGauss_evaluate(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DGauss_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DGauss_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGauss_evaluate" "', argument " "1"" of type '" "FTDistribution1DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DGauss * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DGauss_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -63100,11 +61202,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGauss_qSecondDerivative(PyObject *SWI
   FTDistribution1DGauss *arg1 = (FTDistribution1DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DGauss_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGauss_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DGauss const *""'"); 
   }
@@ -63122,10 +61225,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DGauss(PyObject *SWIGUNUSEDPARM
   FTDistribution1DGauss *arg1 = (FTDistribution1DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DGauss" "', argument " "1"" of type '" "FTDistribution1DGauss *""'"); 
   }
@@ -63140,21 +61244,26 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDistribution1DGate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDistribution1DGate",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDistribution1DGate" "', argument " "1"" of type '" "double""'");
   } 
@@ -63172,11 +61281,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGate_clone(PyObject *SWIGUNUSEDPARM(s
   FTDistribution1DGate *arg1 = (FTDistribution1DGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DGate_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGate_clone" "', argument " "1"" of type '" "FTDistribution1DGate const *""'"); 
   }
@@ -63197,16 +61307,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGate_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DGate_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DGate_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGate_accept" "', argument " "1"" of type '" "FTDistribution1DGate const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DGate * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DGate_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -63227,17 +61336,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGate_evaluate(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DGate_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DGate_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGate_evaluate" "', argument " "1"" of type '" "FTDistribution1DGate const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DGate * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DGate_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -63255,11 +61363,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DGate_qSecondDerivative(PyObject *SWIG
   FTDistribution1DGate *arg1 = (FTDistribution1DGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DGate_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DGate_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DGate const *""'"); 
   }
@@ -63277,10 +61386,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DGate(PyObject *SWIGUNUSEDPARM(
   FTDistribution1DGate *arg1 = (FTDistribution1DGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DGate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DGate, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DGate, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DGate" "', argument " "1"" of type '" "FTDistribution1DGate *""'"); 
   }
@@ -63295,21 +61405,26 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DGate, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DGate_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDistribution1DTriangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DTriangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDistribution1DTriangle",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDistribution1DTriangle" "', argument " "1"" of type '" "double""'");
   } 
@@ -63327,11 +61442,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DTriangle_clone(PyObject *SWIGUNUSEDPA
   FTDistribution1DTriangle *arg1 = (FTDistribution1DTriangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DTriangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DTriangle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DTriangle_clone" "', argument " "1"" of type '" "FTDistribution1DTriangle const *""'"); 
   }
@@ -63352,16 +61468,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DTriangle_accept(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DTriangle_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DTriangle_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DTriangle_accept" "', argument " "1"" of type '" "FTDistribution1DTriangle const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DTriangle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DTriangle_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -63382,17 +61497,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DTriangle_evaluate(PyObject *SWIGUNUSE
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DTriangle_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DTriangle_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DTriangle_evaluate" "', argument " "1"" of type '" "FTDistribution1DTriangle const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DTriangle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DTriangle_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -63410,11 +61524,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DTriangle_qSecondDerivative(PyObject *
   FTDistribution1DTriangle *arg1 = (FTDistribution1DTriangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DTriangle_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DTriangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DTriangle_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DTriangle const *""'"); 
   }
@@ -63432,10 +61547,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DTriangle(PyObject *SWIGUNUSEDP
   FTDistribution1DTriangle *arg1 = (FTDistribution1DTriangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DTriangle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DTriangle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DTriangle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DTriangle" "', argument " "1"" of type '" "FTDistribution1DTriangle *""'"); 
   }
@@ -63450,21 +61566,26 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DTriangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DTriangle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DTriangle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDistribution1DCosine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FTDistribution1DCosine",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FTDistribution1DCosine" "', argument " "1"" of type '" "double""'");
   } 
@@ -63482,11 +61603,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCosine_clone(PyObject *SWIGUNUSEDPARM
   FTDistribution1DCosine *arg1 = (FTDistribution1DCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DCosine_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCosine_clone" "', argument " "1"" of type '" "FTDistribution1DCosine const *""'"); 
   }
@@ -63507,16 +61629,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCosine_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DCosine_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DCosine_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCosine_accept" "', argument " "1"" of type '" "FTDistribution1DCosine const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DCosine * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DCosine_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -63537,17 +61658,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCosine_evaluate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DCosine_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DCosine_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCosine_evaluate" "', argument " "1"" of type '" "FTDistribution1DCosine const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DCosine * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DCosine_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -63565,11 +61685,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DCosine_qSecondDerivative(PyObject *SW
   FTDistribution1DCosine *arg1 = (FTDistribution1DCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DCosine_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DCosine_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DCosine const *""'"); 
   }
@@ -63587,10 +61708,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DCosine(PyObject *SWIGUNUSEDPAR
   FTDistribution1DCosine *arg1 = (FTDistribution1DCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DCosine",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DCosine, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DCosine, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DCosine" "', argument " "1"" of type '" "FTDistribution1DCosine *""'"); 
   }
@@ -63605,11 +61727,15 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DCosine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DCosine, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DCosine_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -63618,17 +61744,16 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt(PyObject *SWIGUNUSEDPARM(se
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FTDistribution1DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDistribution1DVoigt",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution1DVoigt", 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 '" "new_FTDistribution1DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution1DVoigt" "', argument " "2"" of type '" "double""'");
   } 
@@ -63646,11 +61771,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_clone(PyObject *SWIGUNUSEDPARM(
   FTDistribution1DVoigt *arg1 = (FTDistribution1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution1DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DVoigt_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DVoigt_clone" "', argument " "1"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
@@ -63671,16 +61797,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DVoigt_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DVoigt_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DVoigt_accept" "', argument " "1"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DVoigt * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution1DVoigt_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -63701,17 +61826,16 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_evaluate(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution1DVoigt_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution1DVoigt_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DVoigt_evaluate" "', argument " "1"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution1DVoigt * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution1DVoigt_evaluate" "', argument " "2"" of type '" "double""'");
   } 
@@ -63729,11 +61853,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_eta(PyObject *SWIGUNUSEDPARM(se
   FTDistribution1DVoigt *arg1 = (FTDistribution1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DVoigt_eta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DVoigt_eta" "', argument " "1"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
@@ -63751,11 +61876,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_qSecondDerivative(PyObject *SWI
   FTDistribution1DVoigt *arg1 = (FTDistribution1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution1DVoigt_qSecondDerivative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution1DVoigt_qSecondDerivative" "', argument " "1"" of type '" "FTDistribution1DVoigt const *""'"); 
   }
@@ -63773,10 +61899,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution1DVoigt(PyObject *SWIGUNUSEDPARM
   FTDistribution1DVoigt *arg1 = (FTDistribution1DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution1DVoigt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution1DVoigt, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution1DVoigt, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution1DVoigt" "', argument " "1"" of type '" "FTDistribution1DVoigt *""'"); 
   }
@@ -63791,21 +61918,26 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution1DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DVoigt, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution1DVoigt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IFTDistribution2D_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDistribution2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_clone" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
@@ -63826,16 +61958,15 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_setGamma(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFTDistribution2D_setGamma",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDistribution2D_setGamma", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_setGamma" "', argument " "1"" of type '" "IFTDistribution2D *""'"); 
   }
   arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution2D_setGamma" "', argument " "2"" of type '" "double""'");
   } 
@@ -63853,11 +61984,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_gamma(PyObject *SWIGUNUSEDPARM(self
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution2D_gamma",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_gamma" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
@@ -63875,11 +62007,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_delta(PyObject *SWIGUNUSEDPARM(self
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution2D_delta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_delta" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
@@ -63897,11 +62030,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaX(PyObject *SWIGUNUSEDPARM(sel
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution2D_omegaX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaX" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
@@ -63919,11 +62053,12 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaY(PyObject *SWIGUNUSEDPARM(sel
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFTDistribution2D_omegaY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaY" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
@@ -63947,23 +62082,21 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_evaluate(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IFTDistribution2D_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFTDistribution2D_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_evaluate" "', argument " "1"" of type '" "IFTDistribution2D const *""'"); 
   }
   arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution2D_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IFTDistribution2D_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -63981,10 +62114,11 @@ SWIGINTERN PyObject *_wrap_delete_IFTDistribution2D(PyObject *SWIGUNUSEDPARM(sel
   IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFTDistribution2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFTDistribution2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFTDistribution2D" "', argument " "1"" of type '" "IFTDistribution2D *""'"); 
   }
@@ -63999,12 +62133,12 @@ fail:
 
 SWIGINTERN PyObject *IFTDistribution2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFTDistribution2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64015,23 +62149,20 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_0(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDistribution2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDistribution2DCauchy",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCauchy" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DCauchy" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DCauchy" "', argument " "3"" of type '" "double""'");
   } 
@@ -64044,7 +62175,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64052,17 +62183,15 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_1(PyObject *SWIGUNUS
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDistribution2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDistribution2DCauchy",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCauchy" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DCauchy" "', argument " "2"" of type '" "double""'");
   } 
@@ -64080,13 +62209,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCauchy", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -64099,7 +62224,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *self, PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDistribution2DCauchy__SWIG_1(self, args);
+        return _wrap_new_FTDistribution2DCauchy__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -64120,14 +62245,14 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDistribution2DCauchy__SWIG_0(self, args);
+          return _wrap_new_FTDistribution2DCauchy__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCauchy'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCauchy'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDistribution2DCauchy::FTDistribution2DCauchy(double,double,double)\n"
     "    FTDistribution2DCauchy::FTDistribution2DCauchy(double,double)\n");
@@ -64140,11 +62265,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCauchy_clone(PyObject *SWIGUNUSEDPARM
   FTDistribution2DCauchy *arg1 = (FTDistribution2DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution2DCauchy *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DCauchy_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCauchy_clone" "', argument " "1"" of type '" "FTDistribution2DCauchy const *""'"); 
   }
@@ -64165,16 +62291,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCauchy_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution2DCauchy_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DCauchy_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCauchy_accept" "', argument " "1"" of type '" "FTDistribution2DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DCauchy * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution2DCauchy_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -64198,23 +62323,21 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCauchy_evaluate(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDistribution2DCauchy_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DCauchy_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCauchy, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCauchy_evaluate" "', argument " "1"" of type '" "FTDistribution2DCauchy const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DCauchy * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution2DCauchy_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDistribution2DCauchy_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -64232,10 +62355,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution2DCauchy(PyObject *SWIGUNUSEDPAR
   FTDistribution2DCauchy *arg1 = (FTDistribution2DCauchy *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution2DCauchy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCauchy, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCauchy, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution2DCauchy" "', argument " "1"" of type '" "FTDistribution2DCauchy *""'"); 
   }
@@ -64250,12 +62374,16 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution2DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DCauchy, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDistribution2DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64266,23 +62394,20 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_0(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDistribution2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDistribution2DGauss",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DGauss" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DGauss" "', argument " "3"" of type '" "double""'");
   } 
@@ -64295,7 +62420,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64303,17 +62428,15 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_1(PyObject *SWIGUNUSE
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDistribution2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDistribution2DGauss",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DGauss" "', argument " "2"" of type '" "double""'");
   } 
@@ -64331,13 +62454,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *self, PyObject *a
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGauss", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -64350,7 +62469,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *self, PyObject *a
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDistribution2DGauss__SWIG_1(self, args);
+        return _wrap_new_FTDistribution2DGauss__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -64371,14 +62490,14 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *self, PyObject *a
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDistribution2DGauss__SWIG_0(self, args);
+          return _wrap_new_FTDistribution2DGauss__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGauss'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGauss'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDistribution2DGauss::FTDistribution2DGauss(double,double,double)\n"
     "    FTDistribution2DGauss::FTDistribution2DGauss(double,double)\n");
@@ -64391,11 +62510,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGauss_clone(PyObject *SWIGUNUSEDPARM(
   FTDistribution2DGauss *arg1 = (FTDistribution2DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution2DGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGauss_clone" "', argument " "1"" of type '" "FTDistribution2DGauss const *""'"); 
   }
@@ -64416,16 +62536,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGauss_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution2DGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGauss_accept" "', argument " "1"" of type '" "FTDistribution2DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution2DGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -64449,23 +62568,21 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGauss_evaluate(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDistribution2DGauss_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DGauss_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGauss_evaluate" "', argument " "1"" of type '" "FTDistribution2DGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DGauss * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution2DGauss_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDistribution2DGauss_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -64483,10 +62600,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution2DGauss(PyObject *SWIGUNUSEDPARM
   FTDistribution2DGauss *arg1 = (FTDistribution2DGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution2DGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution2DGauss" "', argument " "1"" of type '" "FTDistribution2DGauss *""'"); 
   }
@@ -64501,12 +62619,16 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution2DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDistribution2DGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64517,23 +62639,20 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDistribution2DGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDistribution2DGate",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGate" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DGate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DGate" "', argument " "3"" of type '" "double""'");
   } 
@@ -64546,7 +62665,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64554,17 +62673,15 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_1(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDistribution2DGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDistribution2DGate",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGate" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DGate" "', argument " "2"" of type '" "double""'");
   } 
@@ -64582,13 +62699,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGate", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -64601,7 +62714,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDistribution2DGate__SWIG_1(self, args);
+        return _wrap_new_FTDistribution2DGate__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -64622,14 +62735,14 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDistribution2DGate__SWIG_0(self, args);
+          return _wrap_new_FTDistribution2DGate__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGate'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGate'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDistribution2DGate::FTDistribution2DGate(double,double,double)\n"
     "    FTDistribution2DGate::FTDistribution2DGate(double,double)\n");
@@ -64642,11 +62755,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGate_clone(PyObject *SWIGUNUSEDPARM(s
   FTDistribution2DGate *arg1 = (FTDistribution2DGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution2DGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DGate_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGate_clone" "', argument " "1"" of type '" "FTDistribution2DGate const *""'"); 
   }
@@ -64667,16 +62781,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGate_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution2DGate_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DGate_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGate_accept" "', argument " "1"" of type '" "FTDistribution2DGate const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DGate * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution2DGate_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -64700,23 +62813,21 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DGate_evaluate(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDistribution2DGate_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DGate_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DGate_evaluate" "', argument " "1"" of type '" "FTDistribution2DGate const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DGate * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution2DGate_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDistribution2DGate_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -64734,10 +62845,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution2DGate(PyObject *SWIGUNUSEDPARM(
   FTDistribution2DGate *arg1 = (FTDistribution2DGate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution2DGate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DGate, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DGate, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution2DGate" "', argument " "1"" of type '" "FTDistribution2DGate *""'"); 
   }
@@ -64752,12 +62864,16 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution2DGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DGate, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDistribution2DGate_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64768,23 +62884,20 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDistribution2DCone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDistribution2DCone",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCone" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DCone" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DCone" "', argument " "3"" of type '" "double""'");
   } 
@@ -64797,7 +62910,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -64805,17 +62918,15 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_1(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FTDistribution2DCone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FTDistribution2DCone",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCone" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DCone" "', argument " "2"" of type '" "double""'");
   } 
@@ -64833,13 +62944,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCone", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -64852,7 +62959,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FTDistribution2DCone__SWIG_1(self, args);
+        return _wrap_new_FTDistribution2DCone__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -64873,14 +62980,14 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDistribution2DCone__SWIG_0(self, args);
+          return _wrap_new_FTDistribution2DCone__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCone'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCone'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDistribution2DCone::FTDistribution2DCone(double,double,double)\n"
     "    FTDistribution2DCone::FTDistribution2DCone(double,double)\n");
@@ -64893,11 +63000,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCone_clone(PyObject *SWIGUNUSEDPARM(s
   FTDistribution2DCone *arg1 = (FTDistribution2DCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution2DCone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DCone_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCone_clone" "', argument " "1"" of type '" "FTDistribution2DCone const *""'"); 
   }
@@ -64918,16 +63026,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCone_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution2DCone_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DCone_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCone_accept" "', argument " "1"" of type '" "FTDistribution2DCone const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DCone * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution2DCone_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -64951,23 +63058,21 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DCone_evaluate(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDistribution2DCone_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DCone_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DCone_evaluate" "', argument " "1"" of type '" "FTDistribution2DCone const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DCone * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution2DCone_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDistribution2DCone_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -64985,10 +63090,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution2DCone(PyObject *SWIGUNUSEDPARM(
   FTDistribution2DCone *arg1 = (FTDistribution2DCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution2DCone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DCone, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DCone, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution2DCone" "', argument " "1"" of type '" "FTDistribution2DCone *""'"); 
   }
@@ -65003,12 +63109,16 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution2DCone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DCone, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FTDistribution2DCone_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -65022,29 +63132,25 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_0(PyObject *SWIGUNUSE
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   FTDistribution2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FTDistribution2DVoigt",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DVoigt" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DVoigt" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FTDistribution2DVoigt" "', argument " "4"" of type '" "double""'");
   } 
@@ -65057,7 +63163,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -65068,23 +63174,20 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_1(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FTDistribution2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FTDistribution2DVoigt",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DVoigt" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FTDistribution2DVoigt" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FTDistribution2DVoigt" "', argument " "3"" of type '" "double""'");
   } 
@@ -65102,13 +63205,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *self, PyObject *a
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DVoigt", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     {
@@ -65126,7 +63225,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *self, PyObject *a
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FTDistribution2DVoigt__SWIG_1(self, args);
+          return _wrap_new_FTDistribution2DVoigt__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -65153,7 +63252,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *self, PyObject *a
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_FTDistribution2DVoigt__SWIG_0(self, args);
+            return _wrap_new_FTDistribution2DVoigt__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -65161,7 +63260,7 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FTDistribution2DVoigt'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DVoigt'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FTDistribution2DVoigt::FTDistribution2DVoigt(double,double,double,double)\n"
     "    FTDistribution2DVoigt::FTDistribution2DVoigt(double,double,double)\n");
@@ -65174,11 +63273,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DVoigt_clone(PyObject *SWIGUNUSEDPARM(
   FTDistribution2DVoigt *arg1 = (FTDistribution2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FTDistribution2DVoigt *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DVoigt_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DVoigt_clone" "', argument " "1"" of type '" "FTDistribution2DVoigt const *""'"); 
   }
@@ -65199,16 +63299,15 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DVoigt_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FTDistribution2DVoigt_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DVoigt_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DVoigt_accept" "', argument " "1"" of type '" "FTDistribution2DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DVoigt * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FTDistribution2DVoigt_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -65232,23 +63331,21 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DVoigt_evaluate(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FTDistribution2DVoigt_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FTDistribution2DVoigt_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DVoigt_evaluate" "', argument " "1"" of type '" "FTDistribution2DVoigt const *""'"); 
   }
   arg1 = reinterpret_cast< FTDistribution2DVoigt * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FTDistribution2DVoigt_evaluate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FTDistribution2DVoigt_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -65266,11 +63363,12 @@ SWIGINTERN PyObject *_wrap_FTDistribution2DVoigt_eta(PyObject *SWIGUNUSEDPARM(se
   FTDistribution2DVoigt *arg1 = (FTDistribution2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FTDistribution2DVoigt_eta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DVoigt, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FTDistribution2DVoigt_eta" "', argument " "1"" of type '" "FTDistribution2DVoigt const *""'"); 
   }
@@ -65288,10 +63386,11 @@ SWIGINTERN PyObject *_wrap_delete_FTDistribution2DVoigt(PyObject *SWIGUNUSEDPARM
   FTDistribution2DVoigt *arg1 = (FTDistribution2DVoigt *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FTDistribution2DVoigt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FTDistribution2DVoigt, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FTDistribution2DVoigt, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FTDistribution2DVoigt" "', argument " "1"" of type '" "FTDistribution2DVoigt *""'"); 
   }
@@ -65306,11 +63405,15 @@ fail:
 
 SWIGINTERN PyObject *FTDistribution2DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DVoigt, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FTDistribution2DVoigt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FixedBinAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
@@ -65324,16 +63427,13 @@ SWIGINTERN PyObject *_wrap_new_FixedBinAxis(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FixedBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FixedBinAxis",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_FixedBinAxis", 4, 4, swig_obj)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FixedBinAxis" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -65342,17 +63442,17 @@ SWIGINTERN PyObject *_wrap_new_FixedBinAxis(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FixedBinAxis" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FixedBinAxis" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FixedBinAxis" "', argument " "4"" of type '" "double""'");
   } 
@@ -65372,10 +63472,11 @@ SWIGINTERN PyObject *_wrap_delete_FixedBinAxis(PyObject *SWIGUNUSEDPARM(self), P
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FixedBinAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FixedBinAxis" "', argument " "1"" of type '" "FixedBinAxis *""'"); 
   }
@@ -65393,11 +63494,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_clone(PyObject *SWIGUNUSEDPARM(self), Py
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FixedBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_clone" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65415,11 +63517,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_size(PyObject *SWIGUNUSEDPARM(self), PyO
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_size" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65440,17 +63543,16 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBin(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FixedBinAxis_getBin",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FixedBinAxis_getBin", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getBin" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< FixedBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FixedBinAxis_getBin" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -65468,11 +63570,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getMin(PyObject *SWIGUNUSEDPARM(self), P
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_getMin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getMin" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65490,11 +63593,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getMax(PyObject *SWIGUNUSEDPARM(self), P
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_getMax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getMax" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65515,17 +63619,16 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBinCenter(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FixedBinAxis_getBinCenter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FixedBinAxis_getBinCenter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getBinCenter" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< FixedBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FixedBinAxis_getBinCenter" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -65546,17 +63649,16 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_findClosestIndex(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FixedBinAxis_findClosestIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FixedBinAxis_findClosestIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_findClosestIndex" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< FixedBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FixedBinAxis_findClosestIndex" "', argument " "2"" of type '" "double""'");
   } 
@@ -65574,11 +63676,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBinCenters(PyObject *SWIGUNUSEDPARM(s
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_getBinCenters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getBinCenters" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65596,11 +63699,12 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBinBoundaries(PyObject *SWIGUNUSEDPAR
   FixedBinAxis *arg1 = (FixedBinAxis *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FixedBinAxis_getBinBoundaries",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_getBinBoundaries" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
@@ -65624,23 +63728,21 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_createClippedAxis(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FixedBinAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FixedBinAxis_createClippedAxis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FixedBinAxis_createClippedAxis", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis_createClippedAxis" "', argument " "1"" of type '" "FixedBinAxis const *""'"); 
   }
   arg1 = reinterpret_cast< FixedBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FixedBinAxis_createClippedAxis" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FixedBinAxis_createClippedAxis" "', argument " "3"" of type '" "double""'");
   } 
@@ -65661,17 +63763,16 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis___getitem__(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FixedBinAxis___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FixedBinAxis___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FixedBinAxis, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FixedBinAxis___getitem__" "', argument " "1"" of type '" "FixedBinAxis *""'"); 
   }
   arg1 = reinterpret_cast< FixedBinAxis * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FixedBinAxis___getitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -65686,19 +63787,24 @@ fail:
 
 SWIGINTERN PyObject *FixedBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FixedBinAxis, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FixedBinAxis_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_IFormFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IFormFactor",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (IFormFactor *)new SwigDirector_IFormFactor(arg1); 
@@ -65719,10 +63825,11 @@ SWIGINTERN PyObject *_wrap_delete_IFormFactor(PyObject *SWIGUNUSEDPARM(self), Py
   IFormFactor *arg1 = (IFormFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFormFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactor, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFormFactor" "', argument " "1"" of type '" "IFormFactor *""'"); 
   }
@@ -65740,19 +63847,20 @@ SWIGINTERN PyObject *_wrap_IFormFactor_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   IFormFactor *arg1 = (IFormFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactor_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactor_clone" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::clone");
@@ -65792,21 +63900,18 @@ SWIGINTERN PyObject *_wrap_IFormFactor_createSlicedFormFactor(PyObject *SWIGUNUS
   int res3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   Swig::Director *director = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IFormFactor_createSlicedFormFactor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_createSlicedFormFactor", 4, 4, 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 '" "IFormFactor_createSlicedFormFactor" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_createSlicedFormFactor" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -65818,7 +63923,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_createSlicedFormFactor(PyObject *SWIGUNUS
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IRotation,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IFormFactor_createSlicedFormFactor" "', argument " "3"" of type '" "IRotation const &""'"); 
   }
@@ -65827,7 +63932,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_createSlicedFormFactor(PyObject *SWIGUNUS
   }
   arg3 = reinterpret_cast< IRotation * >(argp3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IFormFactor_createSlicedFormFactor" "', argument " "4"" of type '" "kvector_t""'"); 
     }  
@@ -65861,19 +63966,18 @@ SWIGINTERN PyObject *_wrap_IFormFactor_setAmbientMaterial(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_setAmbientMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_setAmbientMaterial", 2, 2, 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 '" "IFormFactor_setAmbientMaterial" "', argument " "1"" of type '" "IFormFactor *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_setAmbientMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -65886,7 +63990,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_setAmbientMaterial(PyObject *SWIGUNUSEDPA
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::setAmbientMaterial");
@@ -65911,19 +64015,18 @@ SWIGINTERN PyObject *_wrap_IFormFactor_evaluate(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_evaluate", 2, 2, 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 '" "IFormFactor_evaluate" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_evaluate" "', argument " "2"" of type '" "WavevectorInfo const &""'"); 
   }
@@ -65932,7 +64035,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_evaluate(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< WavevectorInfo * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::evaluate");
@@ -65954,19 +64057,20 @@ SWIGINTERN PyObject *_wrap_IFormFactor_volume(PyObject *SWIGUNUSEDPARM(self), Py
   IFormFactor *arg1 = (IFormFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactor_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactor_volume" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IFormFactor const *)arg1)->IFormFactor::volume();
@@ -65988,19 +64092,20 @@ SWIGINTERN PyObject *_wrap_IFormFactor_radialExtension(PyObject *SWIGUNUSEDPARM(
   IFormFactor *arg1 = (IFormFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactor_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactor_radialExtension" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::radialExtension");
@@ -66025,19 +64130,18 @@ SWIGINTERN PyObject *_wrap_IFormFactor_bottomZ(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_bottomZ", 2, 2, 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 '" "IFormFactor_bottomZ" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -66046,7 +64150,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_bottomZ(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< IRotation * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::bottomZ");
@@ -66071,19 +64175,18 @@ SWIGINTERN PyObject *_wrap_IFormFactor_topZ(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_topZ", 2, 2, 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 '" "IFormFactor_topZ" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -66092,7 +64195,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_topZ(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< IRotation * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactor::topZ");
@@ -66117,20 +64220,19 @@ SWIGINTERN PyObject *_wrap_IFormFactor_canSliceAnalytically(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   SwigDirector_IFormFactor *darg = 0;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_canSliceAnalytically",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_canSliceAnalytically", 2, 2, 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 '" "IFormFactor_canSliceAnalytically" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_canSliceAnalytically" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -66143,7 +64245,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_canSliceAnalytically(PyObject *SWIGUNUSED
     SWIG_SetErrorMsg(PyExc_RuntimeError,"accessing protected member canSliceAnalytically");
     SWIG_fail;
   }
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     darg = dynamic_cast<SwigDirector_IFormFactor *>(arg1);
     if (upcall) {
@@ -66175,23 +64277,20 @@ SWIGINTERN PyObject *_wrap_IFormFactor_sliceFormFactor(PyObject *SWIGUNUSEDPARM(
   int res3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   Swig::Director *director = 0;
   bool upcall = false;
   SwigDirector_IFormFactor *darg = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IFormFactor_sliceFormFactor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactor_sliceFormFactor", 4, 4, 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 '" "IFormFactor_sliceFormFactor" "', argument " "1"" of type '" "IFormFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactor * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_sliceFormFactor" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -66203,7 +64302,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_sliceFormFactor(PyObject *SWIGUNUSEDPARM(
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IRotation,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IFormFactor_sliceFormFactor" "', argument " "3"" of type '" "IRotation const &""'"); 
   }
@@ -66212,7 +64311,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_sliceFormFactor(PyObject *SWIGUNUSEDPARM(
   }
   arg3 = reinterpret_cast< IRotation * >(argp3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IFormFactor_sliceFormFactor" "', argument " "4"" of type '" "kvector_t""'"); 
     }  
@@ -66229,7 +64328,7 @@ SWIGINTERN PyObject *_wrap_IFormFactor_sliceFormFactor(PyObject *SWIGUNUSEDPARM(
     SWIG_SetErrorMsg(PyExc_RuntimeError,"accessing protected member sliceFormFactor");
     SWIG_fail;
   }
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     darg = dynamic_cast<SwigDirector_IFormFactor *>(arg1);
     if (upcall) {
@@ -66261,10 +64360,11 @@ SWIGINTERN PyObject *_wrap_disown_IFormFactor(PyObject *SWIGUNUSEDPARM(self), Py
   IFormFactor *arg1 = (IFormFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_IFormFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IFormFactor" "', argument " "1"" of type '" "IFormFactor *""'"); 
   }
@@ -66283,11 +64383,15 @@ fail:
 
 SWIGINTERN PyObject *IFormFactor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactor, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IFormFactor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFormFactor *arg1 = 0 ;
@@ -66299,13 +64403,11 @@ SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM(
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:CreateTransformedFormFactor",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IFormFactor,  0  | 0);
+  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 &""'"); 
   }
@@ -66313,7 +64415,7 @@ SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM(
     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(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  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 &""'"); 
   }
@@ -66322,7 +64424,7 @@ SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< IRotation * >(argp2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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""'"); 
     }  
@@ -66348,12 +64450,13 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_iterator(PyObject *SWIGUNUSED
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_iterator" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -66371,11 +64474,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___nonzero__(PyObject *SWIGUNU
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___nonzero__" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -66393,11 +64497,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___bool__(PyObject *SWIGUNUSED
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___bool__" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -66415,11 +64520,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___len__(PyObject *SWIGUNUSEDP
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___len__" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -66443,37 +64549,32 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getslice__(PyObject *SWIGUN
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< IFormFactor *,std::allocator< IFormFactor * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___getslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___getslice__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___getslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3);
   try {
     result = (std::vector< IFormFactor *,std::allocator< IFormFactor * > > *)std_vector_Sl_IFormFactor_Sm__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -66481,7 +64582,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::difference_type arg2 ;
@@ -66492,36 +64593,30 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3);
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -66529,7 +64624,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::difference_type arg2 ;
@@ -66542,30 +64637,26 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3);
   {
     std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "4"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); 
     }
@@ -66576,14 +64667,11 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject
   }
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -66598,13 +64686,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self,
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -66620,7 +64704,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -66643,7 +64727,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self,
           int res = swig::asptr(argv[3], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -66651,7 +64735,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type)\n"
     "    std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)\n");
@@ -66670,36 +64754,31 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delslice__(PyObject *SWIGUN
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___delslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___delslice__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___delslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3);
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -66707,7 +64786,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::difference_type arg2 ;
@@ -66715,30 +64794,25 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(PyObject
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___delitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___delitem__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -66746,38 +64820,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< IFormFactor *,std::allocator< IFormFactor * > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___getitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< IFormFactor *,std::allocator< IFormFactor * > > *)std_vector_Sl_IFormFactor_Sm__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -66785,7 +64854,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -66793,25 +64862,22 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(PyObject
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "3"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); 
     }
@@ -66822,14 +64888,11 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(PyObject
   }
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -66839,37 +64902,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -66877,37 +64935,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___delitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -66920,13 +64973,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem__(PyObject *self, P
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -66936,7 +64985,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem__(PyObject *self, P
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_IFormFactorPtr_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -66950,13 +64999,13 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem__(PyObject *self, P
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::__delitem__(std::vector< IFormFactor * >::difference_type)\n"
     "    std::vector< IFormFactor * >::__delitem__(PySliceObject *)\n");
@@ -66964,7 +65013,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::difference_type arg2 ;
@@ -66972,28 +65021,24 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem____SWIG_1(PyObject
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< IFormFactor * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___getitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___getitem__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
   try {
     result = (std::vector< IFormFactor * >::value_type)std_vector_Sl_IFormFactor_Sm__Sg____getitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFormFactor, 0 |  0 );
   return resultobj;
 fail:
@@ -67006,13 +65051,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem__(PyObject *self, P
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -67022,7 +65063,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem__(PyObject *self, P
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_IFormFactorPtr_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -67036,13 +65077,13 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem__(PyObject *self, P
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_IFormFactorPtr_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::__getitem__(PySliceObject *)\n"
     "    std::vector< IFormFactor * >::__getitem__(std::vector< IFormFactor * >::difference_type)\n");
@@ -67050,7 +65091,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::difference_type arg2 ;
@@ -67061,33 +65102,28 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_2(PyObject
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "2"" of type '" "std::vector< IFormFactor * >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
   arg3 = reinterpret_cast< std::vector< IFormFactor * >::value_type >(argp3);
   try {
     std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_2(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -67100,13 +65136,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -67116,7 +65148,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -67132,7 +65164,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P
         int res = swig::asptr(argv[2], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -67151,14 +65183,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_IFormFactor, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::__setitem__(PySliceObject *,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)\n"
     "    std::vector< IFormFactor * >::__setitem__(PySliceObject *)\n"
@@ -67172,22 +65204,21 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_pop(PyObject *SWIGUNUSEDPARM(
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_pop" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
   try {
     result = (std::vector< IFormFactor * >::value_type)std_vector_Sl_IFormFactor_Sm__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFormFactor, 0 |  0 );
   return resultobj;
 fail:
@@ -67203,16 +65234,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_append(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_append" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_IFormFactorPtr_t_append" "', argument " "2"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -67225,11 +65255,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_IFormFactorPtr_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< IFormFactor * > *)new std::vector< IFormFactor * >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -67238,17 +65268,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< IFormFactor * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_IFormFactorPtr_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_IFormFactorPtr_t" "', argument " "1"" of type '" "std::vector< IFormFactor * > const &""'"); 
     }
@@ -67272,11 +65301,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_empty(PyObject *SWIGUNUSEDPAR
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_empty" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -67294,11 +65324,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_size(PyObject *SWIGUNUSEDPARM
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_size" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -67319,16 +65350,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_swap(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_swap" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_IFormFactorPtr_t_swap" "', argument " "2"" of type '" "std::vector< IFormFactor * > &""'"); 
   }
@@ -67349,11 +65379,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_begin(PyObject *SWIGUNUSEDPAR
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_begin" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67372,11 +65403,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_end(PyObject *SWIGUNUSEDPARM(
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_end" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67395,11 +65427,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_rbegin(PyObject *SWIGUNUSEDPA
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_rbegin" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67418,11 +65451,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_rend(PyObject *SWIGUNUSEDPARM
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_rend" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67441,10 +65475,11 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_clear(PyObject *SWIGUNUSEDPAR
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_clear" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67462,11 +65497,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_get_allocator(PyObject *SWIGU
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< IFormFactor * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_get_allocator" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -67479,16 +65515,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< IFormFactor * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_IFormFactorPtr_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_IFormFactorPtr_t" "', argument " "1"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
@@ -67506,10 +65541,11 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_pop_back(PyObject *SWIGUNUSED
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_pop_back" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -67522,7 +65558,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::size_type arg2 ;
@@ -67530,16 +65566,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_0(PyObject *SWIG
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_resize" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t_resize" "', argument " "2"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
@@ -67552,7 +65586,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::iterator arg2 ;
@@ -67560,17 +65594,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_0(PyObject *SWIGU
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< IFormFactor * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
   } else {
@@ -67590,7 +65622,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::iterator arg2 ;
@@ -67601,18 +65633,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_1(PyObject *SWIGU
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< IFormFactor * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
   } else {
@@ -67623,7 +65652,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase__SWIG_1(PyObject *SWIGU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_erase" "', argument " "3"" of type '" "std::vector< IFormFactor * >::iterator""'");
   } else {
@@ -67648,13 +65677,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase(PyObject *self, PyObjec
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -67664,7 +65689,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase(PyObject *self, PyObjec
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< IFormFactor * >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t_erase__SWIG_0(self, args);
+        return _wrap_vector_IFormFactorPtr_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -67681,14 +65706,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase(PyObject *self, PyObjec
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< IFormFactor * >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t_erase__SWIG_1(self, args);
+          return _wrap_vector_IFormFactorPtr_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::erase(std::vector< IFormFactor * >::iterator)\n"
     "    std::vector< IFormFactor * >::erase(std::vector< IFormFactor * >::iterator,std::vector< IFormFactor * >::iterator)\n");
@@ -67696,7 +65721,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * >::size_type arg1 ;
   std::vector< IFormFactor * >::value_type arg2 = (std::vector< IFormFactor * >::value_type) 0 ;
@@ -67704,17 +65729,15 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_3(PyObject *SWIGUNU
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< IFormFactor * > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_IFormFactorPtr_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_IFormFactorPtr_t" "', argument " "1"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
   arg1 = static_cast< std::vector< IFormFactor * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_IFormFactorPtr_t" "', argument " "2"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -67732,15 +65755,11 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_IFormFactorPtr_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_IFormFactorPtr_t__SWIG_0(self, args);
+    return _wrap_new_vector_IFormFactorPtr_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -67749,7 +65768,7 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_IFormFactorPtr_t__SWIG_2(self, args);
+      return _wrap_new_vector_IFormFactorPtr_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -67757,7 +65776,7 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_IFormFactorPtr_t__SWIG_1(self, args);
+      return _wrap_new_vector_IFormFactorPtr_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -67771,13 +65790,13 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IFormFactor, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_IFormFactorPtr_t__SWIG_3(self, args);
+        return _wrap_new_vector_IFormFactorPtr_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_IFormFactorPtr_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_IFormFactorPtr_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::vector()\n"
     "    std::vector< IFormFactor * >::vector(std::vector< IFormFactor * > const &)\n"
@@ -67795,16 +65814,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_push_back(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_push_back" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_IFormFactorPtr_t_push_back" "', argument " "2"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -67822,11 +65840,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_front(PyObject *SWIGUNUSEDPAR
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_front" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -67844,11 +65863,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_back(PyObject *SWIGUNUSEDPARM
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_back" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -67872,22 +65892,20 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_assign(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_assign" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t_assign" "', argument " "2"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t_assign" "', argument " "3"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -67900,7 +65918,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::size_type arg2 ;
@@ -67911,22 +65929,19 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize__SWIG_1(PyObject *SWIG
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_resize" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t_resize" "', argument " "2"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
   arg2 = static_cast< std::vector< IFormFactor * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t_resize" "', argument " "3"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -67944,13 +65959,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize(PyObject *self, PyObje
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -67961,7 +65972,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize(PyObject *self, PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_IFormFactorPtr_t_resize__SWIG_0(self, args);
+        return _wrap_vector_IFormFactorPtr_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -67979,14 +65990,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize(PyObject *self, PyObje
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_IFormFactor, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t_resize__SWIG_1(self, args);
+          return _wrap_vector_IFormFactorPtr_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::resize(std::vector< IFormFactor * >::size_type)\n"
     "    std::vector< IFormFactor * >::resize(std::vector< IFormFactor * >::size_type,std::vector< IFormFactor * >::value_type)\n");
@@ -67994,7 +66005,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::iterator arg2 ;
@@ -68005,18 +66016,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_0(PyObject *SWIG
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< IFormFactor * >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
   } else {
@@ -68027,7 +66035,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_0(PyObject *SWIG
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "3"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -68041,7 +66049,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   std::vector< IFormFactor * >::iterator arg2 ;
@@ -68055,18 +66063,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_1(PyObject *SWIG
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_IFormFactorPtr_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
   } else {
@@ -68077,12 +66081,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert__SWIG_1(PyObject *SWIG
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "2"" of type '" "std::vector< IFormFactor * >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "3"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
   arg3 = static_cast< std::vector< IFormFactor * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_IFormFactor, 0 |  0 );
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_IFormFactor, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_IFormFactorPtr_t_insert" "', argument " "4"" of type '" "std::vector< IFormFactor * >::value_type""'"); 
   }
@@ -68100,13 +66104,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObje
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0));
@@ -68120,7 +66120,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObje
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_IFormFactor, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_IFormFactorPtr_t_insert__SWIG_0(self, args);
+          return _wrap_vector_IFormFactorPtr_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -68143,7 +66143,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObje
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_IFormFactor, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_IFormFactorPtr_t_insert__SWIG_1(self, args);
+            return _wrap_vector_IFormFactorPtr_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -68151,7 +66151,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< IFormFactor * >::insert(std::vector< IFormFactor * >::iterator,std::vector< IFormFactor * >::value_type)\n"
     "    std::vector< IFormFactor * >::insert(std::vector< IFormFactor * >::iterator,std::vector< IFormFactor * >::size_type,std::vector< IFormFactor * >::value_type)\n");
@@ -68167,16 +66167,15 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_reserve(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_IFormFactorPtr_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_IFormFactorPtr_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_reserve" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_IFormFactorPtr_t_reserve" "', argument " "2"" of type '" "std::vector< IFormFactor * >::size_type""'");
   } 
@@ -68194,11 +66193,12 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_capacity(PyObject *SWIGUNUSED
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< IFormFactor * >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_capacity" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); 
   }
@@ -68216,10 +66216,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_IFormFactorPtr_t(PyObject *SWIGUNUSEDPA
   std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_IFormFactorPtr_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_IFormFactorPtr_t" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); 
   }
@@ -68234,19 +66235,24 @@ fail:
 
 SWIGINTERN PyObject *vector_IFormFactorPtr_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_IFormFactorPtr_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_IFormFactorBorn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFormFactorBorn *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IFormFactorBorn",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (IFormFactorBorn *)new SwigDirector_IFormFactorBorn(arg1); 
@@ -68267,10 +66273,11 @@ SWIGINTERN PyObject *_wrap_delete_IFormFactorBorn(PyObject *SWIGUNUSEDPARM(self)
   IFormFactorBorn *arg1 = (IFormFactorBorn *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFormFactorBorn",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFormFactorBorn" "', argument " "1"" of type '" "IFormFactorBorn *""'"); 
   }
@@ -68288,19 +66295,20 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_clone(PyObject *SWIGUNUSEDPARM(self),
   IFormFactorBorn *arg1 = (IFormFactorBorn *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   IFormFactorBorn *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactorBorn_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_clone" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactorBorn::clone");
@@ -68334,19 +66342,18 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_setAmbientMaterial(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_setAmbientMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_setAmbientMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_setAmbientMaterial" "', argument " "1"" of type '" "IFormFactorBorn *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_setAmbientMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -68359,7 +66366,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_setAmbientMaterial(PyObject *SWIGUNUS
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       (arg1)->IFormFactorBorn::setAmbientMaterial(arg2);
@@ -68384,19 +66391,18 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_evaluate(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_evaluate" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_evaluate" "', argument " "2"" of type '" "WavevectorInfo const &""'"); 
   }
@@ -68405,7 +66411,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_evaluate(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< WavevectorInfo * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = ((IFormFactorBorn const *)arg1)->IFormFactorBorn::evaluate((WavevectorInfo const &)*arg2);
@@ -68430,19 +66436,18 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_bottomZ(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_bottomZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_bottomZ" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -68451,7 +66456,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_bottomZ(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< IRotation * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IFormFactorBorn const *)arg1)->IFormFactorBorn::bottomZ((IRotation const &)*arg2);
@@ -68476,19 +66481,18 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_topZ(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_topZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_topZ" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -68497,7 +66501,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_topZ(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< IRotation * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IFormFactorBorn const *)arg1)->IFormFactorBorn::topZ((IRotation const &)*arg2);
@@ -68522,20 +66526,19 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_evaluate_for_q(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_evaluate_for_q" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -68548,7 +66551,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_evaluate_for_q(PyObject *SWIGUNUSEDPA
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IFormFactorBorn::evaluate_for_q");
@@ -68573,20 +66576,19 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_canSliceAnalytically(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   SwigDirector_IFormFactorBorn *darg = 0;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_canSliceAnalytically",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_canSliceAnalytically", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_canSliceAnalytically" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_canSliceAnalytically" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -68599,7 +66601,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_canSliceAnalytically(PyObject *SWIGUN
     SWIG_SetErrorMsg(PyExc_RuntimeError,"accessing protected member canSliceAnalytically");
     SWIG_fail;
   }
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     darg = dynamic_cast<SwigDirector_IFormFactorBorn *>(arg1);
     if (upcall) {
@@ -68622,10 +66624,11 @@ SWIGINTERN PyObject *_wrap_disown_IFormFactorBorn(PyObject *SWIGUNUSEDPARM(self)
   IFormFactorBorn *arg1 = (IFormFactorBorn *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_IFormFactorBorn",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IFormFactorBorn" "', argument " "1"" of type '" "IFormFactorBorn *""'"); 
   }
@@ -68656,23 +66659,20 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_sliceFormFactor(PyObject *SWIGUNUSEDP
   int res3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   Swig::Director *director = 0;
   bool upcall = false;
   SwigDirector_IFormFactorBorn *darg = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IFormFactorBorn_sliceFormFactor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorBorn_sliceFormFactor", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorBorn, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_sliceFormFactor" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorBorn * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_sliceFormFactor" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -68684,7 +66684,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_sliceFormFactor(PyObject *SWIGUNUSEDP
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IRotation,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IFormFactorBorn_sliceFormFactor" "', argument " "3"" of type '" "IRotation const &""'"); 
   }
@@ -68693,7 +66693,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_sliceFormFactor(PyObject *SWIGUNUSEDP
   }
   arg3 = reinterpret_cast< IRotation * >(argp3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IFormFactorBorn_sliceFormFactor" "', argument " "4"" of type '" "kvector_t""'"); 
     }  
@@ -68710,7 +66710,7 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_sliceFormFactor(PyObject *SWIGUNUSEDP
     SWIG_SetErrorMsg(PyExc_RuntimeError,"accessing protected member sliceFormFactor");
     SWIG_fail;
   }
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     darg = dynamic_cast<SwigDirector_IFormFactorBorn *>(arg1);
     if (upcall) {
@@ -68739,11 +66739,15 @@ fail:
 
 SWIGINTERN PyObject *IFormFactorBorn_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactorBorn, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IFormFactorBorn_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_SlicingEffects_position_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SlicingEffects *arg1 = (SlicingEffects *) 0 ;
@@ -68752,16 +66756,15 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_position_set(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SlicingEffects_position_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SlicingEffects_position_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_position_set" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
   arg1 = reinterpret_cast< SlicingEffects * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_BasicVector3DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SlicingEffects_position_set" "', argument " "2"" of type '" "kvector_t *""'"); 
   }
@@ -68779,11 +66782,12 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_position_get(PyObject *SWIGUNUSEDPARM(
   SlicingEffects *arg1 = (SlicingEffects *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SlicingEffects_position_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_position_get" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
@@ -68804,16 +66808,15 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_dz_bottom_set(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SlicingEffects_dz_bottom_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SlicingEffects_dz_bottom_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_dz_bottom_set" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
   arg1 = reinterpret_cast< SlicingEffects * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SlicingEffects_dz_bottom_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -68831,11 +66834,12 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_dz_bottom_get(PyObject *SWIGUNUSEDPARM
   SlicingEffects *arg1 = (SlicingEffects *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SlicingEffects_dz_bottom_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_dz_bottom_get" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
@@ -68856,16 +66860,15 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_dz_top_set(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SlicingEffects_dz_top_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SlicingEffects_dz_top_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_dz_top_set" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
   arg1 = reinterpret_cast< SlicingEffects * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SlicingEffects_dz_top_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -68883,11 +66886,12 @@ SWIGINTERN PyObject *_wrap_SlicingEffects_dz_top_get(PyObject *SWIGUNUSEDPARM(se
   SlicingEffects *arg1 = (SlicingEffects *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SlicingEffects_dz_top_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SlicingEffects_dz_top_get" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
@@ -68904,7 +66908,7 @@ SWIGINTERN PyObject *_wrap_new_SlicingEffects(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   SlicingEffects *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SlicingEffects")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SlicingEffects", 0, 0, 0)) SWIG_fail;
   result = (SlicingEffects *)new SlicingEffects();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SlicingEffects, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -68918,10 +66922,11 @@ SWIGINTERN PyObject *_wrap_delete_SlicingEffects(PyObject *SWIGUNUSEDPARM(self),
   SlicingEffects *arg1 = (SlicingEffects *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SlicingEffects",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SlicingEffects, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SlicingEffects, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SlicingEffects" "', argument " "1"" of type '" "SlicingEffects *""'"); 
   }
@@ -68936,20 +66941,25 @@ fail:
 
 SWIGINTERN PyObject *SlicingEffects_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SlicingEffects, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SlicingEffects_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IFormFactorDecorator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFormFactorDecorator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFormFactorDecorator" "', argument " "1"" of type '" "IFormFactorDecorator *""'"); 
   }
@@ -68967,11 +66977,12 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_clone(PyObject *SWIGUNUSEDPARM(s
   IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFormFactorDecorator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactorDecorator_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_clone" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
@@ -68992,16 +67003,15 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorDecorator_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_accept" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorDecorator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -69022,17 +67032,16 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_setAmbientMaterial(PyObject *SWI
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_setAmbientMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorDecorator_setAmbientMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_setAmbientMaterial" "', argument " "1"" of type '" "IFormFactorDecorator *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorDecorator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_setAmbientMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -69057,11 +67066,12 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_volume(PyObject *SWIGUNUSEDPARM(
   IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactorDecorator_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_volume" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
@@ -69079,11 +67089,12 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_radialExtension(PyObject *SWIGUN
   IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactorDecorator_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_radialExtension" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
@@ -69104,17 +67115,16 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_bottomZ(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorDecorator_bottomZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_bottomZ" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorDecorator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -69138,17 +67148,16 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_topZ(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFormFactorDecorator_topZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_topZ" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
   arg1 = reinterpret_cast< IFormFactorDecorator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -69169,12 +67178,13 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_getFormFactor(PyObject *SWIGUNUS
   IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFormFactorDecorator_getFormFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_getFormFactor" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); 
   }
@@ -69195,7 +67205,7 @@ fail:
 
 SWIGINTERN PyObject *IFormFactorDecorator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactorDecorator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69208,16 +67218,15 @@ SWIGINTERN PyObject *_wrap_PolygonalTopology_vertexIndices_set(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolygonalTopology_vertexIndices_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolygonalTopology_vertexIndices_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolygonalTopology_vertexIndices_set" "', argument " "1"" of type '" "PolygonalTopology *""'"); 
   }
   arg1 = reinterpret_cast< PolygonalTopology * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolygonalTopology_vertexIndices_set" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > *""'"); 
   }
@@ -69235,11 +67244,12 @@ SWIGINTERN PyObject *_wrap_PolygonalTopology_vertexIndices_get(PyObject *SWIGUNU
   PolygonalTopology *arg1 = (PolygonalTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int,std::allocator< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolygonalTopology_vertexIndices_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolygonalTopology_vertexIndices_get" "', argument " "1"" of type '" "PolygonalTopology *""'"); 
   }
@@ -69260,16 +67270,15 @@ SWIGINTERN PyObject *_wrap_PolygonalTopology_symmetry_S2_set(PyObject *SWIGUNUSE
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolygonalTopology_symmetry_S2_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolygonalTopology_symmetry_S2_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolygonalTopology_symmetry_S2_set" "', argument " "1"" of type '" "PolygonalTopology *""'"); 
   }
   arg1 = reinterpret_cast< PolygonalTopology * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PolygonalTopology_symmetry_S2_set" "', argument " "2"" of type '" "bool""'");
   } 
@@ -69287,11 +67296,12 @@ SWIGINTERN PyObject *_wrap_PolygonalTopology_symmetry_S2_get(PyObject *SWIGUNUSE
   PolygonalTopology *arg1 = (PolygonalTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolygonalTopology_symmetry_S2_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonalTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolygonalTopology_symmetry_S2_get" "', argument " "1"" of type '" "PolygonalTopology *""'"); 
   }
@@ -69308,7 +67318,7 @@ SWIGINTERN PyObject *_wrap_new_PolygonalTopology(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   PolygonalTopology *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_PolygonalTopology")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_PolygonalTopology", 0, 0, 0)) SWIG_fail;
   result = (PolygonalTopology *)new PolygonalTopology();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PolygonalTopology, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -69322,10 +67332,11 @@ SWIGINTERN PyObject *_wrap_delete_PolygonalTopology(PyObject *SWIGUNUSEDPARM(sel
   PolygonalTopology *arg1 = (PolygonalTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PolygonalTopology",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonalTopology, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonalTopology, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PolygonalTopology" "', argument " "1"" of type '" "PolygonalTopology *""'"); 
   }
@@ -69340,11 +67351,15 @@ fail:
 
 SWIGINTERN PyObject *PolygonalTopology_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PolygonalTopology, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PolygonalTopology_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_PolyhedralTopology_faces_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PolyhedralTopology *arg1 = (PolyhedralTopology *) 0 ;
@@ -69353,16 +67368,15 @@ SWIGINTERN PyObject *_wrap_PolyhedralTopology_faces_set(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralTopology_faces_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralTopology_faces_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralTopology_faces_set" "', argument " "1"" of type '" "PolyhedralTopology *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralTopology * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_std__vectorT_PolygonalTopology_std__allocatorT_PolygonalTopology_t_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_std__vectorT_PolygonalTopology_std__allocatorT_PolygonalTopology_t_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralTopology_faces_set" "', argument " "2"" of type '" "std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > *""'"); 
   }
@@ -69380,11 +67394,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralTopology_faces_get(PyObject *SWIGUNUSEDPARM
   PolyhedralTopology *arg1 = (PolyhedralTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralTopology_faces_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralTopology_faces_get" "', argument " "1"" of type '" "PolyhedralTopology *""'"); 
   }
@@ -69405,16 +67420,15 @@ SWIGINTERN PyObject *_wrap_PolyhedralTopology_symmetry_Ci_set(PyObject *SWIGUNUS
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralTopology_symmetry_Ci_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralTopology_symmetry_Ci_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralTopology_symmetry_Ci_set" "', argument " "1"" of type '" "PolyhedralTopology *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralTopology * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PolyhedralTopology_symmetry_Ci_set" "', argument " "2"" of type '" "bool""'");
   } 
@@ -69432,11 +67446,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralTopology_symmetry_Ci_get(PyObject *SWIGUNUS
   PolyhedralTopology *arg1 = (PolyhedralTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralTopology_symmetry_Ci_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralTopology, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralTopology_symmetry_Ci_get" "', argument " "1"" of type '" "PolyhedralTopology *""'"); 
   }
@@ -69453,7 +67468,7 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralTopology(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   PolyhedralTopology *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_PolyhedralTopology")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_PolyhedralTopology", 0, 0, 0)) SWIG_fail;
   result = (PolyhedralTopology *)new PolyhedralTopology();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PolyhedralTopology, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -69467,10 +67482,11 @@ SWIGINTERN PyObject *_wrap_delete_PolyhedralTopology(PyObject *SWIGUNUSEDPARM(se
   PolyhedralTopology *arg1 = (PolyhedralTopology *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PolyhedralTopology",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralTopology, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralTopology, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PolyhedralTopology" "', argument " "1"" of type '" "PolyhedralTopology *""'"); 
   }
@@ -69485,11 +67501,15 @@ fail:
 
 SWIGINTERN PyObject *PolyhedralTopology_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralTopology, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PolyhedralTopology_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_PolyhedralEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   kvector_t arg1 ;
@@ -69498,13 +67518,12 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralEdge(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   PolyhedralEdge *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_PolyhedralEdge",&obj0,&obj1)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_PolyhedralEdge", 2, 2, swig_obj)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PolyhedralEdge" "', argument " "1"" of type '" "kvector_t const""'"); 
     }  
@@ -69517,7 +67536,7 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralEdge(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PolyhedralEdge" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -69542,11 +67561,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_E(PyObject *SWIGUNUSEDPARM(self), PyOb
   PolyhedralEdge *arg1 = (PolyhedralEdge *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralEdge_E",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralEdge_E" "', argument " "1"" of type '" "PolyhedralEdge const *""'"); 
   }
@@ -69564,11 +67584,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_R(PyObject *SWIGUNUSEDPARM(self), PyOb
   PolyhedralEdge *arg1 = (PolyhedralEdge *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralEdge_R",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralEdge_R" "', argument " "1"" of type '" "PolyhedralEdge const *""'"); 
   }
@@ -69589,18 +67610,17 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_qE(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralEdge_qE",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralEdge_qE", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralEdge_qE" "', argument " "1"" of type '" "PolyhedralEdge const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralEdge * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralEdge_qE" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -69628,18 +67648,17 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_qR(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralEdge_qR",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralEdge_qR", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralEdge_qR" "', argument " "1"" of type '" "PolyhedralEdge const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralEdge * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralEdge_qR" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -69673,25 +67692,22 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_contrib(PyObject *SWIGUNUSEDPARM(self)
   int res3 = 0 ;
   std::complex< double > val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:PolyhedralEdge_contrib",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralEdge_contrib", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralEdge_contrib" "', argument " "1"" of type '" "PolyhedralEdge const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralEdge * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PolyhedralEdge_contrib" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PolyhedralEdge_contrib" "', argument " "3"" of type '" "cvector_t""'"); 
     }  
@@ -69703,7 +67719,7 @@ SWIGINTERN PyObject *_wrap_PolyhedralEdge_contrib(PyObject *SWIGUNUSEDPARM(self)
       if (SWIG_IsNewObj(res3)) delete temp;
     }
   }
-  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj3, &val4);
+  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PolyhedralEdge_contrib" "', argument " "4"" of type '" "complex_t""'");
   } 
@@ -69721,10 +67737,11 @@ SWIGINTERN PyObject *_wrap_delete_PolyhedralEdge(PyObject *SWIGUNUSEDPARM(self),
   PolyhedralEdge *arg1 = (PolyhedralEdge *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PolyhedralEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralEdge, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralEdge, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PolyhedralEdge" "', argument " "1"" of type '" "PolyhedralEdge *""'"); 
   }
@@ -69739,22 +67756,27 @@ fail:
 
 SWIGINTERN PyObject *PolyhedralEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PolyhedralEdge_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_PolyhedralFace_diameter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< kvector_t,std::allocator< kvector_t > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralFace_diameter",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_diameter" "', argument " "1"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > > const &""'"); 
     }
@@ -69773,21 +67795,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< kvector_t,std::allocator< kvector_t > > *arg1 = 0 ;
   bool arg2 ;
   int res1 = SWIG_OLDOBJ ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   PolyhedralFace *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_PolyhedralFace",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PolyhedralFace" "', argument " "1"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > > const &""'"); 
     }
@@ -69796,7 +67816,7 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_0(PyObject *SWIGUNUSEDPARM(s
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PolyhedralFace" "', argument " "2"" of type '" "bool""'");
   } 
@@ -69811,17 +67831,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< kvector_t,std::allocator< kvector_t > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   PolyhedralFace *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_PolyhedralFace",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PolyhedralFace" "', argument " "1"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > > const &""'"); 
     }
@@ -69840,11 +67859,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PolyhedralFace__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   PolyhedralFace *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_PolyhedralFace")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (PolyhedralFace *)new PolyhedralFace();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PolyhedralFace, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -69858,22 +67877,18 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralFace(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_PolyhedralFace", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_PolyhedralFace__SWIG_2(self, args);
+    return _wrap_new_PolyhedralFace__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_PolyhedralFace__SWIG_1(self, args);
+      return _wrap_new_PolyhedralFace__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -69886,13 +67901,13 @@ SWIGINTERN PyObject *_wrap_new_PolyhedralFace(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_PolyhedralFace__SWIG_0(self, args);
+        return _wrap_new_PolyhedralFace__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_PolyhedralFace'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_PolyhedralFace'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    PolyhedralFace::PolyhedralFace(std::vector< kvector_t,std::allocator< kvector_t > > const &,bool)\n"
     "    PolyhedralFace::PolyhedralFace(std::vector< kvector_t,std::allocator< kvector_t > > const &)\n"
@@ -69906,11 +67921,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_area(PyObject *SWIGUNUSEDPARM(self), P
   PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralFace_area",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_area" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
@@ -69928,11 +67944,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_center(PyObject *SWIGUNUSEDPARM(self),
   PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralFace_center",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_center" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
@@ -69950,11 +67967,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_pyramidalVolume(PyObject *SWIGUNUSEDPA
   PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralFace_pyramidalVolume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_pyramidalVolume" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
@@ -69972,11 +67990,12 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_radius3d(PyObject *SWIGUNUSEDPARM(self
   PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PolyhedralFace_radius3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_radius3d" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
@@ -69997,18 +68016,17 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_normalProjectionConj(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralFace_normalProjectionConj",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralFace_normalProjectionConj", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_normalProjectionConj" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralFace_normalProjectionConj" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70039,24 +68057,22 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_ff_n(PyObject *SWIGUNUSEDPARM(self), P
   int ecode2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:PolyhedralFace_ff_n",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralFace_ff_n", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_ff_n" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PolyhedralFace_ff_n" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PolyhedralFace_ff_n" "', argument " "3"" of type '" "cvector_t""'"); 
     }  
@@ -70087,19 +68103,17 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_ff(PyObject *SWIGUNUSEDPARM(self), PyO
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:PolyhedralFace_ff",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralFace_ff", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_ff" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralFace_ff" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70111,7 +68125,7 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_ff(PyObject *SWIGUNUSEDPARM(self), PyO
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PolyhedralFace_ff" "', argument " "3"" of type '" "bool""'");
   } 
@@ -70132,18 +68146,17 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_ff_2D(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralFace_ff_2D",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralFace_ff_2D", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_ff_2D" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralFace_ff_2D" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70171,16 +68184,15 @@ SWIGINTERN PyObject *_wrap_PolyhedralFace_assert_Ci(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PolyhedralFace_assert_Ci",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PolyhedralFace_assert_Ci", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_assert_Ci" "', argument " "1"" of type '" "PolyhedralFace const *""'"); 
   }
   arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PolyhedralFace,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PolyhedralFace,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolyhedralFace_assert_Ci" "', argument " "2"" of type '" "PolyhedralFace const &""'"); 
   }
@@ -70201,10 +68213,11 @@ SWIGINTERN PyObject *_wrap_delete_PolyhedralFace(PyObject *SWIGUNUSEDPARM(self),
   PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PolyhedralFace",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolyhedralFace, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PolyhedralFace" "', argument " "1"" of type '" "PolyhedralFace *""'"); 
   }
@@ -70219,11 +68232,15 @@ fail:
 
 SWIGINTERN PyObject *PolyhedralFace_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralFace, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PolyhedralFace_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
@@ -70232,18 +68249,17 @@ SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_evaluate_for_q(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPolyhedron_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPolyhedron_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_evaluate_for_q" "', argument " "1"" of type '" "FormFactorPolyhedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPolyhedron * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPolyhedron_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70271,18 +68287,17 @@ SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_evaluate_centered(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPolyhedron_evaluate_centered",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPolyhedron_evaluate_centered", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_evaluate_centered" "', argument " "1"" of type '" "FormFactorPolyhedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPolyhedron * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPolyhedron_evaluate_centered" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70307,11 +68322,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_volume(PyObject *SWIGUNUSEDPARM(
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolyhedron_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_volume" "', argument " "1"" of type '" "FormFactorPolyhedron const *""'"); 
   }
@@ -70329,11 +68345,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_radialExtension(PyObject *SWIGUN
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolyhedron_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_radialExtension" "', argument " "1"" of type '" "FormFactorPolyhedron const *""'"); 
   }
@@ -70351,10 +68368,11 @@ SWIGINTERN PyObject *_wrap_FormFactorPolyhedron_assert_platonic(PyObject *SWIGUN
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolyhedron_assert_platonic",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolyhedron_assert_platonic" "', argument " "1"" of type '" "FormFactorPolyhedron const *""'"); 
   }
@@ -70372,10 +68390,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPolyhedron(PyObject *SWIGUNUSEDPARM(
   FormFactorPolyhedron *arg1 = (FormFactorPolyhedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPolyhedron",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolyhedron, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolyhedron, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPolyhedron" "', argument " "1"" of type '" "FormFactorPolyhedron *""'"); 
   }
@@ -70390,7 +68409,7 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPolyhedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolyhedron, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70403,18 +68422,17 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalPrism_evaluate_for_q(PyObject *SWI
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPolygonalPrism_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPolygonalPrism_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalPrism_evaluate_for_q" "', argument " "1"" of type '" "FormFactorPolygonalPrism const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPolygonalPrism * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPolygonalPrism_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70439,11 +68457,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalPrism_volume(PyObject *SWIGUNUSEDP
   FormFactorPolygonalPrism *arg1 = (FormFactorPolygonalPrism *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolygonalPrism_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalPrism_volume" "', argument " "1"" of type '" "FormFactorPolygonalPrism const *""'"); 
   }
@@ -70461,11 +68480,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalPrism_getHeight(PyObject *SWIGUNUS
   FormFactorPolygonalPrism *arg1 = (FormFactorPolygonalPrism *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolygonalPrism_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalPrism_getHeight" "', argument " "1"" of type '" "FormFactorPolygonalPrism const *""'"); 
   }
@@ -70483,11 +68503,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalPrism_radialExtension(PyObject *SW
   FormFactorPolygonalPrism *arg1 = (FormFactorPolygonalPrism *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolygonalPrism_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalPrism_radialExtension" "', argument " "1"" of type '" "FormFactorPolygonalPrism const *""'"); 
   }
@@ -70505,10 +68526,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPolygonalPrism(PyObject *SWIGUNUSEDP
   FormFactorPolygonalPrism *arg1 = (FormFactorPolygonalPrism *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPolygonalPrism",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalPrism, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPolygonalPrism" "', argument " "1"" of type '" "FormFactorPolygonalPrism *""'"); 
   }
@@ -70523,7 +68545,7 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPolygonalPrism_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolygonalPrism, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70536,18 +68558,17 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalSurface_evaluate_for_q(PyObject *S
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPolygonalSurface_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPolygonalSurface_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalSurface_evaluate_for_q" "', argument " "1"" of type '" "FormFactorPolygonalSurface const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPolygonalSurface * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPolygonalSurface_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -70572,11 +68593,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalSurface_volume(PyObject *SWIGUNUSE
   FormFactorPolygonalSurface *arg1 = (FormFactorPolygonalSurface *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolygonalSurface_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalSurface_volume" "', argument " "1"" of type '" "FormFactorPolygonalSurface const *""'"); 
   }
@@ -70594,11 +68616,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPolygonalSurface_radialExtension(PyObject *
   FormFactorPolygonalSurface *arg1 = (FormFactorPolygonalSurface *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPolygonalSurface_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPolygonalSurface_radialExtension" "', argument " "1"" of type '" "FormFactorPolygonalSurface const *""'"); 
   }
@@ -70616,10 +68639,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPolygonalSurface(PyObject *SWIGUNUSE
   FormFactorPolygonalSurface *arg1 = (FormFactorPolygonalSurface *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPolygonalSurface",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPolygonalSurface, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPolygonalSurface" "', argument " "1"" of type '" "FormFactorPolygonalSurface *""'"); 
   }
@@ -70634,7 +68658,7 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPolygonalSurface_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolygonalSurface, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70653,29 +68677,26 @@ SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid(PyObject *SWIGUNUSEDPARM(s
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FormFactorAnisoPyramid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorAnisoPyramid",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorAnisoPyramid", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorAnisoPyramid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorAnisoPyramid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorAnisoPyramid" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorAnisoPyramid" "', argument " "4"" of type '" "double""'");
   } 
@@ -70693,11 +68714,12 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_clone(PyObject *SWIGUNUSEDPARM
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorAnisoPyramid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorAnisoPyramid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_clone" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -70718,16 +68740,15 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorAnisoPyramid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorAnisoPyramid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_accept" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorAnisoPyramid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorAnisoPyramid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -70745,11 +68766,12 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getLength(PyObject *SWIGUNUSED
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorAnisoPyramid_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_getLength" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -70767,11 +68789,12 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getWidth(PyObject *SWIGUNUSEDP
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorAnisoPyramid_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_getWidth" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -70789,11 +68812,12 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getHeight(PyObject *SWIGUNUSED
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorAnisoPyramid_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_getHeight" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -70811,11 +68835,12 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getAlpha(PyObject *SWIGUNUSEDP
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorAnisoPyramid_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_getAlpha" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'"); 
   }
@@ -70833,10 +68858,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorAnisoPyramid(PyObject *SWIGUNUSEDPAR
   FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorAnisoPyramid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorAnisoPyramid" "', argument " "1"" of type '" "FormFactorAnisoPyramid *""'"); 
   }
@@ -70851,11 +68877,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorAnisoPyramid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorAnisoPyramid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorAnisoPyramid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -70867,23 +68897,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorBox(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorBox *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorBox",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorBox", 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 '" "new_FormFactorBox" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorBox" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorBox" "', argument " "3"" of type '" "double""'");
   } 
@@ -70901,11 +68929,12 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_clone(PyObject *SWIGUNUSEDPARM(self), P
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorBox *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorBox_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_clone" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
@@ -70926,16 +68955,15 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorBox_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorBox_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_accept" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorBox * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorBox_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -70953,11 +68981,12 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_getLength(PyObject *SWIGUNUSEDPARM(self
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorBox_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_getLength" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
@@ -70975,11 +69004,12 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_getHeight(PyObject *SWIGUNUSEDPARM(self
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorBox_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_getHeight" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
@@ -70997,11 +69027,12 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_getWidth(PyObject *SWIGUNUSEDPARM(self)
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorBox_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_getWidth" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
@@ -71019,11 +69050,12 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_radialExtension(PyObject *SWIGUNUSEDPAR
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorBox_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_radialExtension" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
@@ -71044,18 +69076,17 @@ SWIGINTERN PyObject *_wrap_FormFactorBox_evaluate_for_q(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorBox_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorBox_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorBox_evaluate_for_q" "', argument " "1"" of type '" "FormFactorBox const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorBox * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorBox_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -71080,10 +69111,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorBox(PyObject *SWIGUNUSEDPARM(self),
   FormFactorBox *arg1 = (FormFactorBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorBox",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorBox, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorBox, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorBox" "', argument " "1"" of type '" "FormFactorBox *""'"); 
   }
@@ -71098,11 +69130,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorBox, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -71114,23 +69150,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), Py
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorCone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorCone",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCone", 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 '" "new_FormFactorCone" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCone" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCone" "', argument " "3"" of type '" "double""'");
   } 
@@ -71148,11 +69182,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_clone(PyObject *SWIGUNUSEDPARM(self),
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorCone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_clone" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
@@ -71173,16 +69208,15 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCone_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCone_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_accept" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCone * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCone_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -71200,11 +69234,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_getHeight(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_getHeight" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
@@ -71222,11 +69257,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_getAlpha(PyObject *SWIGUNUSEDPARM(self
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_getAlpha" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
@@ -71244,11 +69280,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_getRadius(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_getRadius" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
@@ -71266,11 +69303,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_radialExtension(PyObject *SWIGUNUSEDPA
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_radialExtension" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
@@ -71291,18 +69329,17 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_evaluate_for_q(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCone_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCone_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_evaluate_for_q" "', argument " "1"" of type '" "FormFactorCone const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCone * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCone_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -71327,10 +69364,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorCone(PyObject *SWIGUNUSEDPARM(self),
   FormFactorCone *arg1 = (FormFactorCone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCone" "', argument " "1"" of type '" "FormFactorCone *""'"); 
   }
@@ -71345,11 +69383,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorCone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCone, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorCone_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorCone6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -71361,23 +69403,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCone6(PyObject *SWIGUNUSEDPARM(self), P
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorCone6 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorCone6",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCone6", 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 '" "new_FormFactorCone6" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCone6" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCone6" "', argument " "3"" of type '" "double""'");
   } 
@@ -71395,11 +69435,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_clone(PyObject *SWIGUNUSEDPARM(self),
   FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorCone6 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone6_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_clone" "', argument " "1"" of type '" "FormFactorCone6 const *""'"); 
   }
@@ -71420,16 +69461,15 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_accept(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCone6_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCone6_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_accept" "', argument " "1"" of type '" "FormFactorCone6 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCone6 * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCone6_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -71447,11 +69487,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_getBaseEdge(PyObject *SWIGUNUSEDPARM(
   FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone6_getBaseEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_getBaseEdge" "', argument " "1"" of type '" "FormFactorCone6 const *""'"); 
   }
@@ -71469,11 +69510,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_getHeight(PyObject *SWIGUNUSEDPARM(se
   FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone6_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_getHeight" "', argument " "1"" of type '" "FormFactorCone6 const *""'"); 
   }
@@ -71491,11 +69533,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_getAlpha(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCone6_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_getAlpha" "', argument " "1"" of type '" "FormFactorCone6 const *""'"); 
   }
@@ -71513,10 +69556,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorCone6(PyObject *SWIGUNUSEDPARM(self)
   FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCone6",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCone6, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCone6" "', argument " "1"" of type '" "FormFactorCone6 *""'"); 
   }
@@ -71531,12 +69575,16 @@ fail:
 
 SWIGINTERN PyObject *FormFactorCone6_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCone6, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorCone6_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice *arg1 = 0 ;
   IFormFactor *arg2 = 0 ;
@@ -71550,14 +69598,10 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   FormFactorCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorCrystal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice,  0  | 0);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FormFactorCrystal" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
@@ -71565,7 +69609,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FormFactorCrystal" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FormFactorCrystal" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -71573,7 +69617,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FormFactorCrystal" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_FormFactorCrystal" "', argument " "3"" of type '" "IFormFactor const &""'"); 
   }
@@ -71581,7 +69625,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_0(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FormFactorCrystal" "', argument " "3"" of type '" "IFormFactor const &""'"); 
   }
   arg3 = reinterpret_cast< IFormFactor * >(argp3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorCrystal" "', argument " "4"" of type '" "double""'");
   } 
@@ -71594,7 +69638,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice *arg1 = 0 ;
   IFormFactor *arg2 = 0 ;
@@ -71605,13 +69649,10 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FormFactorCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorCrystal",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FormFactorCrystal" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
@@ -71619,7 +69660,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FormFactorCrystal" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FormFactorCrystal" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -71627,7 +69668,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FormFactorCrystal" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_FormFactorCrystal" "', argument " "3"" of type '" "IFormFactor const &""'"); 
   }
@@ -71648,38 +69689,34 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal(PyObject *self, PyObject *args)
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCrystal", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IFormFactor, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_FormFactorCrystal__SWIG_1(self, args);
+          return _wrap_new_FormFactorCrystal__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   if (argc == 4) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IFormFactor, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           {
@@ -71687,7 +69724,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal(PyObject *self, PyObject *args)
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_FormFactorCrystal__SWIG_0(self, args);
+            return _wrap_new_FormFactorCrystal__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -71695,7 +69732,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCrystal(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorCrystal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCrystal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorCrystal::FormFactorCrystal(Lattice const &,IFormFactor const &,IFormFactor const &,double)\n"
     "    FormFactorCrystal::FormFactorCrystal(Lattice const &,IFormFactor const &,IFormFactor const &)\n");
@@ -71708,10 +69745,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorCrystal(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCrystal *arg1 = (FormFactorCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCrystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCrystal" "', argument " "1"" of type '" "FormFactorCrystal *""'"); 
   }
@@ -71729,11 +69767,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorCrystal *arg1 = (FormFactorCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCrystal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_clone" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
@@ -71754,16 +69793,15 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCrystal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_accept" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -71784,17 +69822,16 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_setAmbientMaterial(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_setAmbientMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCrystal_setAmbientMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_setAmbientMaterial" "', argument " "1"" of type '" "FormFactorCrystal *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCrystal * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_setAmbientMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -71819,11 +69856,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_volume(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCrystal *arg1 = (FormFactorCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCrystal_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_volume" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
@@ -71841,11 +69879,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_radialExtension(PyObject *SWIGUNUSE
   FormFactorCrystal *arg1 = (FormFactorCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCrystal_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_radialExtension" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
@@ -71866,17 +69905,16 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_bottomZ(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCrystal_bottomZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_bottomZ" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -71900,17 +69938,16 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_topZ(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCrystal_topZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_topZ" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -71934,17 +69971,16 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_evaluate(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCrystal_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_evaluate" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_evaluate" "', argument " "2"" of type '" "WavevectorInfo const &""'"); 
   }
@@ -71962,11 +69998,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCrystal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorCrystal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -71981,29 +70021,26 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron(PyObject *SWIGUNUSEDPARM(
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FormFactorCuboctahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorCuboctahedron",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCuboctahedron", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCuboctahedron" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCuboctahedron" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCuboctahedron" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorCuboctahedron" "', argument " "4"" of type '" "double""'");
   } 
@@ -72021,11 +70058,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_clone(PyObject *SWIGUNUSEDPAR
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorCuboctahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCuboctahedron_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_clone" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -72046,16 +70084,15 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCuboctahedron_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCuboctahedron_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_accept" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCuboctahedron * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCuboctahedron_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72073,11 +70110,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getLength(PyObject *SWIGUNUSE
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCuboctahedron_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_getLength" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -72095,11 +70133,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getHeight(PyObject *SWIGUNUSE
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCuboctahedron_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_getHeight" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -72117,11 +70156,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getHeightRatio(PyObject *SWIG
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCuboctahedron_getHeightRatio",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_getHeightRatio" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -72139,11 +70179,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getAlpha(PyObject *SWIGUNUSED
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCuboctahedron_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_getAlpha" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'"); 
   }
@@ -72161,10 +70202,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorCuboctahedron(PyObject *SWIGUNUSEDPA
   FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCuboctahedron",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCuboctahedron, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCuboctahedron" "', argument " "1"" of type '" "FormFactorCuboctahedron *""'"); 
   }
@@ -72179,11 +70221,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorCuboctahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCuboctahedron, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorCuboctahedron_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -72192,17 +70238,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self)
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorCylinder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorCylinder",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCylinder", 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 '" "new_FormFactorCylinder" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCylinder" "', argument " "2"" of type '" "double""'");
   } 
@@ -72220,11 +70265,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_clone(PyObject *SWIGUNUSEDPARM(sel
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorCylinder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCylinder_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_clone" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
@@ -72245,16 +70291,15 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_accept(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCylinder_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCylinder_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_accept" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCylinder * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCylinder_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72272,11 +70317,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_getHeight(PyObject *SWIGUNUSEDPARM
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCylinder_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_getHeight" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
@@ -72294,11 +70340,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_getRadius(PyObject *SWIGUNUSEDPARM
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCylinder_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_getRadius" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
@@ -72316,11 +70363,12 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_radialExtension(PyObject *SWIGUNUS
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorCylinder_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_radialExtension" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
@@ -72341,18 +70389,17 @@ SWIGINTERN PyObject *_wrap_FormFactorCylinder_evaluate_for_q(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCylinder_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorCylinder_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCylinder_evaluate_for_q" "', argument " "1"" of type '" "FormFactorCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorCylinder * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCylinder_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -72377,10 +70424,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(se
   FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorCylinder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCylinder, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCylinder, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCylinder" "', argument " "1"" of type '" "FormFactorCylinder *""'"); 
   }
@@ -72395,11 +70443,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorCylinder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCylinder, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorCylinder_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorDebyeBueche(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -72408,17 +70460,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorDebyeBueche(PyObject *SWIGUNUSEDPARM(se
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorDebyeBueche *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorDebyeBueche",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorDebyeBueche", 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 '" "new_FormFactorDebyeBueche" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorDebyeBueche" "', argument " "2"" of type '" "double""'");
   } 
@@ -72436,11 +70487,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDebyeBueche_clone(PyObject *SWIGUNUSEDPARM(
   FormFactorDebyeBueche *arg1 = (FormFactorDebyeBueche *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorDebyeBueche *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDebyeBueche_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDebyeBueche_clone" "', argument " "1"" of type '" "FormFactorDebyeBueche const *""'"); 
   }
@@ -72461,16 +70513,15 @@ SWIGINTERN PyObject *_wrap_FormFactorDebyeBueche_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorDebyeBueche_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorDebyeBueche_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDebyeBueche_accept" "', argument " "1"" of type '" "FormFactorDebyeBueche const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorDebyeBueche * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorDebyeBueche_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72488,11 +70539,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDebyeBueche_radialExtension(PyObject *SWIGU
   FormFactorDebyeBueche *arg1 = (FormFactorDebyeBueche *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDebyeBueche_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDebyeBueche_radialExtension" "', argument " "1"" of type '" "FormFactorDebyeBueche const *""'"); 
   }
@@ -72513,18 +70565,17 @@ SWIGINTERN PyObject *_wrap_FormFactorDebyeBueche_evaluate_for_q(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorDebyeBueche_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorDebyeBueche_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDebyeBueche, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDebyeBueche_evaluate_for_q" "', argument " "1"" of type '" "FormFactorDebyeBueche const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorDebyeBueche * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorDebyeBueche_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -72549,10 +70600,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorDebyeBueche(PyObject *SWIGUNUSEDPARM
   FormFactorDebyeBueche *arg1 = (FormFactorDebyeBueche *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorDebyeBueche",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDebyeBueche, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDebyeBueche, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorDebyeBueche" "', argument " "1"" of type '" "FormFactorDebyeBueche *""'"); 
   }
@@ -72567,21 +70619,26 @@ fail:
 
 SWIGINTERN PyObject *FormFactorDebyeBueche_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDebyeBueche, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorDebyeBueche_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorDodecahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorDodecahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FormFactorDodecahedron",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FormFactorDodecahedron" "', argument " "1"" of type '" "double""'");
   } 
@@ -72599,11 +70656,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDodecahedron_clone(PyObject *SWIGUNUSEDPARM
   FormFactorDodecahedron *arg1 = (FormFactorDodecahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorDodecahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDodecahedron_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDodecahedron_clone" "', argument " "1"" of type '" "FormFactorDodecahedron const *""'"); 
   }
@@ -72624,16 +70682,15 @@ SWIGINTERN PyObject *_wrap_FormFactorDodecahedron_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorDodecahedron_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorDodecahedron_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDodecahedron_accept" "', argument " "1"" of type '" "FormFactorDodecahedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorDodecahedron * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorDodecahedron_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72651,11 +70708,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDodecahedron_getEdge(PyObject *SWIGUNUSEDPA
   FormFactorDodecahedron *arg1 = (FormFactorDodecahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDodecahedron_getEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDodecahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDodecahedron_getEdge" "', argument " "1"" of type '" "FormFactorDodecahedron const *""'"); 
   }
@@ -72673,10 +70731,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorDodecahedron(PyObject *SWIGUNUSEDPAR
   FormFactorDodecahedron *arg1 = (FormFactorDodecahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorDodecahedron",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDodecahedron, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDodecahedron, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorDodecahedron" "', argument " "1"" of type '" "FormFactorDodecahedron *""'"); 
   }
@@ -72691,16 +70750,20 @@ fail:
 
 SWIGINTERN PyObject *FormFactorDodecahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDodecahedron, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorDodecahedron_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorDot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorDot *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_FormFactorDot")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorDot", 0, 0, 0)) SWIG_fail;
   result = (FormFactorDot *)new FormFactorDot();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorDot, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -72714,11 +70777,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDot_clone(PyObject *SWIGUNUSEDPARM(self), P
   FormFactorDot *arg1 = (FormFactorDot *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorDot *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDot_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDot_clone" "', argument " "1"" of type '" "FormFactorDot const *""'"); 
   }
@@ -72739,16 +70803,15 @@ SWIGINTERN PyObject *_wrap_FormFactorDot_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorDot_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorDot_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDot_accept" "', argument " "1"" of type '" "FormFactorDot const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorDot * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorDot_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72766,11 +70829,12 @@ SWIGINTERN PyObject *_wrap_FormFactorDot_radialExtension(PyObject *SWIGUNUSEDPAR
   FormFactorDot *arg1 = (FormFactorDot *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorDot_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDot_radialExtension" "', argument " "1"" of type '" "FormFactorDot const *""'"); 
   }
@@ -72791,18 +70855,17 @@ SWIGINTERN PyObject *_wrap_FormFactorDot_evaluate_for_q(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorDot_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorDot_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDot, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorDot_evaluate_for_q" "', argument " "1"" of type '" "FormFactorDot const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorDot * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorDot_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -72827,10 +70890,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorDot(PyObject *SWIGUNUSEDPARM(self),
   FormFactorDot *arg1 = (FormFactorDot *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorDot",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorDot, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorDot, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorDot" "', argument " "1"" of type '" "FormFactorDot *""'"); 
   }
@@ -72845,11 +70909,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorDot_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDot, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorDot_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -72861,23 +70929,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorEllipsoidalCylinder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorEllipsoidalCylinder",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorEllipsoidalCylinder", 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 '" "new_FormFactorEllipsoidalCylinder" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorEllipsoidalCylinder" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorEllipsoidalCylinder" "', argument " "3"" of type '" "double""'");
   } 
@@ -72895,11 +70961,12 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_clone(PyObject *SWIGUNU
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorEllipsoidalCylinder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorEllipsoidalCylinder_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_clone" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -72920,16 +70987,15 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_accept(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorEllipsoidalCylinder_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorEllipsoidalCylinder_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_accept" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorEllipsoidalCylinder * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorEllipsoidalCylinder_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -72947,11 +71013,12 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_getRadiusX(PyObject *SW
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorEllipsoidalCylinder_getRadiusX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_getRadiusX" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -72969,11 +71036,12 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_getRadiusY(PyObject *SW
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorEllipsoidalCylinder_getRadiusY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_getRadiusY" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -72991,11 +71059,12 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_getHeight(PyObject *SWI
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorEllipsoidalCylinder_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_getHeight" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -73013,11 +71082,12 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_radialExtension(PyObjec
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorEllipsoidalCylinder_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_radialExtension" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
@@ -73038,18 +71108,17 @@ SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_evaluate_for_q(PyObject
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorEllipsoidalCylinder_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorEllipsoidalCylinder_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorEllipsoidalCylinder_evaluate_for_q" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorEllipsoidalCylinder * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorEllipsoidalCylinder_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -73074,10 +71143,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorEllipsoidalCylinder(PyObject *SWIGUN
   FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorEllipsoidalCylinder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorEllipsoidalCylinder, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorEllipsoidalCylinder" "', argument " "1"" of type '" "FormFactorEllipsoidalCylinder *""'"); 
   }
@@ -73092,12 +71162,16 @@ fail:
 
 SWIGINTERN PyObject *FormFactorEllipsoidalCylinder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorEllipsoidalCylinder, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorEllipsoidalCylinder_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   bool arg2 ;
@@ -73105,17 +71179,15 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_0(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FormFactorFullSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorFullSphere",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorFullSphere" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorFullSphere" "', argument " "2"" of type '" "bool""'");
   } 
@@ -73128,16 +71200,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   FormFactorFullSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FormFactorFullSphere",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorFullSphere" "', argument " "1"" of type '" "double""'");
   } 
@@ -73155,13 +71226,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorFullSphere", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -73169,7 +71236,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_FormFactorFullSphere__SWIG_1(self, args);
+      return _wrap_new_FormFactorFullSphere__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -73184,13 +71251,13 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FormFactorFullSphere__SWIG_0(self, args);
+        return _wrap_new_FormFactorFullSphere__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorFullSphere'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorFullSphere'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorFullSphere::FormFactorFullSphere(double,bool)\n"
     "    FormFactorFullSphere::FormFactorFullSphere(double)\n");
@@ -73203,11 +71270,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_clone(PyObject *SWIGUNUSEDPARM(s
   FormFactorFullSphere *arg1 = (FormFactorFullSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorFullSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSphere_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_clone" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
@@ -73228,16 +71296,15 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSphere_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_accept" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSphere * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -73255,11 +71322,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_getRadius(PyObject *SWIGUNUSEDPA
   FormFactorFullSphere *arg1 = (FormFactorFullSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSphere_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_getRadius" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
@@ -73277,11 +71345,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_radialExtension(PyObject *SWIGUN
   FormFactorFullSphere *arg1 = (FormFactorFullSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSphere_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_radialExtension" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
@@ -73302,17 +71371,16 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_bottomZ(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSphere_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_bottomZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_bottomZ" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSphere * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -73336,17 +71404,16 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_topZ(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSphere_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_topZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_topZ" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSphere * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -73370,18 +71437,17 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSphere_evaluate_for_q(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSphere_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorFullSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSphere * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSphere_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -73406,10 +71472,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorFullSphere(PyObject *SWIGUNUSEDPARM(
   FormFactorFullSphere *arg1 = (FormFactorFullSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorFullSphere",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSphere, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSphere, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorFullSphere" "', argument " "1"" of type '" "FormFactorFullSphere *""'"); 
   }
@@ -73424,11 +71491,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorFullSphere_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorFullSphere, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorFullSphere_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -73437,17 +71508,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid(PyObject *SWIGUNUSEDPARM(s
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorFullSpheroid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorFullSpheroid",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorFullSpheroid", 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 '" "new_FormFactorFullSpheroid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorFullSpheroid" "', argument " "2"" of type '" "double""'");
   } 
@@ -73465,11 +71535,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_clone(PyObject *SWIGUNUSEDPARM
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorFullSpheroid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSpheroid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_clone" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
@@ -73490,16 +71561,15 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSpheroid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSpheroid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_accept" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSpheroid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSpheroid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -73517,11 +71587,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_getHeight(PyObject *SWIGUNUSED
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSpheroid_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_getHeight" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
@@ -73539,11 +71610,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_getRadius(PyObject *SWIGUNUSED
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSpheroid_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_getRadius" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
@@ -73561,11 +71633,12 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_radialExtension(PyObject *SWIG
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorFullSpheroid_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_radialExtension" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
@@ -73586,18 +71659,17 @@ SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_evaluate_for_q(PyObject *SWIGU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorFullSpheroid_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorFullSpheroid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorFullSpheroid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorFullSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorFullSpheroid * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorFullSpheroid_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -73622,10 +71694,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorFullSpheroid(PyObject *SWIGUNUSEDPAR
   FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorFullSpheroid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorFullSpheroid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorFullSpheroid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorFullSpheroid" "', argument " "1"" of type '" "FormFactorFullSpheroid *""'"); 
   }
@@ -73640,21 +71713,24 @@ fail:
 
 SWIGINTERN PyObject *FormFactorFullSpheroid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorFullSpheroid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorFullSpheroid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   FormFactorGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FormFactorGauss",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorGauss" "', argument " "1"" of type '" "double""'");
   } 
@@ -73667,7 +71743,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -73675,17 +71751,15 @@ SWIGINTERN PyObject *_wrap_new_FormFactorGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FormFactorGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorGauss",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorGauss" "', argument " "2"" of type '" "double""'");
   } 
@@ -73703,13 +71777,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorGauss(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorGauss", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -73717,7 +71787,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorGauss(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_FormFactorGauss__SWIG_0(self, args);
+      return _wrap_new_FormFactorGauss__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -73732,13 +71802,13 @@ SWIGINTERN PyObject *_wrap_new_FormFactorGauss(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FormFactorGauss__SWIG_1(self, args);
+        return _wrap_new_FormFactorGauss__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorGauss'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorGauss'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorGauss::FormFactorGauss(double)\n"
     "    FormFactorGauss::FormFactorGauss(double,double)\n");
@@ -73751,11 +71821,12 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_clone(PyObject *SWIGUNUSEDPARM(self),
   FormFactorGauss *arg1 = (FormFactorGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_clone" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
@@ -73776,16 +71847,15 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_accept(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_accept" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -73803,11 +71873,12 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_getWidth(PyObject *SWIGUNUSEDPARM(sel
   FormFactorGauss *arg1 = (FormFactorGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorGauss_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_getWidth" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
@@ -73825,11 +71896,12 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_getHeight(PyObject *SWIGUNUSEDPARM(se
   FormFactorGauss *arg1 = (FormFactorGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorGauss_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_getHeight" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
@@ -73847,11 +71919,12 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_radialExtension(PyObject *SWIGUNUSEDP
   FormFactorGauss *arg1 = (FormFactorGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorGauss_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_radialExtension" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
@@ -73872,18 +71945,17 @@ SWIGINTERN PyObject *_wrap_FormFactorGauss_evaluate_for_q(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorGauss_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorGauss_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorGauss_evaluate_for_q" "', argument " "1"" of type '" "FormFactorGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorGauss * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorGauss_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -73908,10 +71980,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorGauss(PyObject *SWIGUNUSEDPARM(self)
   FormFactorGauss *arg1 = (FormFactorGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorGauss" "', argument " "1"" of type '" "FormFactorGauss *""'"); 
   }
@@ -73926,11 +71999,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -73942,23 +72019,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorHemiEllipsoid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorHemiEllipsoid",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorHemiEllipsoid", 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 '" "new_FormFactorHemiEllipsoid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorHemiEllipsoid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorHemiEllipsoid" "', argument " "3"" of type '" "double""'");
   } 
@@ -73976,10 +72051,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPA
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorHemiEllipsoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorHemiEllipsoid" "', argument " "1"" of type '" "FormFactorHemiEllipsoid *""'"); 
   }
@@ -73997,11 +72073,12 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_clone(PyObject *SWIGUNUSEDPAR
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorHemiEllipsoid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorHemiEllipsoid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_clone" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -74022,16 +72099,15 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorHemiEllipsoid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorHemiEllipsoid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_accept" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorHemiEllipsoid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHemiEllipsoid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -74049,11 +72125,12 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_getHeight(PyObject *SWIGUNUSE
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorHemiEllipsoid_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_getHeight" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -74071,11 +72148,12 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_getRadiusX(PyObject *SWIGUNUS
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorHemiEllipsoid_getRadiusX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_getRadiusX" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -74093,11 +72171,12 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_getRadiusY(PyObject *SWIGUNUS
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorHemiEllipsoid_getRadiusY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_getRadiusY" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -74115,11 +72194,12 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_radialExtension(PyObject *SWI
   FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorHemiEllipsoid_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_radialExtension" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
@@ -74140,18 +72220,17 @@ SWIGINTERN PyObject *_wrap_FormFactorHemiEllipsoid_evaluate_for_q(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorHemiEllipsoid_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorHemiEllipsoid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorHemiEllipsoid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorHemiEllipsoid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorHemiEllipsoid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorHemiEllipsoid * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorHemiEllipsoid_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -74173,21 +72252,26 @@ fail:
 
 SWIGINTERN PyObject *FormFactorHemiEllipsoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorHemiEllipsoid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorHemiEllipsoid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorIcosahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorIcosahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FormFactorIcosahedron",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FormFactorIcosahedron" "', argument " "1"" of type '" "double""'");
   } 
@@ -74205,11 +72289,12 @@ SWIGINTERN PyObject *_wrap_FormFactorIcosahedron_clone(PyObject *SWIGUNUSEDPARM(
   FormFactorIcosahedron *arg1 = (FormFactorIcosahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorIcosahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorIcosahedron_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorIcosahedron_clone" "', argument " "1"" of type '" "FormFactorIcosahedron const *""'"); 
   }
@@ -74230,16 +72315,15 @@ SWIGINTERN PyObject *_wrap_FormFactorIcosahedron_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorIcosahedron_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorIcosahedron_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorIcosahedron_accept" "', argument " "1"" of type '" "FormFactorIcosahedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorIcosahedron * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorIcosahedron_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -74257,11 +72341,12 @@ SWIGINTERN PyObject *_wrap_FormFactorIcosahedron_getEdge(PyObject *SWIGUNUSEDPAR
   FormFactorIcosahedron *arg1 = (FormFactorIcosahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorIcosahedron_getEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorIcosahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorIcosahedron_getEdge" "', argument " "1"" of type '" "FormFactorIcosahedron const *""'"); 
   }
@@ -74279,10 +72364,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorIcosahedron(PyObject *SWIGUNUSEDPARM
   FormFactorIcosahedron *arg1 = (FormFactorIcosahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorIcosahedron",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorIcosahedron, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorIcosahedron, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorIcosahedron" "', argument " "1"" of type '" "FormFactorIcosahedron *""'"); 
   }
@@ -74297,11 +72383,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorIcosahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorIcosahedron, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorIcosahedron_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -74313,23 +72403,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongBox(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorLongBox *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorLongBox",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongBox", 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 '" "new_FormFactorLongBox" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongBox" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongBox" "', argument " "3"" of type '" "double""'");
   } 
@@ -74347,11 +72435,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongBox *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBox_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_clone" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -74372,16 +72461,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBox_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBox_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_accept" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBox * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBox_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -74399,11 +72487,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_getLength(PyObject *SWIGUNUSEDPARM(
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBox_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_getLength" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -74421,11 +72510,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_getHeight(PyObject *SWIGUNUSEDPARM(
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBox_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_getHeight" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -74443,11 +72533,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_getWidth(PyObject *SWIGUNUSEDPARM(s
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBox_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_getWidth" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -74465,11 +72556,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_radialExtension(PyObject *SWIGUNUSE
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBox_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_radialExtension" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
@@ -74490,18 +72582,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBox_evaluate_for_q(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBox_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBox_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBox_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongBox const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBox * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBox_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -74526,10 +72617,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongBox(PyObject *SWIGUNUSEDPARM(sel
   FormFactorLongBox *arg1 = (FormFactorLongBox *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongBox",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBox, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBox, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongBox" "', argument " "1"" of type '" "FormFactorLongBox *""'"); 
   }
@@ -74544,11 +72636,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongBox, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -74560,23 +72656,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorLongBoxGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorLongBoxGauss",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxGauss", 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 '" "new_FormFactorLongBoxGauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongBoxGauss" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongBoxGauss" "', argument " "3"" of type '" "double""'");
   } 
@@ -74594,11 +72688,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_clone(PyObject *SWIGUNUSEDPARM
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongBoxGauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxGauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_clone" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -74619,16 +72714,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBoxGauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_accept" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxGauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -74646,11 +72740,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_getLength(PyObject *SWIGUNUSED
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxGauss_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_getLength" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -74668,11 +72763,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_getHeight(PyObject *SWIGUNUSED
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxGauss_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_getHeight" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -74690,11 +72786,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_getWidth(PyObject *SWIGUNUSEDP
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxGauss_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_getWidth" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -74712,11 +72809,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_radialExtension(PyObject *SWIG
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxGauss_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_radialExtension" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
@@ -74737,18 +72835,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_evaluate_for_q(PyObject *SWIGU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBoxGauss_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxGauss_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxGauss_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongBoxGauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxGauss * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxGauss_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -74773,10 +72870,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongBoxGauss(PyObject *SWIGUNUSEDPAR
   FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongBoxGauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxGauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongBoxGauss" "', argument " "1"" of type '" "FormFactorLongBoxGauss *""'"); 
   }
@@ -74791,11 +72889,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongBoxGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongBoxGauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongBoxGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -74807,23 +72909,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorLongBoxLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorLongBoxLorentz",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxLorentz", 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 '" "new_FormFactorLongBoxLorentz" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongBoxLorentz" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongBoxLorentz" "', argument " "3"" of type '" "double""'");
   } 
@@ -74841,11 +72941,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_clone(PyObject *SWIGUNUSEDPA
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongBoxLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxLorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_clone" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -74866,16 +72967,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_accept(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBoxLorentz_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxLorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_accept" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxLorentz * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxLorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -74893,11 +72993,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_getLength(PyObject *SWIGUNUS
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxLorentz_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_getLength" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -74915,11 +73016,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_getHeight(PyObject *SWIGUNUS
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxLorentz_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_getHeight" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -74937,11 +73039,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_getWidth(PyObject *SWIGUNUSE
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxLorentz_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_getWidth" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -74959,11 +73062,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_radialExtension(PyObject *SW
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongBoxLorentz_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_radialExtension" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
@@ -74984,18 +73088,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_evaluate_for_q(PyObject *SWI
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongBoxLorentz_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongBoxLorentz_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongBoxLorentz_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongBoxLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongBoxLorentz * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongBoxLorentz_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -75020,10 +73123,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongBoxLorentz(PyObject *SWIGUNUSEDP
   FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongBoxLorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongBoxLorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongBoxLorentz" "', argument " "1"" of type '" "FormFactorLongBoxLorentz *""'"); 
   }
@@ -75038,11 +73142,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongBoxLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongBoxLorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongBoxLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple1Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -75054,23 +73162,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple1Gauss(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorLongRipple1Gauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorLongRipple1Gauss",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongRipple1Gauss", 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 '" "new_FormFactorLongRipple1Gauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongRipple1Gauss" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongRipple1Gauss" "', argument " "3"" of type '" "double""'");
   } 
@@ -75088,11 +73194,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_clone(PyObject *SWIGUNUSED
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongRipple1Gauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Gauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_clone" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
@@ -75113,16 +73220,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_accept(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple1Gauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple1Gauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_accept" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple1Gauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple1Gauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -75140,11 +73246,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_getHeight(PyObject *SWIGUN
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Gauss_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_getHeight" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
@@ -75162,11 +73269,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_getWidth(PyObject *SWIGUNU
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Gauss_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_getWidth" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
@@ -75184,11 +73292,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_getLength(PyObject *SWIGUN
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Gauss_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_getLength" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
@@ -75206,11 +73315,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_radialExtension(PyObject *
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Gauss_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_radialExtension" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
@@ -75231,18 +73341,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Gauss_evaluate_for_q(PyObject *S
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple1Gauss_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple1Gauss_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Gauss_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple1Gauss * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple1Gauss_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -75267,10 +73376,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Gauss(PyObject *SWIGUNUSE
   FormFactorLongRipple1Gauss *arg1 = (FormFactorLongRipple1Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Gauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Gauss" "', argument " "1"" of type '" "FormFactorLongRipple1Gauss *""'"); 
   }
@@ -75285,11 +73395,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongRipple1Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongRipple1Gauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple1Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -75301,23 +73415,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple1Lorentz(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorLongRipple1Lorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorLongRipple1Lorentz",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongRipple1Lorentz", 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 '" "new_FormFactorLongRipple1Lorentz" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongRipple1Lorentz" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongRipple1Lorentz" "', argument " "3"" of type '" "double""'");
   } 
@@ -75335,11 +73447,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_clone(PyObject *SWIGUNUS
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongRipple1Lorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Lorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_clone" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
@@ -75360,16 +73473,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_accept(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple1Lorentz_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple1Lorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_accept" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple1Lorentz * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple1Lorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -75387,11 +73499,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_radialExtension(PyObject
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Lorentz_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_radialExtension" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
@@ -75409,11 +73522,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_getHeight(PyObject *SWIG
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Lorentz_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_getHeight" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
@@ -75431,11 +73545,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_getWidth(PyObject *SWIGU
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Lorentz_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_getWidth" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
@@ -75453,11 +73568,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_getLength(PyObject *SWIG
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple1Lorentz_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_getLength" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
@@ -75478,18 +73594,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple1Lorentz_evaluate_for_q(PyObject
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple1Lorentz_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple1Lorentz_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple1Lorentz_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple1Lorentz * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple1Lorentz_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -75514,10 +73629,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple1Lorentz(PyObject *SWIGUNU
   FormFactorLongRipple1Lorentz *arg1 = (FormFactorLongRipple1Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple1Lorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple1Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple1Lorentz *""'"); 
   }
@@ -75532,11 +73648,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongRipple1Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongRipple1Lorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple2Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -75551,29 +73671,26 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple2Gauss(PyObject *SWIGUNUSEDPA
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FormFactorLongRipple2Gauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorLongRipple2Gauss",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongRipple2Gauss", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLongRipple2Gauss" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongRipple2Gauss" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongRipple2Gauss" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorLongRipple2Gauss" "', argument " "4"" of type '" "double""'");
   } 
@@ -75591,11 +73708,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_clone(PyObject *SWIGUNUSED
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongRipple2Gauss *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_clone" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75616,16 +73734,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_accept(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple2Gauss_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple2Gauss_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_accept" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple2Gauss * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple2Gauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -75643,11 +73760,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_getHeight(PyObject *SWIGUN
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_getHeight" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75665,11 +73783,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_getWidth(PyObject *SWIGUNU
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_getWidth" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75687,11 +73806,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_getLength(PyObject *SWIGUN
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_getLength" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75709,11 +73829,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_getAsymmetry(PyObject *SWI
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_getAsymmetry",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_getAsymmetry" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75731,11 +73852,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_radialExtension(PyObject *
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Gauss_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_radialExtension" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
@@ -75756,18 +73878,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Gauss_evaluate_for_q(PyObject *S
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple2Gauss_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple2Gauss_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Gauss_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple2Gauss * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple2Gauss_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -75792,10 +73913,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Gauss(PyObject *SWIGUNUSE
   FormFactorLongRipple2Gauss *arg1 = (FormFactorLongRipple2Gauss *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Gauss",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Gauss" "', argument " "1"" of type '" "FormFactorLongRipple2Gauss *""'"); 
   }
@@ -75810,11 +73932,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongRipple2Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLongRipple2Gauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple2Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -75829,29 +73955,26 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongRipple2Lorentz(PyObject *SWIGUNUSED
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FormFactorLongRipple2Lorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorLongRipple2Lorentz",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongRipple2Lorentz", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLongRipple2Lorentz" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLongRipple2Lorentz" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorLongRipple2Lorentz" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorLongRipple2Lorentz" "', argument " "4"" of type '" "double""'");
   } 
@@ -75869,11 +73992,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_clone(PyObject *SWIGUNUS
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLongRipple2Lorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_clone" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -75894,16 +74018,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_accept(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple2Lorentz_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple2Lorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_accept" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple2Lorentz * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple2Lorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -75921,11 +74044,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_getHeight(PyObject *SWIG
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_getHeight" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -75943,11 +74067,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_getWidth(PyObject *SWIGU
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_getWidth" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -75965,11 +74090,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_getLength(PyObject *SWIG
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_getLength" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -75987,11 +74113,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_getAsymmetry(PyObject *S
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_getAsymmetry",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_getAsymmetry" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -76009,11 +74136,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_radialExtension(PyObject
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLongRipple2Lorentz_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_radialExtension" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
@@ -76034,18 +74162,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLongRipple2Lorentz_evaluate_for_q(PyObject
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLongRipple2Lorentz_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLongRipple2Lorentz_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLongRipple2Lorentz_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLongRipple2Lorentz * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLongRipple2Lorentz_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -76070,10 +74197,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLongRipple2Lorentz(PyObject *SWIGUNU
   FormFactorLongRipple2Lorentz *arg1 = (FormFactorLongRipple2Lorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLongRipple2Lorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLongRipple2Lorentz" "', argument " "1"" of type '" "FormFactorLongRipple2Lorentz *""'"); 
   }
@@ -76088,21 +74216,24 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLongRipple2Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorLongRipple2Lorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   FormFactorLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FormFactorLorentz",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLorentz" "', argument " "1"" of type '" "double""'");
   } 
@@ -76115,7 +74246,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -76123,17 +74254,15 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLorentz__SWIG_1(PyObject *SWIGUNUSEDPAR
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FormFactorLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorLorentz",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLorentz" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorLorentz" "', argument " "2"" of type '" "double""'");
   } 
@@ -76151,13 +74280,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLorentz(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorLorentz", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -76165,7 +74290,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLorentz(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_FormFactorLorentz__SWIG_0(self, args);
+      return _wrap_new_FormFactorLorentz__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -76180,13 +74305,13 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLorentz(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FormFactorLorentz__SWIG_1(self, args);
+        return _wrap_new_FormFactorLorentz__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorLorentz'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorLorentz'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorLorentz::FormFactorLorentz(double)\n"
     "    FormFactorLorentz::FormFactorLorentz(double,double)\n");
@@ -76199,11 +74324,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorLorentz *arg1 = (FormFactorLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_clone" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
@@ -76224,16 +74350,15 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLorentz_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_accept" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLorentz * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -76251,11 +74376,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_getWidth(PyObject *SWIGUNUSEDPARM(s
   FormFactorLorentz *arg1 = (FormFactorLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLorentz_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_getWidth" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
@@ -76273,11 +74399,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_getHeight(PyObject *SWIGUNUSEDPARM(
   FormFactorLorentz *arg1 = (FormFactorLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLorentz_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_getHeight" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
@@ -76295,11 +74422,12 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_radialExtension(PyObject *SWIGUNUSE
   FormFactorLorentz *arg1 = (FormFactorLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorLorentz_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_radialExtension" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
@@ -76320,18 +74448,17 @@ SWIGINTERN PyObject *_wrap_FormFactorLorentz_evaluate_for_q(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorLorentz_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorLorentz_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorLorentz_evaluate_for_q" "', argument " "1"" of type '" "FormFactorLorentz const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorLorentz * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorLorentz_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -76356,10 +74483,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorLorentz(PyObject *SWIGUNUSEDPARM(sel
   FormFactorLorentz *arg1 = (FormFactorLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorLorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorLorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorLorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorLorentz" "', argument " "1"" of type '" "FormFactorLorentz *""'"); 
   }
@@ -76374,11 +74502,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorOrnsteinZernike(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -76390,23 +74522,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorOrnsteinZernike(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorOrnsteinZernike *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorOrnsteinZernike",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorOrnsteinZernike", 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 '" "new_FormFactorOrnsteinZernike" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorOrnsteinZernike" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorOrnsteinZernike" "', argument " "3"" of type '" "double""'");
   } 
@@ -76424,11 +74554,12 @@ SWIGINTERN PyObject *_wrap_FormFactorOrnsteinZernike_clone(PyObject *SWIGUNUSEDP
   FormFactorOrnsteinZernike *arg1 = (FormFactorOrnsteinZernike *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorOrnsteinZernike *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorOrnsteinZernike_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorOrnsteinZernike_clone" "', argument " "1"" of type '" "FormFactorOrnsteinZernike const *""'"); 
   }
@@ -76449,16 +74580,15 @@ SWIGINTERN PyObject *_wrap_FormFactorOrnsteinZernike_accept(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorOrnsteinZernike_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorOrnsteinZernike_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorOrnsteinZernike_accept" "', argument " "1"" of type '" "FormFactorOrnsteinZernike const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorOrnsteinZernike * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorOrnsteinZernike_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -76476,11 +74606,12 @@ SWIGINTERN PyObject *_wrap_FormFactorOrnsteinZernike_radialExtension(PyObject *S
   FormFactorOrnsteinZernike *arg1 = (FormFactorOrnsteinZernike *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorOrnsteinZernike_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorOrnsteinZernike_radialExtension" "', argument " "1"" of type '" "FormFactorOrnsteinZernike const *""'"); 
   }
@@ -76501,18 +74632,17 @@ SWIGINTERN PyObject *_wrap_FormFactorOrnsteinZernike_evaluate_for_q(PyObject *SW
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorOrnsteinZernike_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorOrnsteinZernike_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorOrnsteinZernike_evaluate_for_q" "', argument " "1"" of type '" "FormFactorOrnsteinZernike const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorOrnsteinZernike * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorOrnsteinZernike_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -76537,10 +74667,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorOrnsteinZernike(PyObject *SWIGUNUSED
   FormFactorOrnsteinZernike *arg1 = (FormFactorOrnsteinZernike *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorOrnsteinZernike",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorOrnsteinZernike, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorOrnsteinZernike" "', argument " "1"" of type '" "FormFactorOrnsteinZernike *""'"); 
   }
@@ -76555,11 +74686,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorOrnsteinZernike_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorOrnsteinZernike, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorOrnsteinZernike_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorPrism3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -76568,17 +74703,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPrism3(PyObject *SWIGUNUSEDPARM(self),
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorPrism3 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorPrism3",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPrism3", 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 '" "new_FormFactorPrism3" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorPrism3" "', argument " "2"" of type '" "double""'");
   } 
@@ -76596,11 +74730,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism3_clone(PyObject *SWIGUNUSEDPARM(self)
   FormFactorPrism3 *arg1 = (FormFactorPrism3 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorPrism3 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPrism3_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism3_clone" "', argument " "1"" of type '" "FormFactorPrism3 const *""'"); 
   }
@@ -76621,16 +74756,15 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism3_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPrism3_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPrism3_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism3_accept" "', argument " "1"" of type '" "FormFactorPrism3 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPrism3 * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPrism3_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -76648,11 +74782,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism3_getBaseEdge(PyObject *SWIGUNUSEDPARM
   FormFactorPrism3 *arg1 = (FormFactorPrism3 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPrism3_getBaseEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism3, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism3_getBaseEdge" "', argument " "1"" of type '" "FormFactorPrism3 const *""'"); 
   }
@@ -76670,10 +74805,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPrism3(PyObject *SWIGUNUSEDPARM(self
   FormFactorPrism3 *arg1 = (FormFactorPrism3 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPrism3",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism3, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism3, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPrism3" "', argument " "1"" of type '" "FormFactorPrism3 *""'"); 
   }
@@ -76688,11 +74824,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPrism3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPrism3, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorPrism3_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorPrism6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -76701,17 +74841,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPrism6(PyObject *SWIGUNUSEDPARM(self),
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorPrism6 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorPrism6",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPrism6", 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 '" "new_FormFactorPrism6" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorPrism6" "', argument " "2"" of type '" "double""'");
   } 
@@ -76729,11 +74868,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism6_clone(PyObject *SWIGUNUSEDPARM(self)
   FormFactorPrism6 *arg1 = (FormFactorPrism6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorPrism6 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPrism6_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism6_clone" "', argument " "1"" of type '" "FormFactorPrism6 const *""'"); 
   }
@@ -76754,16 +74894,15 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism6_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPrism6_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPrism6_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism6_accept" "', argument " "1"" of type '" "FormFactorPrism6 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPrism6 * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPrism6_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -76781,11 +74920,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPrism6_getBaseEdge(PyObject *SWIGUNUSEDPARM
   FormFactorPrism6 *arg1 = (FormFactorPrism6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPrism6_getBaseEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism6, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPrism6_getBaseEdge" "', argument " "1"" of type '" "FormFactorPrism6 const *""'"); 
   }
@@ -76803,10 +74943,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPrism6(PyObject *SWIGUNUSEDPARM(self
   FormFactorPrism6 *arg1 = (FormFactorPrism6 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPrism6",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPrism6, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPrism6, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPrism6" "', argument " "1"" of type '" "FormFactorPrism6 *""'"); 
   }
@@ -76821,11 +74962,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPrism6_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPrism6, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorPrism6_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorPyramid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -76837,23 +74982,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPyramid(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorPyramid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorPyramid",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPyramid", 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 '" "new_FormFactorPyramid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorPyramid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorPyramid" "', argument " "3"" of type '" "double""'");
   } 
@@ -76871,11 +75014,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorPyramid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPyramid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_clone" "', argument " "1"" of type '" "FormFactorPyramid const *""'"); 
   }
@@ -76896,16 +75040,15 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorPyramid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorPyramid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_accept" "', argument " "1"" of type '" "FormFactorPyramid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorPyramid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorPyramid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -76923,11 +75066,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_getHeight(PyObject *SWIGUNUSEDPARM(
   FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPyramid_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_getHeight" "', argument " "1"" of type '" "FormFactorPyramid const *""'"); 
   }
@@ -76945,11 +75089,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_getBaseEdge(PyObject *SWIGUNUSEDPAR
   FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPyramid_getBaseEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_getBaseEdge" "', argument " "1"" of type '" "FormFactorPyramid const *""'"); 
   }
@@ -76967,11 +75112,12 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_getAlpha(PyObject *SWIGUNUSEDPARM(s
   FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorPyramid_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_getAlpha" "', argument " "1"" of type '" "FormFactorPyramid const *""'"); 
   }
@@ -76989,10 +75135,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorPyramid(PyObject *SWIGUNUSEDPARM(sel
   FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorPyramid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorPyramid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorPyramid" "', argument " "1"" of type '" "FormFactorPyramid *""'"); 
   }
@@ -77007,11 +75154,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorPyramid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPyramid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorPyramid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorRipple1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -77023,23 +75174,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorRipple1(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorRipple1 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorRipple1",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple1", 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 '" "new_FormFactorRipple1" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple1" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple1" "', argument " "3"" of type '" "double""'");
   } 
@@ -77057,11 +75206,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorRipple1 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple1_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_clone" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -77082,16 +75232,15 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorRipple1_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple1_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_accept" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorRipple1 * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple1_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -77109,11 +75258,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_getLength(PyObject *SWIGUNUSEDPARM(
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple1_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_getLength" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -77131,11 +75281,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_getHeight(PyObject *SWIGUNUSEDPARM(
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple1_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_getHeight" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -77153,11 +75304,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_getWidth(PyObject *SWIGUNUSEDPARM(s
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple1_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_getWidth" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -77175,11 +75327,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_radialExtension(PyObject *SWIGUNUSE
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple1_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_radialExtension" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
@@ -77200,18 +75353,17 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1_evaluate_for_q(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorRipple1_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple1_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1_evaluate_for_q" "', argument " "1"" of type '" "FormFactorRipple1 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorRipple1 * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple1_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -77236,10 +75388,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1(PyObject *SWIGUNUSEDPARM(sel
   FormFactorRipple1 *arg1 = (FormFactorRipple1 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple1, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1" "', argument " "1"" of type '" "FormFactorRipple1 *""'"); 
   }
@@ -77254,11 +75407,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorRipple1_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple1, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorRipple1_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorRipple2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -77273,29 +75430,26 @@ SWIGINTERN PyObject *_wrap_new_FormFactorRipple2(PyObject *SWIGUNUSEDPARM(self),
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   FormFactorRipple2 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorRipple2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple2", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple2" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple2" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple2" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorRipple2" "', argument " "4"" of type '" "double""'");
   } 
@@ -77313,11 +75467,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_clone(PyObject *SWIGUNUSEDPARM(self
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorRipple2 *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_clone" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77338,16 +75493,15 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorRipple2_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple2_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_accept" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorRipple2 * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple2_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -77365,11 +75519,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_getHeight(PyObject *SWIGUNUSEDPARM(
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_getHeight" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77387,11 +75542,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_getWidth(PyObject *SWIGUNUSEDPARM(s
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_getWidth" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77409,11 +75565,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_getLength(PyObject *SWIGUNUSEDPARM(
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_getLength" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77431,11 +75588,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_getAsymmetry(PyObject *SWIGUNUSEDPA
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_getAsymmetry",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_getAsymmetry" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77453,11 +75611,12 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_radialExtension(PyObject *SWIGUNUSE
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorRipple2_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_radialExtension" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
@@ -77478,18 +75637,17 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2_evaluate_for_q(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorRipple2_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple2_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2_evaluate_for_q" "', argument " "1"" of type '" "FormFactorRipple2 const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorRipple2 * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple2_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -77514,10 +75672,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2(PyObject *SWIGUNUSEDPARM(sel
   FormFactorRipple2 *arg1 = (FormFactorRipple2 *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorRipple2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorRipple2, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2" "', argument " "1"" of type '" "FormFactorRipple2 *""'"); 
   }
@@ -77532,11 +75691,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorRipple2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple2, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorRipple2_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -77545,17 +75708,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius(PyObject *SWIGUNUS
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorSphereGaussianRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorSphereGaussianRadius",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorSphereGaussianRadius", 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 '" "new_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSphereGaussianRadius" "', argument " "2"" of type '" "double""'");
   } 
@@ -77573,11 +75735,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_clone(PyObject *SWIGUN
   FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorSphereGaussianRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereGaussianRadius_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_clone" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
@@ -77598,16 +75761,15 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_accept(PyObject *SWIGU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereGaussianRadius_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereGaussianRadius_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_accept" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereGaussianRadius * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereGaussianRadius_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -77625,11 +75787,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_radialExtension(PyObje
   FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereGaussianRadius_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_radialExtension" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
@@ -77650,18 +75813,17 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_evaluate_for_q(PyObjec
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereGaussianRadius_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereGaussianRadius_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereGaussianRadius_evaluate_for_q" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereGaussianRadius * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereGaussianRadius_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -77686,10 +75848,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorSphereGaussianRadius(PyObject *SWIGU
   FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereGaussianRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "FormFactorSphereGaussianRadius *""'"); 
   }
@@ -77704,11 +75867,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorSphereGaussianRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorSphereGaussianRadius_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -77720,23 +75887,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius(PyObject *SWIGUNU
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorSphereLogNormalRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorSphereLogNormalRadius",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorSphereLogNormalRadius", 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 '" "new_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -77754,11 +75919,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_clone(PyObject *SWIGU
   FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorSphereLogNormalRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereLogNormalRadius_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_clone" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
@@ -77779,16 +75945,15 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_accept(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereLogNormalRadius_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereLogNormalRadius_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_accept" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereLogNormalRadius * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereLogNormalRadius_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -77806,11 +75971,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_radialExtension(PyObj
   FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereLogNormalRadius_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_radialExtension" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
@@ -77831,18 +75997,17 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_evaluate_for_q(PyObje
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereLogNormalRadius_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereLogNormalRadius_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereLogNormalRadius_evaluate_for_q" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereLogNormalRadius * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereLogNormalRadius_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -77867,10 +76032,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorSphereLogNormalRadius(PyObject *SWIG
   FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereLogNormalRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "FormFactorSphereLogNormalRadius *""'"); 
   }
@@ -77885,11 +76051,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorSphereLogNormalRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorSphereLogNormalRadius_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorSphereUniformRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -77898,17 +76068,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorSphereUniformRadius(PyObject *SWIGUNUSE
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorSphereUniformRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorSphereUniformRadius",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorSphereUniformRadius", 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 '" "new_FormFactorSphereUniformRadius" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSphereUniformRadius" "', argument " "2"" of type '" "double""'");
   } 
@@ -77926,11 +76095,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereUniformRadius_clone(PyObject *SWIGUNU
   FormFactorSphereUniformRadius *arg1 = (FormFactorSphereUniformRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorSphereUniformRadius *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereUniformRadius_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereUniformRadius_clone" "', argument " "1"" of type '" "FormFactorSphereUniformRadius const *""'"); 
   }
@@ -77951,16 +76121,15 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereUniformRadius_accept(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereUniformRadius_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereUniformRadius_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereUniformRadius_accept" "', argument " "1"" of type '" "FormFactorSphereUniformRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereUniformRadius * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereUniformRadius_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -77978,11 +76147,12 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereUniformRadius_radialExtension(PyObjec
   FormFactorSphereUniformRadius *arg1 = (FormFactorSphereUniformRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorSphereUniformRadius_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereUniformRadius_radialExtension" "', argument " "1"" of type '" "FormFactorSphereUniformRadius const *""'"); 
   }
@@ -78003,18 +76173,17 @@ SWIGINTERN PyObject *_wrap_FormFactorSphereUniformRadius_evaluate_for_q(PyObject
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorSphereUniformRadius_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorSphereUniformRadius_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSphereUniformRadius_evaluate_for_q" "', argument " "1"" of type '" "FormFactorSphereUniformRadius const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorSphereUniformRadius * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSphereUniformRadius_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -78039,10 +76208,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorSphereUniformRadius(PyObject *SWIGUN
   FormFactorSphereUniformRadius *arg1 = (FormFactorSphereUniformRadius *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorSphereUniformRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSphereUniformRadius, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSphereUniformRadius" "', argument " "1"" of type '" "FormFactorSphereUniformRadius *""'"); 
   }
@@ -78057,11 +76227,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorSphereUniformRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereUniformRadius, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorSphereUniformRadius_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -78073,23 +76247,21 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   FormFactorTetrahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorTetrahedron",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTetrahedron", 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 '" "new_FormFactorTetrahedron" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTetrahedron" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorTetrahedron" "', argument " "3"" of type '" "double""'");
   } 
@@ -78107,11 +76279,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_clone(PyObject *SWIGUNUSEDPARM(
   FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorTetrahedron *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTetrahedron_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_clone" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'"); 
   }
@@ -78132,16 +76305,15 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTetrahedron_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTetrahedron_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_accept" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTetrahedron * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTetrahedron_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -78159,11 +76331,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_getBaseEdge(PyObject *SWIGUNUSE
   FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTetrahedron_getBaseEdge",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_getBaseEdge" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'"); 
   }
@@ -78181,11 +76354,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_getHeight(PyObject *SWIGUNUSEDP
   FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTetrahedron_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_getHeight" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'"); 
   }
@@ -78203,11 +76377,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_getAlpha(PyObject *SWIGUNUSEDPA
   FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTetrahedron_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_getAlpha" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'"); 
   }
@@ -78225,10 +76400,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorTetrahedron(PyObject *SWIGUNUSEDPARM
   FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTetrahedron",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTetrahedron, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTetrahedron" "', argument " "1"" of type '" "FormFactorTetrahedron *""'"); 
   }
@@ -78243,11 +76419,15 @@ fail:
 
 SWIGINTERN PyObject *FormFactorTetrahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTetrahedron, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorTetrahedron_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -78256,17 +76436,16 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube(PyObject *SWIGUNUSEDPARM(
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   FormFactorTruncatedCube *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorTruncatedCube",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedCube", 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 '" "new_FormFactorTruncatedCube" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTruncatedCube" "', argument " "2"" of type '" "double""'");
   } 
@@ -78284,11 +76463,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedCube_clone(PyObject *SWIGUNUSEDPAR
   FormFactorTruncatedCube *arg1 = (FormFactorTruncatedCube *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorTruncatedCube *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedCube_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedCube_clone" "', argument " "1"" of type '" "FormFactorTruncatedCube const *""'"); 
   }
@@ -78309,16 +76489,15 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedCube_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedCube_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedCube_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedCube_accept" "', argument " "1"" of type '" "FormFactorTruncatedCube const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedCube * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedCube_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -78336,11 +76515,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedCube_getLength(PyObject *SWIGUNUSE
   FormFactorTruncatedCube *arg1 = (FormFactorTruncatedCube *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedCube_getLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedCube_getLength" "', argument " "1"" of type '" "FormFactorTruncatedCube const *""'"); 
   }
@@ -78358,11 +76538,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedCube_getRemovedLength(PyObject *SW
   FormFactorTruncatedCube *arg1 = (FormFactorTruncatedCube *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedCube_getRemovedLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedCube, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedCube_getRemovedLength" "', argument " "1"" of type '" "FormFactorTruncatedCube const *""'"); 
   }
@@ -78380,10 +76561,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedCube(PyObject *SWIGUNUSEDPA
   FormFactorTruncatedCube *arg1 = (FormFactorTruncatedCube *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedCube",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedCube, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedCube, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedCube" "', argument " "1"" of type '" "FormFactorTruncatedCube *""'"); 
   }
@@ -78398,12 +76580,16 @@ fail:
 
 SWIGINTERN PyObject *FormFactorTruncatedCube_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedCube, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorTruncatedCube_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -78414,23 +76600,20 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FormFactorTruncatedSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorTruncatedSphere",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSphere" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTruncatedSphere" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorTruncatedSphere" "', argument " "3"" of type '" "double""'");
   } 
@@ -78443,7 +76626,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -78451,17 +76634,15 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_1(PyObject *SWIGU
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   FormFactorTruncatedSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_FormFactorTruncatedSphere",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSphere" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTruncatedSphere" "', argument " "2"" of type '" "double""'");
   } 
@@ -78479,13 +76660,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *self, PyObjec
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSphere", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -78498,7 +76675,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *self, PyObjec
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_FormFactorTruncatedSphere__SWIG_1(self, args);
+        return _wrap_new_FormFactorTruncatedSphere__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -78519,14 +76696,14 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FormFactorTruncatedSphere__SWIG_0(self, args);
+          return _wrap_new_FormFactorTruncatedSphere__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSphere'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSphere'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorTruncatedSphere::FormFactorTruncatedSphere(double,double,double)\n"
     "    FormFactorTruncatedSphere::FormFactorTruncatedSphere(double,double)\n");
@@ -78539,11 +76716,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_clone(PyObject *SWIGUNUSEDP
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorTruncatedSphere *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSphere_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_clone" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -78564,16 +76742,15 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_accept(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedSphere_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSphere_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_accept" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSphere_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -78591,11 +76768,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_getHeight(PyObject *SWIGUNU
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSphere_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_getHeight" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -78613,11 +76791,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_getRadius(PyObject *SWIGUNU
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSphere_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_getRadius" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -78635,11 +76814,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_getRemovedTop(PyObject *SWI
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSphere_getRemovedTop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_getRemovedTop" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -78657,11 +76837,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_radialExtension(PyObject *S
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSphere_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_radialExtension" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
@@ -78682,18 +76863,17 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_evaluate_for_q(PyObject *SW
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedSphere_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSphere_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "1"" of type '" "FormFactorTruncatedSphere const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSphere * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSphere_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -78718,10 +76898,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSphere(PyObject *SWIGUNUSED
   FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSphere",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSphere" "', argument " "1"" of type '" "FormFactorTruncatedSphere *""'"); 
   }
@@ -78736,12 +76917,16 @@ fail:
 
 SWIGINTERN PyObject *FormFactorTruncatedSphere_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorTruncatedSphere_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -78755,29 +76940,25 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_0(PyObject *SWI
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   FormFactorTruncatedSpheroid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_FormFactorTruncatedSpheroid",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "4"" of type '" "double""'");
   } 
@@ -78790,7 +76971,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -78801,23 +76982,20 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_1(PyObject *SWI
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   FormFactorTruncatedSpheroid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_FormFactorTruncatedSpheroid",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "3"" of type '" "double""'");
   } 
@@ -78835,13 +77013,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *self, PyObj
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSpheroid", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     {
@@ -78859,7 +77033,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *self, PyObj
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_FormFactorTruncatedSpheroid__SWIG_1(self, args);
+          return _wrap_new_FormFactorTruncatedSpheroid__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -78886,7 +77060,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *self, PyObj
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_FormFactorTruncatedSpheroid__SWIG_0(self, args);
+            return _wrap_new_FormFactorTruncatedSpheroid__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -78894,7 +77068,7 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSpheroid'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSpheroid'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double,double,double,double)\n"
     "    FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double,double,double)\n");
@@ -78907,11 +77081,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_clone(PyObject *SWIGUNUSE
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorTruncatedSpheroid *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_clone" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -78932,16 +77107,15 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_accept(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedSpheroid_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSpheroid_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_accept" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSpheroid * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSpheroid_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -78959,11 +77133,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_getRadius(PyObject *SWIGU
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_getRadius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_getRadius" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -78981,11 +77156,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_getHeight(PyObject *SWIGU
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_getHeight" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -79003,11 +77179,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_getHeightFlattening(PyObj
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_getHeightFlattening",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_getHeightFlattening" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -79025,11 +77202,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_getRemovedTop(PyObject *S
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_getRemovedTop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_getRemovedTop" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -79047,11 +77225,12 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_radialExtension(PyObject
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorTruncatedSpheroid_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_radialExtension" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
@@ -79072,18 +77251,17 @@ SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_evaluate_for_q(PyObject *
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorTruncatedSpheroid_evaluate_for_q",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorTruncatedSpheroid_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTruncatedSpheroid_evaluate_for_q" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorTruncatedSpheroid * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorTruncatedSpheroid_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'"); 
     }  
@@ -79108,10 +77286,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorTruncatedSpheroid(PyObject *SWIGUNUS
   FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorTruncatedSpheroid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "FormFactorTruncatedSpheroid *""'"); 
   }
@@ -79126,16 +77305,20 @@ fail:
 
 SWIGINTERN PyObject *FormFactorTruncatedSpheroid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorTruncatedSpheroid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FormFactorWeighted(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FormFactorWeighted *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_FormFactorWeighted")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_FormFactorWeighted", 0, 0, 0)) SWIG_fail;
   result = (FormFactorWeighted *)new FormFactorWeighted();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorWeighted, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -79149,10 +77332,11 @@ SWIGINTERN PyObject *_wrap_delete_FormFactorWeighted(PyObject *SWIGUNUSEDPARM(se
   FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FormFactorWeighted",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorWeighted" "', argument " "1"" of type '" "FormFactorWeighted *""'"); 
   }
@@ -79170,11 +77354,12 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_clone(PyObject *SWIGUNUSEDPARM(sel
   FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FormFactorWeighted *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorWeighted_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_clone" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
@@ -79195,16 +77380,15 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_accept(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorWeighted_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_accept" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -79222,11 +77406,12 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_radialExtension(PyObject *SWIGUNUS
   FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FormFactorWeighted_radialExtension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_radialExtension" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
@@ -79247,17 +77432,16 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_bottomZ(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_bottomZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorWeighted_bottomZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_bottomZ" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -79281,17 +77465,16 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_topZ(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_topZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorWeighted_topZ", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_topZ" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_topZ" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -79307,7 +77490,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ;
   IFormFactor *arg2 = 0 ;
@@ -79318,17 +77501,14 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_0(PyObject *SW
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FormFactorWeighted_addFormFactor",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_addFormFactor" "', argument " "1"" of type '" "FormFactorWeighted *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_addFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -79336,7 +77516,7 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_0(PyObject *SW
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorWeighted_addFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FormFactorWeighted_addFormFactor" "', argument " "3"" of type '" "double""'");
   } 
@@ -79349,7 +77529,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ;
   IFormFactor *arg2 = 0 ;
@@ -79357,16 +77537,14 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor__SWIG_1(PyObject *SW
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_addFormFactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_addFormFactor" "', argument " "1"" of type '" "FormFactorWeighted *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_addFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -79387,23 +77565,19 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FormFactorWeighted_addFormFactor", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FormFactorWeighted, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_FormFactorWeighted_addFormFactor__SWIG_1(self, args);
+        return _wrap_FormFactorWeighted_addFormFactor__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -79413,7 +77587,7 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor(PyObject *self, PyOb
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FormFactorWeighted, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -79421,14 +77595,14 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_FormFactorWeighted_addFormFactor__SWIG_0(self, args);
+          return _wrap_FormFactorWeighted_addFormFactor__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FormFactorWeighted_addFormFactor'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FormFactorWeighted_addFormFactor'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    FormFactorWeighted::addFormFactor(IFormFactor const &,double)\n"
     "    FormFactorWeighted::addFormFactor(IFormFactor const &)\n");
@@ -79444,17 +77618,16 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_setAmbientMaterial(PyObject *SWIGU
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_setAmbientMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorWeighted_setAmbientMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_setAmbientMaterial" "', argument " "1"" of type '" "FormFactorWeighted *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_setAmbientMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -79482,17 +77655,16 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_evaluate(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FormFactorWeighted_evaluate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorWeighted, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_evaluate" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); 
   }
   arg1 = reinterpret_cast< FormFactorWeighted * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_evaluate" "', argument " "2"" of type '" "WavevectorInfo const &""'"); 
   }
@@ -79510,20 +77682,25 @@ fail:
 
 SWIGINTERN PyObject *FormFactorWeighted_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorWeighted, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FormFactorWeighted_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IFootprintFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFootprintFactor *arg1 = (IFootprintFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IFootprintFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IFootprintFactor" "', argument " "1"" of type '" "IFootprintFactor *""'"); 
   }
@@ -79541,11 +77718,12 @@ SWIGINTERN PyObject *_wrap_IFootprintFactor_clone(PyObject *SWIGUNUSEDPARM(self)
   IFootprintFactor *arg1 = (IFootprintFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFootprintFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFootprintFactor_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFootprintFactor_clone" "', argument " "1"" of type '" "IFootprintFactor const *""'"); 
   }
@@ -79566,16 +77744,15 @@ SWIGINTERN PyObject *_wrap_IFootprintFactor_setWidthRatio(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFootprintFactor_setWidthRatio",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFootprintFactor_setWidthRatio", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFootprintFactor_setWidthRatio" "', argument " "1"" of type '" "IFootprintFactor *""'"); 
   }
   arg1 = reinterpret_cast< IFootprintFactor * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFootprintFactor_setWidthRatio" "', argument " "2"" of type '" "double""'");
   } 
@@ -79593,11 +77770,12 @@ SWIGINTERN PyObject *_wrap_IFootprintFactor_widthRatio(PyObject *SWIGUNUSEDPARM(
   IFootprintFactor *arg1 = (IFootprintFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFootprintFactor_widthRatio",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFootprintFactor_widthRatio" "', argument " "1"" of type '" "IFootprintFactor const *""'"); 
   }
@@ -79618,17 +77796,16 @@ SWIGINTERN PyObject *_wrap_IFootprintFactor_calculate(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IFootprintFactor_calculate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IFootprintFactor_calculate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFootprintFactor_calculate" "', argument " "1"" of type '" "IFootprintFactor const *""'"); 
   }
   arg1 = reinterpret_cast< IFootprintFactor * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFootprintFactor_calculate" "', argument " "2"" of type '" "double""'");
   } 
@@ -79646,11 +77823,12 @@ SWIGINTERN PyObject *_wrap_IFootprintFactor__print(PyObject *SWIGUNUSEDPARM(self
   IFootprintFactor *arg1 = (IFootprintFactor *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IFootprintFactor__print",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFootprintFactor__print" "', argument " "1"" of type '" "IFootprintFactor const *""'"); 
   }
@@ -79665,7 +77843,7 @@ fail:
 
 SWIGINTERN PyObject *IFootprintFactor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFootprintFactor, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79675,11 +77853,12 @@ SWIGINTERN PyObject *_wrap_new_FootprintFactorGaussian(PyObject *SWIGUNUSEDPARM(
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FootprintFactorGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FootprintFactorGaussian",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FootprintFactorGaussian" "', argument " "1"" of type '" "double""'");
   } 
@@ -79700,16 +77879,15 @@ SWIGINTERN PyObject *_wrap_FootprintFactorGaussian_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FootprintFactorGaussian_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FootprintFactorGaussian_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorGaussian_accept" "', argument " "1"" of type '" "FootprintFactorGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< FootprintFactorGaussian * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FootprintFactorGaussian_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -79727,11 +77905,12 @@ SWIGINTERN PyObject *_wrap_FootprintFactorGaussian_clone(PyObject *SWIGUNUSEDPAR
   FootprintFactorGaussian *arg1 = (FootprintFactorGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FootprintFactorGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FootprintFactorGaussian_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorGaussian_clone" "', argument " "1"" of type '" "FootprintFactorGaussian const *""'"); 
   }
@@ -79752,17 +77931,16 @@ SWIGINTERN PyObject *_wrap_FootprintFactorGaussian_calculate(PyObject *SWIGUNUSE
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FootprintFactorGaussian_calculate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FootprintFactorGaussian_calculate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorGaussian_calculate" "', argument " "1"" of type '" "FootprintFactorGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< FootprintFactorGaussian * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FootprintFactorGaussian_calculate" "', argument " "2"" of type '" "double""'");
   } 
@@ -79780,11 +77958,12 @@ SWIGINTERN PyObject *_wrap_FootprintFactorGaussian__print(PyObject *SWIGUNUSEDPA
   FootprintFactorGaussian *arg1 = (FootprintFactorGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FootprintFactorGaussian__print",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorGaussian__print" "', argument " "1"" of type '" "FootprintFactorGaussian const *""'"); 
   }
@@ -79802,10 +77981,11 @@ SWIGINTERN PyObject *_wrap_delete_FootprintFactorGaussian(PyObject *SWIGUNUSEDPA
   FootprintFactorGaussian *arg1 = (FootprintFactorGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FootprintFactorGaussian",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorGaussian, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorGaussian, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FootprintFactorGaussian" "', argument " "1"" of type '" "FootprintFactorGaussian *""'"); 
   }
@@ -79820,21 +78000,26 @@ fail:
 
 SWIGINTERN PyObject *FootprintFactorGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FootprintFactorGaussian, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FootprintFactorGaussian_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_FootprintFactorSquare(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FootprintFactorSquare *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_FootprintFactorSquare",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_FootprintFactorSquare" "', argument " "1"" of type '" "double""'");
   } 
@@ -79855,16 +78040,15 @@ SWIGINTERN PyObject *_wrap_FootprintFactorSquare_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FootprintFactorSquare_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FootprintFactorSquare_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorSquare_accept" "', argument " "1"" of type '" "FootprintFactorSquare const *""'"); 
   }
   arg1 = reinterpret_cast< FootprintFactorSquare * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FootprintFactorSquare_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -79882,11 +78066,12 @@ SWIGINTERN PyObject *_wrap_FootprintFactorSquare_clone(PyObject *SWIGUNUSEDPARM(
   FootprintFactorSquare *arg1 = (FootprintFactorSquare *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   FootprintFactorSquare *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FootprintFactorSquare_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorSquare_clone" "', argument " "1"" of type '" "FootprintFactorSquare const *""'"); 
   }
@@ -79907,17 +78092,16 @@ SWIGINTERN PyObject *_wrap_FootprintFactorSquare_calculate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FootprintFactorSquare_calculate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "FootprintFactorSquare_calculate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorSquare_calculate" "', argument " "1"" of type '" "FootprintFactorSquare const *""'"); 
   }
   arg1 = reinterpret_cast< FootprintFactorSquare * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FootprintFactorSquare_calculate" "', argument " "2"" of type '" "double""'");
   } 
@@ -79935,11 +78119,12 @@ SWIGINTERN PyObject *_wrap_FootprintFactorSquare__print(PyObject *SWIGUNUSEDPARM
   FootprintFactorSquare *arg1 = (FootprintFactorSquare *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FootprintFactorSquare__print",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorSquare, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FootprintFactorSquare__print" "', argument " "1"" of type '" "FootprintFactorSquare const *""'"); 
   }
@@ -79957,10 +78142,11 @@ SWIGINTERN PyObject *_wrap_delete_FootprintFactorSquare(PyObject *SWIGUNUSEDPARM
   FootprintFactorSquare *arg1 = (FootprintFactorSquare *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_FootprintFactorSquare",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FootprintFactorSquare, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FootprintFactorSquare, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FootprintFactorSquare" "', argument " "1"" of type '" "FootprintFactorSquare *""'"); 
   }
@@ -79975,20 +78161,25 @@ fail:
 
 SWIGINTERN PyObject *FootprintFactorSquare_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FootprintFactorSquare, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *FootprintFactorSquare_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_Simulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Simulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Simulation" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80006,11 +78197,12 @@ SWIGINTERN PyObject *_wrap_Simulation_clone(PyObject *SWIGUNUSEDPARM(self), PyOb
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Simulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_clone" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80028,10 +78220,11 @@ SWIGINTERN PyObject *_wrap_Simulation_prepareSimulation(PyObject *SWIGUNUSEDPARM
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_prepareSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_prepareSimulation" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80049,10 +78242,11 @@ SWIGINTERN PyObject *_wrap_Simulation_runSimulation(PyObject *SWIGUNUSEDPARM(sel
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_runSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_runSimulation" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80070,10 +78264,11 @@ SWIGINTERN PyObject *_wrap_Simulation_runMPISimulation(PyObject *SWIGUNUSEDPARM(
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_runMPISimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_runMPISimulation" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80094,16 +78289,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setInstrument(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setInstrument",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setInstrument", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setInstrument" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Instrument,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Instrument,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setInstrument" "', argument " "2"" of type '" "Instrument const &""'"); 
   }
@@ -80119,16 +78313,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_getInstrument__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_getInstrument__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Instrument *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getInstrument",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getInstrument" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80141,16 +78334,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_getInstrument__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_getInstrument__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Instrument *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getInstrument",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getInstrument" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80168,20 +78360,16 @@ SWIGINTERN PyObject *_wrap_Simulation_getInstrument(PyObject *self, PyObject *ar
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Simulation_getInstrument", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Simulation_getInstrument__SWIG_1(self, args);
+      return _wrap_Simulation_getInstrument__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -80190,12 +78378,12 @@ SWIGINTERN PyObject *_wrap_Simulation_getInstrument(PyObject *self, PyObject *ar
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Simulation_getInstrument__SWIG_0(self, args);
+      return _wrap_Simulation_getInstrument__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Simulation_getInstrument'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Simulation_getInstrument'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Simulation::getInstrument() const\n"
     "    Simulation::getInstrument()\n");
@@ -80211,16 +78399,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setBeamIntensity(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setBeamIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setBeamIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setBeamIntensity" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Simulation_setBeamIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -80238,11 +78425,12 @@ SWIGINTERN PyObject *_wrap_Simulation_getBeamIntensity(PyObject *SWIGUNUSEDPARM(
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getBeamIntensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getBeamIntensity" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80263,17 +78451,16 @@ SWIGINTERN PyObject *_wrap_Simulation_setBeamPolarization(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setBeamPolarization",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setBeamPolarization", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setBeamPolarization" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setBeamPolarization" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -80301,16 +78488,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setDetectorResolutionFunction(PyObject *SW
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setDetectorResolutionFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setDetectorResolutionFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setDetectorResolutionFunction" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setDetectorResolutionFunction" "', argument " "2"" of type '" "IResolutionFunction2D const &""'"); 
   }
@@ -80331,10 +78517,11 @@ SWIGINTERN PyObject *_wrap_Simulation_removeDetectorResolutionFunction(PyObject
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_removeDetectorResolutionFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_removeDetectorResolutionFunction" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -80361,19 +78548,16 @@ SWIGINTERN PyObject *_wrap_Simulation_setAnalyzerProperties(PyObject *SWIGUNUSED
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Simulation_setAnalyzerProperties",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setAnalyzerProperties", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setAnalyzerProperties" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setAnalyzerProperties" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -80385,12 +78569,12 @@ SWIGINTERN PyObject *_wrap_Simulation_setAnalyzerProperties(PyObject *SWIGUNUSED
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Simulation_setAnalyzerProperties" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation_setAnalyzerProperties" "', argument " "4"" of type '" "double""'");
   } 
@@ -80411,16 +78595,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setSample(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setSample",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setSample", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setSample" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_MultiLayer,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setSample" "', argument " "2"" of type '" "MultiLayer const &""'"); 
   }
@@ -80441,11 +78624,12 @@ SWIGINTERN PyObject *_wrap_Simulation_sample(PyObject *SWIGUNUSEDPARM(self), PyO
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_sample",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_sample" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80466,20 +78650,19 @@ SWIGINTERN PyObject *_wrap_Simulation_setSampleBuilderCpp(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setSampleBuilderCpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setSampleBuilderCpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setSampleBuilderCpp" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     int newmem = 0;
-    res2 = SWIG_ConvertPtrAndOwn(obj1, &argp2, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
+    res2 = SWIG_ConvertPtrAndOwn(swig_obj[1], &argp2, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setSampleBuilderCpp" "', argument " "2"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setSampleBuilderCpp" "', argument " "2"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'");
     }
     if (argp2) arg2 = *(reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp2));
     if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp2);
@@ -80500,16 +78683,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setBackground(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setBackground",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setBackground", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setBackground" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IBackground,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IBackground,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setBackground" "', argument " "2"" of type '" "IBackground const &""'"); 
   }
@@ -80530,11 +78712,12 @@ SWIGINTERN PyObject *_wrap_Simulation_background(PyObject *SWIGUNUSEDPARM(self),
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_background",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_background" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80552,11 +78735,12 @@ SWIGINTERN PyObject *_wrap_Simulation_intensityMapSize(PyObject *SWIGUNUSEDPARM(
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_intensityMapSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_intensityMapSize" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80574,11 +78758,12 @@ SWIGINTERN PyObject *_wrap_Simulation_result(PyObject *SWIGUNUSEDPARM(self), PyO
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_result",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_result" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80591,7 +78776,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   std::string *arg2 = 0 ;
@@ -80610,22 +78795,16 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_0(PyObject
   int ecode5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:Simulation_addParameterDistribution",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_addParameterDistribution" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_addParameterDistribution" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -80634,7 +78813,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_0(PyObject
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
@@ -80642,17 +78821,17 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_0(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
   arg3 = reinterpret_cast< IDistribution1D * >(argp3);
-  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  ecode4 = SWIG_AsVal_size_t(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation_addParameterDistribution" "', argument " "4"" of type '" "size_t""'");
   } 
   arg4 = static_cast< size_t >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Simulation_addParameterDistribution" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_RealLimits,  0  | 0);
+  res6 = SWIG_ConvertPtr(swig_obj[5], &argp6, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "Simulation_addParameterDistribution" "', argument " "6"" of type '" "RealLimits const &""'"); 
   }
@@ -80670,7 +78849,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   std::string *arg2 = 0 ;
@@ -80686,21 +78865,16 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_1(PyObject
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Simulation_addParameterDistribution",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_addParameterDistribution" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_addParameterDistribution" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -80709,7 +78883,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_1(PyObject
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
@@ -80717,12 +78891,12 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_1(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
   arg3 = reinterpret_cast< IDistribution1D * >(argp3);
-  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  ecode4 = SWIG_AsVal_size_t(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation_addParameterDistribution" "', argument " "4"" of type '" "size_t""'");
   } 
   arg4 = static_cast< size_t >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Simulation_addParameterDistribution" "', argument " "5"" of type '" "double""'");
   } 
@@ -80737,7 +78911,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   std::string *arg2 = 0 ;
@@ -80750,20 +78924,16 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_2(PyObject
   int res3 = 0 ;
   size_t val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Simulation_addParameterDistribution",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_addParameterDistribution" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_addParameterDistribution" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -80772,7 +78942,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_2(PyObject
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
@@ -80780,7 +78950,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_2(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Simulation_addParameterDistribution" "', argument " "3"" of type '" "IDistribution1D const &""'"); 
   }
   arg3 = reinterpret_cast< IDistribution1D * >(argp3);
-  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  ecode4 = SWIG_AsVal_size_t(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation_addParameterDistribution" "', argument " "4"" of type '" "size_t""'");
   } 
@@ -80795,7 +78965,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   ParameterDistribution *arg2 = 0 ;
@@ -80803,16 +78973,14 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution__SWIG_3(PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_addParameterDistribution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_addParameterDistribution" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ParameterDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ParameterDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_addParameterDistribution" "', argument " "2"" of type '" "ParameterDistribution const &""'"); 
   }
@@ -80833,23 +79001,19 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Simulation_addParameterDistribution", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ParameterDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ParameterDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Simulation_addParameterDistribution__SWIG_3(self, args);
+        return _wrap_Simulation_addParameterDistribution__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -80862,7 +79026,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           {
@@ -80870,7 +79034,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_Simulation_addParameterDistribution__SWIG_2(self, args);
+            return _wrap_Simulation_addParameterDistribution__SWIG_2(self, argc, argv);
           }
         }
       }
@@ -80885,7 +79049,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           {
@@ -80898,7 +79062,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_Simulation_addParameterDistribution__SWIG_1(self, args);
+              return _wrap_Simulation_addParameterDistribution__SWIG_1(self, argc, argv);
             }
           }
         }
@@ -80914,7 +79078,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           {
@@ -80927,10 +79091,10 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_RealLimits, 0);
+              int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
               _v = SWIG_CheckState(res);
               if (_v) {
-                return _wrap_Simulation_addParameterDistribution__SWIG_0(self, args);
+                return _wrap_Simulation_addParameterDistribution__SWIG_0(self, argc, argv);
               }
             }
           }
@@ -80940,7 +79104,7 @@ SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Simulation_addParameterDistribution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Simulation_addParameterDistribution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Simulation::addParameterDistribution(std::string const &,IDistribution1D const &,size_t,double,RealLimits const &)\n"
     "    Simulation::addParameterDistribution(std::string const &,IDistribution1D const &,size_t,double)\n"
@@ -80955,11 +79119,12 @@ SWIGINTERN PyObject *_wrap_Simulation_getDistributionHandler(PyObject *SWIGUNUSE
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DistributionHandler *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getDistributionHandler",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getDistributionHandler" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -80980,16 +79145,15 @@ SWIGINTERN PyObject *_wrap_Simulation_setOptions(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_setOptions",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_setOptions", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setOptions" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_SimulationOptions,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_SimulationOptions,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_setOptions" "', argument " "2"" of type '" "SimulationOptions const &""'"); 
   }
@@ -81005,16 +79169,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_getOptions__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_getOptions__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationOptions *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getOptions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getOptions" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -81027,16 +79190,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation_getOptions__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation_getOptions__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationOptions *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getOptions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getOptions" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -81054,20 +79216,16 @@ SWIGINTERN PyObject *_wrap_Simulation_getOptions(PyObject *self, PyObject *args)
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Simulation_getOptions", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Simulation_getOptions__SWIG_1(self, args);
+      return _wrap_Simulation_getOptions__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -81076,12 +79234,12 @@ SWIGINTERN PyObject *_wrap_Simulation_getOptions(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Simulation_getOptions__SWIG_0(self, args);
+      return _wrap_Simulation_getOptions__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Simulation_getOptions'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Simulation_getOptions'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Simulation::getOptions() const\n"
     "    Simulation::getOptions()\n");
@@ -81097,17 +79255,16 @@ SWIGINTERN PyObject *_wrap_Simulation_subscribe(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation_subscribe",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation_subscribe", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_subscribe" "', argument " "1"" of type '" "Simulation *""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ProgressHandler__Callback_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ProgressHandler__Callback_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation_subscribe" "', argument " "2"" of type '" "ProgressHandler::Callback_t""'"); 
     }  
@@ -81132,10 +79289,11 @@ SWIGINTERN PyObject *_wrap_Simulation_setTerminalProgressMonitor(PyObject *SWIGU
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_setTerminalProgressMonitor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_setTerminalProgressMonitor" "', argument " "1"" of type '" "Simulation *""'"); 
   }
@@ -81153,11 +79311,12 @@ SWIGINTERN PyObject *_wrap_Simulation_getChildren(PyObject *SWIGUNUSEDPARM(self)
   Simulation *arg1 = (Simulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_getChildren" "', argument " "1"" of type '" "Simulation const *""'"); 
   }
@@ -81172,7 +79331,7 @@ fail:
 
 SWIGINTERN PyObject *Simulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Simulation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81182,10 +79341,11 @@ SWIGINTERN PyObject *_wrap_delete_Simulation2D(PyObject *SWIGUNUSEDPARM(self), P
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Simulation2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Simulation2D" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
@@ -81203,11 +79363,12 @@ SWIGINTERN PyObject *_wrap_Simulation2D_clone(PyObject *SWIGUNUSEDPARM(self), Py
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Simulation2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_clone" "', argument " "1"" of type '" "Simulation2D const *""'"); 
   }
@@ -81225,10 +79386,11 @@ SWIGINTERN PyObject *_wrap_Simulation2D_prepareSimulation(PyObject *SWIGUNUSEDPA
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation2D_prepareSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_prepareSimulation" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
@@ -81264,46 +79426,40 @@ SWIGINTERN PyObject *_wrap_Simulation2D_setDetectorParameters(PyObject *SWIGUNUS
   int ecode6 = 0 ;
   double val7 ;
   int ecode7 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
+  PyObject *swig_obj[7] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:Simulation2D_setDetectorParameters",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation2D_setDetectorParameters", 7, 7, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_setDetectorParameters" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
   arg1 = reinterpret_cast< Simulation2D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Simulation2D_setDetectorParameters" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Simulation2D_setDetectorParameters" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation2D_setDetectorParameters" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_size_t(obj4, &val5);
+  ecode5 = SWIG_AsVal_size_t(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Simulation2D_setDetectorParameters" "', argument " "5"" of type '" "size_t""'");
   } 
   arg5 = static_cast< size_t >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "Simulation2D_setDetectorParameters" "', argument " "6"" of type '" "double""'");
   } 
   arg6 = static_cast< double >(val6);
-  ecode7 = SWIG_AsVal_double(obj6, &val7);
+  ecode7 = SWIG_AsVal_double(swig_obj[6], &val7);
   if (!SWIG_IsOK(ecode7)) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "Simulation2D_setDetectorParameters" "', argument " "7"" of type '" "double""'");
   } 
@@ -81324,16 +79480,15 @@ SWIGINTERN PyObject *_wrap_Simulation2D_setDetector(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation2D_setDetector",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation2D_setDetector", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_setDetector" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
   arg1 = reinterpret_cast< Simulation2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDetector2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetector2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation2D_setDetector" "', argument " "2"" of type '" "IDetector2D const &""'"); 
   }
@@ -81354,10 +79509,11 @@ SWIGINTERN PyObject *_wrap_Simulation2D_removeMasks(PyObject *SWIGUNUSEDPARM(sel
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation2D_removeMasks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_removeMasks" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
@@ -81370,7 +79526,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   IShape2D *arg2 = 0 ;
@@ -81381,17 +79537,14 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Simulation2D_addMask",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_addMask" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
   arg1 = reinterpret_cast< Simulation2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
@@ -81399,7 +79552,7 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Simulation2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
   arg2 = reinterpret_cast< IShape2D * >(argp2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Simulation2D_addMask" "', argument " "3"" of type '" "bool""'");
   } 
@@ -81412,7 +79565,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   IShape2D *arg2 = 0 ;
@@ -81420,16 +79573,14 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Simulation2D_addMask",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_addMask" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
   arg1 = reinterpret_cast< Simulation2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Simulation2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
@@ -81450,23 +79601,19 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Simulation2D_addMask", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Simulation2D_addMask__SWIG_1(self, args);
+        return _wrap_Simulation2D_addMask__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -81476,7 +79623,7 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Simulation2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -81484,14 +79631,14 @@ SWIGINTERN PyObject *_wrap_Simulation2D_addMask(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Simulation2D_addMask__SWIG_0(self, args);
+          return _wrap_Simulation2D_addMask__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Simulation2D_addMask'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Simulation2D_addMask'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Simulation2D::addMask(IShape2D const &,bool)\n"
     "    Simulation2D::addMask(IShape2D const &)\n");
@@ -81504,10 +79651,11 @@ SWIGINTERN PyObject *_wrap_Simulation2D_maskAll(PyObject *SWIGUNUSEDPARM(self),
   Simulation2D *arg1 = (Simulation2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Simulation2D_maskAll",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_maskAll" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
@@ -81537,34 +79685,30 @@ SWIGINTERN PyObject *_wrap_Simulation2D_setRegionOfInterest(PyObject *SWIGUNUSED
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
+  PyObject *swig_obj[5] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Simulation2D_setRegionOfInterest",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Simulation2D_setRegionOfInterest", 5, 5, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Simulation2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation2D_setRegionOfInterest" "', argument " "1"" of type '" "Simulation2D *""'"); 
   }
   arg1 = reinterpret_cast< Simulation2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Simulation2D_setRegionOfInterest" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Simulation2D_setRegionOfInterest" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Simulation2D_setRegionOfInterest" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Simulation2D_setRegionOfInterest" "', argument " "5"" of type '" "double""'");
   } 
@@ -81579,7 +79723,7 @@ fail:
 
 SWIGINTERN PyObject *Simulation2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Simulation2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81588,7 +79732,7 @@ SWIGINTERN PyObject *_wrap_new_SimulationOptions(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   SimulationOptions *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SimulationOptions")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SimulationOptions", 0, 0, 0)) SWIG_fail;
   result = (SimulationOptions *)new SimulationOptions();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SimulationOptions, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -81602,11 +79746,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_isIntegrate(PyObject *SWIGUNUSEDPAR
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_isIntegrate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_isIntegrate" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81624,11 +79769,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_getMcPoints(PyObject *SWIGUNUSEDPAR
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_getMcPoints",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_getMcPoints" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81641,7 +79787,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   bool arg2 ;
@@ -81652,22 +79798,19 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_0(Py
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SimulationOptions_setMonteCarloIntegration",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "2"" of type '" "bool""'");
   } 
   arg2 = static_cast< bool >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -81680,7 +79823,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   bool arg2 ;
@@ -81688,16 +79831,14 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_1(Py
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setMonteCarloIntegration",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "2"" of type '" "bool""'");
   } 
@@ -81710,15 +79851,14 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_setMonteCarloIntegration",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setMonteCarloIntegration" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
@@ -81736,20 +79876,16 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration(PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationOptions_setMonteCarloIntegration", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationOptions, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_2(self, args);
+      return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -81763,7 +79899,7 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration(PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_1(self, args);
+        return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -81783,14 +79919,14 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setMonteCarloIntegration(PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_0(self, args);
+          return _wrap_SimulationOptions_setMonteCarloIntegration__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationOptions_setMonteCarloIntegration'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationOptions_setMonteCarloIntegration'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationOptions::setMonteCarloIntegration(bool,size_t)\n"
     "    SimulationOptions::setMonteCarloIntegration(bool)\n"
@@ -81807,16 +79943,15 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setNumberOfThreads(PyObject *SWIGUN
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setNumberOfThreads",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationOptions_setNumberOfThreads", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setNumberOfThreads" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setNumberOfThreads" "', argument " "2"" of type '" "int""'");
   } 
@@ -81834,11 +79969,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_getNumberOfThreads(PyObject *SWIGUN
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_getNumberOfThreads",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_getNumberOfThreads" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81859,16 +79995,15 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setNumberOfBatches(PyObject *SWIGUN
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setNumberOfBatches",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationOptions_setNumberOfBatches", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setNumberOfBatches" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setNumberOfBatches" "', argument " "2"" of type '" "int""'");
   } 
@@ -81886,11 +80021,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_getNumberOfBatches(PyObject *SWIGUN
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_getNumberOfBatches",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_getNumberOfBatches" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81908,11 +80044,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_getCurrentBatch(PyObject *SWIGUNUSE
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_getCurrentBatch",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_getCurrentBatch" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81933,16 +80070,15 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setThreadInfo(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setThreadInfo",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationOptions_setThreadInfo", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setThreadInfo" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ThreadInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ThreadInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimulationOptions_setThreadInfo" "', argument " "2"" of type '" "ThreadInfo const &""'"); 
   }
@@ -81963,11 +80099,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_getHardwareConcurrency(PyObject *SW
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_getHardwareConcurrency",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_getHardwareConcurrency" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -81988,16 +80125,15 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setIncludeSpecular(PyObject *SWIGUN
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setIncludeSpecular",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationOptions_setIncludeSpecular", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setIncludeSpecular" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setIncludeSpecular" "', argument " "2"" of type '" "bool""'");
   } 
@@ -82015,11 +80151,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_includeSpecular(PyObject *SWIGUNUSE
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_includeSpecular",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_includeSpecular" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -82040,16 +80177,15 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_setUseAvgMaterials(PyObject *SWIGUN
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationOptions_setUseAvgMaterials",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationOptions_setUseAvgMaterials", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_setUseAvgMaterials" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
   arg1 = reinterpret_cast< SimulationOptions * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationOptions_setUseAvgMaterials" "', argument " "2"" of type '" "bool""'");
   } 
@@ -82067,11 +80203,12 @@ SWIGINTERN PyObject *_wrap_SimulationOptions_useAvgMaterials(PyObject *SWIGUNUSE
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationOptions_useAvgMaterials",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationOptions_useAvgMaterials" "', argument " "1"" of type '" "SimulationOptions const *""'"); 
   }
@@ -82089,10 +80226,11 @@ SWIGINTERN PyObject *_wrap_delete_SimulationOptions(PyObject *SWIGUNUSEDPARM(sel
   SimulationOptions *arg1 = (SimulationOptions *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SimulationOptions",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationOptions, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationOptions, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SimulationOptions" "', argument " "1"" of type '" "SimulationOptions *""'"); 
   }
@@ -82107,16 +80245,20 @@ fail:
 
 SWIGINTERN PyObject *SimulationOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SimulationOptions, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SimulationOptions_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   GISASSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_GISASSimulation")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (GISASSimulation *)new GISASSimulation();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_GISASSimulation, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -82125,16 +80267,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   MultiLayer *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   GISASSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_GISASSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -82150,20 +80291,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_GISASSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::shared_ptr< IMultiLayerBuilder > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   GISASSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_GISASSimulation",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GISASSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'");
     }
     if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1));
     if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
@@ -82181,22 +80321,18 @@ SWIGINTERN PyObject *_wrap_new_GISASSimulation(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_GISASSimulation", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_GISASSimulation__SWIG_0(self, args);
+    return _wrap_new_GISASSimulation__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_GISASSimulation__SWIG_1(self, args);
+      return _wrap_new_GISASSimulation__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -82204,12 +80340,12 @@ SWIGINTERN PyObject *_wrap_new_GISASSimulation(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_GISASSimulation__SWIG_2(self, args);
+      return _wrap_new_GISASSimulation__SWIG_2(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_GISASSimulation'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_GISASSimulation'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    GISASSimulation::GISASSimulation()\n"
     "    GISASSimulation::GISASSimulation(MultiLayer const &)\n"
@@ -82223,10 +80359,11 @@ SWIGINTERN PyObject *_wrap_delete_GISASSimulation(PyObject *SWIGUNUSEDPARM(self)
   GISASSimulation *arg1 = (GISASSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_GISASSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GISASSimulation" "', argument " "1"" of type '" "GISASSimulation *""'"); 
   }
@@ -82244,11 +80381,12 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_clone(PyObject *SWIGUNUSEDPARM(self),
   GISASSimulation *arg1 = (GISASSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   GISASSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GISASSimulation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_clone" "', argument " "1"" of type '" "GISASSimulation const *""'"); 
   }
@@ -82269,16 +80407,15 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_accept(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:GISASSimulation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "GISASSimulation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_accept" "', argument " "1"" of type '" "GISASSimulation const *""'"); 
   }
   arg1 = reinterpret_cast< GISASSimulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GISASSimulation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -82296,10 +80433,11 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_prepareSimulation(PyObject *SWIGUNUSE
   GISASSimulation *arg1 = (GISASSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GISASSimulation_prepareSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_prepareSimulation" "', argument " "1"" of type '" "GISASSimulation *""'"); 
   }
@@ -82317,11 +80455,12 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_result(PyObject *SWIGUNUSEDPARM(self)
   GISASSimulation *arg1 = (GISASSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GISASSimulation_result",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_result" "', argument " "1"" of type '" "GISASSimulation const *""'"); 
   }
@@ -82348,28 +80487,25 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_setBeamParameters(PyObject *SWIGUNUSE
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:GISASSimulation_setBeamParameters",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "GISASSimulation_setBeamParameters", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_setBeamParameters" "', argument " "1"" of type '" "GISASSimulation *""'"); 
   }
   arg1 = reinterpret_cast< GISASSimulation * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GISASSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GISASSimulation_setBeamParameters" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GISASSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
   } 
@@ -82387,11 +80523,12 @@ SWIGINTERN PyObject *_wrap_GISASSimulation_intensityMapSize(PyObject *SWIGUNUSED
   GISASSimulation *arg1 = (GISASSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GISASSimulation_intensityMapSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_intensityMapSize" "', argument " "1"" of type '" "GISASSimulation const *""'"); 
   }
@@ -82406,20 +80543,25 @@ fail:
 
 SWIGINTERN PyObject *GISASSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_GISASSimulation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *GISASSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IHistogram(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IHistogram",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IHistogram" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
@@ -82437,11 +80579,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_clone(PyObject *SWIGUNUSEDPARM(self), PyOb
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_clone" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82459,11 +80602,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getRank(PyObject *SWIGUNUSEDPARM(self), Py
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getRank",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getRank" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82481,11 +80625,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getTotalNumberOfBins(PyObject *SWIGUNUSEDP
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getTotalNumberOfBins",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getTotalNumberOfBins" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82503,11 +80648,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getXaxis(PyObject *SWIGUNUSEDPARM(self), P
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getXaxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getXaxis" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82525,11 +80671,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getYaxis(PyObject *SWIGUNUSEDPARM(self), P
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getYaxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getYaxis" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82547,11 +80694,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getXmin(PyObject *SWIGUNUSEDPARM(self), Py
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getXmin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getXmin" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82569,11 +80717,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getXmax(PyObject *SWIGUNUSEDPARM(self), Py
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getXmax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getXmax" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82591,11 +80740,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getNbinsX(PyObject *SWIGUNUSEDPARM(self),
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getNbinsX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getNbinsX" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82613,11 +80763,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getYmin(PyObject *SWIGUNUSEDPARM(self), Py
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getYmin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getYmin" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82635,11 +80786,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getYmax(PyObject *SWIGUNUSEDPARM(self), Py
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getYmax",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getYmax" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82657,11 +80809,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getNbinsY(PyObject *SWIGUNUSEDPARM(self),
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getNbinsY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getNbinsY" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -82674,7 +80827,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -82685,23 +80838,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_0(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_getGlobalBin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getGlobalBin" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getGlobalBin" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_getGlobalBin" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -82714,7 +80864,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -82722,17 +80872,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin__SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getGlobalBin",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getGlobalBin" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getGlobalBin" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82750,13 +80898,9 @@ SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getGlobalBin", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -82768,7 +80912,7 @@ SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getGlobalBin__SWIG_1(self, args);
+        return _wrap_IHistogram_getGlobalBin__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -82788,14 +80932,14 @@ SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IHistogram_getGlobalBin__SWIG_0(self, args);
+          return _wrap_IHistogram_getGlobalBin__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getGlobalBin'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getGlobalBin'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getGlobalBin(size_t,size_t) const\n"
     "    IHistogram::getGlobalBin(size_t) const\n");
@@ -82814,23 +80958,21 @@ SWIGINTERN PyObject *_wrap_IHistogram_findGlobalBin(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_findGlobalBin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_findGlobalBin", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_findGlobalBin" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_findGlobalBin" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_findGlobalBin" "', argument " "3"" of type '" "double""'");
   } 
@@ -82851,17 +80993,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getXaxisIndex(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getXaxisIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_getXaxisIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getXaxisIndex" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getXaxisIndex" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82882,17 +81023,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getYaxisIndex(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getYaxisIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_getYaxisIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getYaxisIndex" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getYaxisIndex" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82913,17 +81053,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getXaxisValue(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getXaxisValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_getXaxisValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getXaxisValue" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getXaxisValue" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82944,17 +81083,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getYaxisValue(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getYaxisValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_getYaxisValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getYaxisValue" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getYaxisValue" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82967,7 +81105,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -82975,17 +81113,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_0(PyObject *SWIGUNUSED
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getBinContent",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinContent" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinContent" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -82998,16 +81134,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   OutputData< CumulativeValue > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getData" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83020,16 +81155,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   OutputData< CumulativeValue > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getData" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
@@ -83047,20 +81181,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getData(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getData", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IHistogram, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_getData__SWIG_1(self, args);
+      return _wrap_IHistogram_getData__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -83069,12 +81199,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getData(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IHistogram, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_getData__SWIG_0(self, args);
+      return _wrap_IHistogram_getData__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getData() const\n"
     "    IHistogram::getData()\n");
@@ -83082,7 +81212,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83093,23 +81223,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinContent__SWIG_1(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_getBinContent",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinContent" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinContent" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_getBinContent" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -83127,13 +81254,9 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinContent(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getBinContent", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -83145,7 +81268,7 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinContent(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getBinContent__SWIG_0(self, args);
+        return _wrap_IHistogram_getBinContent__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -83165,14 +81288,14 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinContent(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IHistogram_getBinContent__SWIG_1(self, args);
+          return _wrap_IHistogram_getBinContent__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getBinContent'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getBinContent'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getBinContent(size_t) const\n"
     "    IHistogram::getBinContent(size_t,size_t) const\n");
@@ -83191,22 +81314,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_setBinContent(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_setBinContent",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_setBinContent", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_setBinContent" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_setBinContent" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_setBinContent" "', argument " "3"" of type '" "double""'");
   } 
@@ -83230,22 +81351,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_addBinContent(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_addBinContent",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_addBinContent", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_addBinContent" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_addBinContent" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_addBinContent" "', argument " "3"" of type '" "double""'");
   } 
@@ -83258,7 +81377,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83266,17 +81385,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getBinError",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinError" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinError" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -83289,7 +81406,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83300,23 +81417,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinError__SWIG_1(PyObject *SWIGUNUSEDPA
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_getBinError",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinError" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinError" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_getBinError" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -83334,13 +81448,9 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinError(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getBinError", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -83352,7 +81462,7 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinError(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getBinError__SWIG_0(self, args);
+        return _wrap_IHistogram_getBinError__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -83372,14 +81482,14 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinError(PyObject *self, PyObject *args
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IHistogram_getBinError__SWIG_1(self, args);
+          return _wrap_IHistogram_getBinError__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getBinError'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getBinError'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getBinError(size_t) const\n"
     "    IHistogram::getBinError(size_t,size_t) const\n");
@@ -83387,7 +81497,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83395,17 +81505,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_0(PyObject *SWIGUNUSED
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getBinAverage",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinAverage" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinAverage" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -83418,7 +81526,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83429,23 +81537,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage__SWIG_1(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_getBinAverage",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinAverage" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinAverage" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_getBinAverage" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -83463,13 +81568,9 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getBinAverage", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -83481,7 +81582,7 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getBinAverage__SWIG_0(self, args);
+        return _wrap_IHistogram_getBinAverage__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -83501,14 +81602,14 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IHistogram_getBinAverage__SWIG_1(self, args);
+          return _wrap_IHistogram_getBinAverage__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getBinAverage'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getBinAverage'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getBinAverage(size_t) const\n"
     "    IHistogram::getBinAverage(size_t,size_t) const\n");
@@ -83516,7 +81617,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83524,17 +81625,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_0(PyObject *SW
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getBinNumberOfEntries",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinNumberOfEntries" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinNumberOfEntries" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -83547,7 +81646,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   size_t arg2 ;
@@ -83558,23 +81657,20 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries__SWIG_1(PyObject *SW
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IHistogram_getBinNumberOfEntries",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getBinNumberOfEntries" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getBinNumberOfEntries" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IHistogram_getBinNumberOfEntries" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -83592,13 +81688,9 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getBinNumberOfEntries", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -83610,7 +81702,7 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getBinNumberOfEntries__SWIG_0(self, args);
+        return _wrap_IHistogram_getBinNumberOfEntries__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -83630,14 +81722,14 @@ SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IHistogram_getBinNumberOfEntries__SWIG_1(self, args);
+          return _wrap_IHistogram_getBinNumberOfEntries__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getBinNumberOfEntries'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getBinNumberOfEntries'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getBinNumberOfEntries(size_t) const\n"
     "    IHistogram::getBinNumberOfEntries(size_t,size_t) const\n");
@@ -83650,11 +81742,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getMaximum(PyObject *SWIGUNUSEDPARM(self),
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getMaximum",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getMaximum" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83672,11 +81765,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getMaximumBinIndex(PyObject *SWIGUNUSEDPAR
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getMaximumBinIndex",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getMaximumBinIndex" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83694,11 +81788,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getMinimum(PyObject *SWIGUNUSEDPARM(self),
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getMinimum",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getMinimum" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83716,11 +81811,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_getMinimumBinIndex(PyObject *SWIGUNUSEDPAR
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getMinimumBinIndex",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getMinimumBinIndex" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83741,16 +81837,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_scale(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_scale",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_scale", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_scale" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_scale" "', argument " "2"" of type '" "double""'");
   } 
@@ -83768,11 +81863,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_integral(PyObject *SWIGUNUSEDPARM(self), P
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_integral",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_integral" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83785,7 +81881,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_array__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_array__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   IHistogram::DataType arg2 ;
@@ -83793,17 +81889,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_array__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_array",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_array" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_array" "', argument " "2"" of type '" "IHistogram::DataType""'");
   } 
@@ -83816,16 +81910,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_array__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_array__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_array",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_array" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83843,20 +81936,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_array(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_array", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IHistogram, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_array__SWIG_1(self, args);
+      return _wrap_IHistogram_array__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -83870,13 +81959,13 @@ SWIGINTERN PyObject *_wrap_IHistogram_array(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_array__SWIG_0(self, args);
+        return _wrap_IHistogram_array__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_array'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_array'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::array(IHistogram::DataType) const\n"
     "    IHistogram::array() const\n");
@@ -83884,7 +81973,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   IHistogram::DataType arg2 ;
@@ -83892,17 +81981,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_getArrayObsolete",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getArrayObsolete" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_getArrayObsolete" "', argument " "2"" of type '" "IHistogram::DataType""'");
   } 
@@ -83915,16 +82002,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_getArrayObsolete",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_getArrayObsolete" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -83942,20 +82028,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_getArrayObsolete", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IHistogram, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_getArrayObsolete__SWIG_1(self, args);
+      return _wrap_IHistogram_getArrayObsolete__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -83969,13 +82051,13 @@ SWIGINTERN PyObject *_wrap_IHistogram_getArrayObsolete(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_getArrayObsolete__SWIG_0(self, args);
+        return _wrap_IHistogram_getArrayObsolete__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_getArrayObsolete'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_getArrayObsolete'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::getArray(IHistogram::DataType) const\n"
     "    IHistogram::getArray() const\n");
@@ -83988,10 +82070,11 @@ SWIGINTERN PyObject *_wrap_IHistogram_reset(PyObject *SWIGUNUSEDPARM(self), PyOb
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_reset",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_reset" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
@@ -84009,11 +82092,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_createHistogram(PyObject *SWIGUNUSEDPARM(s
   OutputData< double > *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_createHistogram",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_createHistogram" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -84029,17 +82113,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_createFrom__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_createFrom__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_createFrom",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_createFrom" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -84058,17 +82141,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_createFrom__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_createFrom__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_createFrom",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_createFrom" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -84092,19 +82174,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_createFrom(PyObject *self, PyObject *args)
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_createFrom", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_createFrom__SWIG_0(self, args);
+      return _wrap_IHistogram_createFrom__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -84112,12 +82190,12 @@ SWIGINTERN PyObject *_wrap_IHistogram_createFrom(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_createFrom__SWIG_1(self, args);
+      return _wrap_IHistogram_createFrom__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_createFrom'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_createFrom'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::createFrom(std::string const &)\n"
     "    IHistogram::createFrom(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n");
@@ -84125,7 +82203,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_createOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_createOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   IHistogram::DataType arg2 ;
@@ -84133,17 +82211,15 @@ SWIGINTERN PyObject *_wrap_IHistogram_createOutputData__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_createOutputData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_createOutputData" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IHistogram_createOutputData" "', argument " "2"" of type '" "IHistogram::DataType""'");
   } 
@@ -84156,16 +82232,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IHistogram_createOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IHistogram_createOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = (IHistogram *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IHistogram_createOutputData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_createOutputData" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
@@ -84183,20 +82258,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_createOutputData(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IHistogram_createOutputData", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IHistogram, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IHistogram_createOutputData__SWIG_1(self, args);
+      return _wrap_IHistogram_createOutputData__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -84210,13 +82281,13 @@ SWIGINTERN PyObject *_wrap_IHistogram_createOutputData(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IHistogram_createOutputData__SWIG_0(self, args);
+        return _wrap_IHistogram_createOutputData__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IHistogram_createOutputData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IHistogram_createOutputData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IHistogram::createOutputData(IHistogram::DataType) const\n"
     "    IHistogram::createOutputData() const\n");
@@ -84232,17 +82303,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_hasSameShape(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_hasSameShape",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_hasSameShape", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_hasSameShape" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram_hasSameShape" "', argument " "2"" of type '" "IHistogram const &""'"); 
   }
@@ -84266,17 +82336,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_hasSameDimensions(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_hasSameDimensions",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_hasSameDimensions", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_hasSameDimensions" "', argument " "1"" of type '" "IHistogram const *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram_hasSameDimensions" "', argument " "2"" of type '" "IHistogram const &""'"); 
   }
@@ -84300,17 +82369,16 @@ SWIGINTERN PyObject *_wrap_IHistogram___iadd__(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram___iadd__" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram___iadd__" "', argument " "2"" of type '" "IHistogram const &""'"); 
   }
@@ -84334,17 +82402,16 @@ SWIGINTERN PyObject *_wrap_IHistogram_relativeDifferenceHistogram(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_relativeDifferenceHistogram",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_relativeDifferenceHistogram", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_relativeDifferenceHistogram" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram_relativeDifferenceHistogram" "', argument " "2"" of type '" "IHistogram const &""'"); 
   }
@@ -84367,18 +82434,17 @@ SWIGINTERN PyObject *_wrap_IHistogram_save(PyObject *SWIGUNUSEDPARM(self), PyObj
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_save",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_save", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_save" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram_save" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -84404,18 +82470,17 @@ SWIGINTERN PyObject *_wrap_IHistogram_load(PyObject *SWIGUNUSEDPARM(self), PyObj
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IHistogram_load",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IHistogram_load", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IHistogram, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IHistogram_load" "', argument " "1"" of type '" "IHistogram *""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IHistogram_load" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -84436,12 +82501,12 @@ fail:
 
 SWIGINTERN PyObject *IHistogram_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IHistogram, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   double arg2 ;
@@ -84452,23 +82517,20 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Histogram1D",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Histogram1D" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Histogram1D" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Histogram1D" "', argument " "3"" of type '" "double""'");
   } 
@@ -84481,26 +82543,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Histogram1D",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Histogram1D" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Histogram1D" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -84519,16 +82579,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IAxis *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Histogram1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAxis,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Histogram1D" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
@@ -84544,16 +82603,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Histogram1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Histogram1D" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -84574,27 +82632,23 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Histogram1D", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Histogram1D__SWIG_2(self, args);
+      return _wrap_new_Histogram1D__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Histogram1D__SWIG_3(self, args);
+      return _wrap_new_Histogram1D__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -84607,7 +82661,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Histogram1D__SWIG_1(self, args);
+        return _wrap_new_Histogram1D__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -84628,14 +82682,14 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_Histogram1D__SWIG_0(self, args);
+          return _wrap_new_Histogram1D__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Histogram1D'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Histogram1D'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram1D::Histogram1D(int,double,double)\n"
     "    Histogram1D::Histogram1D(int,std::vector< double,std::allocator< double > > const &)\n"
@@ -84650,11 +82704,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_clone" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84672,11 +82727,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getRank(PyObject *SWIGUNUSEDPARM(self), P
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getRank",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getRank" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84689,7 +82745,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   double arg2 ;
@@ -84700,23 +82756,20 @@ SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Histogram1D_fill",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_fill" "', argument " "1"" of type '" "Histogram1D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram1D_fill" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram1D_fill" "', argument " "3"" of type '" "double""'");
   } 
@@ -84729,7 +82782,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   double arg2 ;
@@ -84737,17 +82790,15 @@ SWIGINTERN PyObject *_wrap_Histogram1D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Histogram1D_fill",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_fill" "', argument " "1"" of type '" "Histogram1D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram1D_fill" "', argument " "2"" of type '" "double""'");
   } 
@@ -84765,13 +82816,9 @@ SWIGINTERN PyObject *_wrap_Histogram1D_fill(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Histogram1D_fill", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -84783,7 +82830,7 @@ SWIGINTERN PyObject *_wrap_Histogram1D_fill(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_Histogram1D_fill__SWIG_1(self, args);
+        return _wrap_Histogram1D_fill__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -84803,14 +82850,14 @@ SWIGINTERN PyObject *_wrap_Histogram1D_fill(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Histogram1D_fill__SWIG_0(self, args);
+          return _wrap_Histogram1D_fill__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Histogram1D_fill'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Histogram1D_fill'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram1D::fill(double,double)\n"
     "    Histogram1D::fill(double)\n");
@@ -84823,11 +82870,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinCenters(PyObject *SWIGUNUSEDPARM(se
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinCenters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinCenters" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84845,11 +82893,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinValues(PyObject *SWIGUNUSEDPARM(sel
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinValues",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinValues" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84867,11 +82916,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinErrors(PyObject *SWIGUNUSEDPARM(sel
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinErrors",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinErrors" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84889,11 +82939,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinCentersNumpy(PyObject *SWIGUNUSEDPA
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinCentersNumpy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinCentersNumpy" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84911,11 +82962,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinValuesNumpy(PyObject *SWIGUNUSEDPAR
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinValuesNumpy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinValuesNumpy" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84933,11 +82985,12 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinErrorsNumpy(PyObject *SWIGUNUSEDPAR
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram1D_getBinErrorsNumpy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_getBinErrorsNumpy" "', argument " "1"" of type '" "Histogram1D const *""'"); 
   }
@@ -84961,23 +83014,21 @@ SWIGINTERN PyObject *_wrap_Histogram1D_crop(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Histogram1D_crop",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Histogram1D_crop", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram1D_crop" "', argument " "1"" of type '" "Histogram1D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram1D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram1D_crop" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram1D_crop" "', argument " "3"" of type '" "double""'");
   } 
@@ -84995,10 +83046,11 @@ SWIGINTERN PyObject *_wrap_delete_Histogram1D(PyObject *SWIGUNUSEDPARM(self), Py
   Histogram1D *arg1 = (Histogram1D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Histogram1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram1D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram1D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Histogram1D" "', argument " "1"" of type '" "Histogram1D *""'"); 
   }
@@ -85013,12 +83065,16 @@ fail:
 
 SWIGINTERN PyObject *Histogram1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Histogram1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Histogram1D_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   double arg2 ;
@@ -85038,41 +83094,35 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   int ecode5 = 0 ;
   double val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_Histogram2D",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Histogram2D" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Histogram2D" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Histogram2D" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Histogram2D" "', argument " "4"" of type '" "int""'");
   } 
   arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_Histogram2D" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_Histogram2D" "', argument " "6"" of type '" "double""'");
   } 
@@ -85085,7 +83135,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
@@ -85097,21 +83147,17 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   int val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_Histogram2D",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Histogram2D" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Histogram2D" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -85120,14 +83166,14 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Histogram2D" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_Histogram2D" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -85148,7 +83194,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IAxis *arg1 = 0 ;
   IAxis *arg2 = 0 ;
@@ -85156,12 +83202,10 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Histogram2D",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAxis,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Histogram2D" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
@@ -85169,7 +83213,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_2(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Histogram2D" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
   arg1 = reinterpret_cast< IAxis * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Histogram2D" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -85185,16 +83229,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Histogram2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Histogram2D" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -85210,16 +83253,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > arg1 ;
-  PyObject * obj0 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Histogram2D",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    int res = swig::asptr(obj0, &ptr);
+    int res = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Histogram2D" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >""'"); 
     }
@@ -85239,19 +83281,15 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) {
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Histogram2D", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Histogram2D__SWIG_3(self, args);
+      return _wrap_new_Histogram2D__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -85259,18 +83297,18 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Histogram2D__SWIG_4(self, args);
+      return _wrap_new_Histogram2D__SWIG_4(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Histogram2D__SWIG_2(self, args);
+        return _wrap_new_Histogram2D__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -85292,7 +83330,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) {
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_new_Histogram2D__SWIG_1(self, args);
+            return _wrap_new_Histogram2D__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -85330,7 +83368,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) {
                 _v = SWIG_CheckState(res);
               }
               if (_v) {
-                return _wrap_new_Histogram2D__SWIG_0(self, args);
+                return _wrap_new_Histogram2D__SWIG_0(self, argc, argv);
               }
             }
           }
@@ -85340,7 +83378,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Histogram2D'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Histogram2D'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram2D::Histogram2D(int,double,double,int,double,double)\n"
     "    Histogram2D::Histogram2D(int,std::vector< double,std::allocator< double > > const &,int,std::vector< double,std::allocator< double > > const &)\n"
@@ -85356,11 +83394,12 @@ SWIGINTERN PyObject *_wrap_Histogram2D_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_clone" "', argument " "1"" of type '" "Histogram2D const *""'"); 
   }
@@ -85378,11 +83417,12 @@ SWIGINTERN PyObject *_wrap_Histogram2D_getRank(PyObject *SWIGUNUSEDPARM(self), P
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram2D_getRank",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_getRank" "', argument " "1"" of type '" "Histogram2D const *""'"); 
   }
@@ -85395,7 +83435,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85409,29 +83449,25 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Histogram2D_fill",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_fill" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_fill" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram2D_fill" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Histogram2D_fill" "', argument " "4"" of type '" "double""'");
   } 
@@ -85444,7 +83480,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85455,23 +83491,20 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Histogram2D_fill",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_fill" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_fill" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram2D_fill" "', argument " "3"" of type '" "double""'");
   } 
@@ -85489,13 +83522,9 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Histogram2D_fill", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -85512,7 +83541,7 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Histogram2D_fill__SWIG_1(self, args);
+          return _wrap_Histogram2D_fill__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -85538,7 +83567,7 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_Histogram2D_fill__SWIG_0(self, args);
+            return _wrap_Histogram2D_fill__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -85546,7 +83575,7 @@ SWIGINTERN PyObject *_wrap_Histogram2D_fill(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Histogram2D_fill'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Histogram2D_fill'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram2D::fill(double,double,double)\n"
     "    Histogram2D::fill(double,double)\n");
@@ -85554,16 +83583,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram2D_projectionX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionX" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
@@ -85576,7 +83604,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85584,17 +83612,15 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Histogram2D_projectionX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionX" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_projectionX" "', argument " "2"" of type '" "double""'");
   } 
@@ -85607,7 +83633,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85618,23 +83644,20 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionX__SWIG_2(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Histogram2D_projectionX",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionX" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_projectionX" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram2D_projectionX" "', argument " "3"" of type '" "double""'");
   } 
@@ -85652,20 +83675,16 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionX(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Histogram2D_projectionX", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Histogram2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Histogram2D_projectionX__SWIG_0(self, args);
+      return _wrap_Histogram2D_projectionX__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -85679,7 +83698,7 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionX(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_Histogram2D_projectionX__SWIG_1(self, args);
+        return _wrap_Histogram2D_projectionX__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -85699,14 +83718,14 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionX(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Histogram2D_projectionX__SWIG_2(self, args);
+          return _wrap_Histogram2D_projectionX__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Histogram2D_projectionX'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Histogram2D_projectionX'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram2D::projectionX()\n"
     "    Histogram2D::projectionX(double)\n"
@@ -85715,16 +83734,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Histogram2D_projectionY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionY" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
@@ -85737,7 +83755,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85745,17 +83763,15 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Histogram2D_projectionY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionY" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_projectionY" "', argument " "2"" of type '" "double""'");
   } 
@@ -85768,7 +83784,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   double arg2 ;
@@ -85779,23 +83795,20 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionY__SWIG_2(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Histogram1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Histogram2D_projectionY",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_projectionY" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_projectionY" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram2D_projectionY" "', argument " "3"" of type '" "double""'");
   } 
@@ -85813,20 +83826,16 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionY(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Histogram2D_projectionY", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Histogram2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Histogram2D_projectionY__SWIG_0(self, args);
+      return _wrap_Histogram2D_projectionY__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -85840,7 +83849,7 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionY(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_Histogram2D_projectionY__SWIG_1(self, args);
+        return _wrap_Histogram2D_projectionY__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -85860,14 +83869,14 @@ SWIGINTERN PyObject *_wrap_Histogram2D_projectionY(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Histogram2D_projectionY__SWIG_2(self, args);
+          return _wrap_Histogram2D_projectionY__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Histogram2D_projectionY'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Histogram2D_projectionY'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Histogram2D::projectionY()\n"
     "    Histogram2D::projectionY(double)\n"
@@ -85893,35 +83902,31 @@ SWIGINTERN PyObject *_wrap_Histogram2D_crop(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
+  PyObject *swig_obj[5] ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Histogram2D_crop",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Histogram2D_crop", 5, 5, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_crop" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Histogram2D_crop" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Histogram2D_crop" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Histogram2D_crop" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Histogram2D_crop" "', argument " "5"" of type '" "double""'");
   } 
@@ -85941,18 +83946,17 @@ SWIGINTERN PyObject *_wrap_Histogram2D_setContent(PyObject *SWIGUNUSEDPARM(self)
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Histogram2D_setContent",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Histogram2D_setContent", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_setContent" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Histogram2D_setContent" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -85978,18 +83982,17 @@ SWIGINTERN PyObject *_wrap_Histogram2D_addContent(PyObject *SWIGUNUSEDPARM(self)
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Histogram2D_addContent",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Histogram2D_addContent", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Histogram2D_addContent" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Histogram2D_addContent" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -86013,10 +84016,11 @@ SWIGINTERN PyObject *_wrap_delete_Histogram2D(PyObject *SWIGUNUSEDPARM(self), Py
   Histogram2D *arg1 = (Histogram2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Histogram2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Histogram2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Histogram2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Histogram2D" "', argument " "1"" of type '" "Histogram2D *""'"); 
   }
@@ -86031,11 +84035,15 @@ fail:
 
 SWIGINTERN PyObject *Histogram2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Histogram2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Histogram2D_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_AxisInfo_m_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AxisInfo *arg1 = (AxisInfo *) 0 ;
@@ -86043,18 +84051,17 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_name_set(PyObject *SWIGUNUSEDPARM(self), P
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AxisInfo_m_name_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AxisInfo_m_name_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_name_set" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
   arg1 = reinterpret_cast< AxisInfo * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AxisInfo_m_name_set" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -86078,11 +84085,12 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_name_get(PyObject *SWIGUNUSEDPARM(self), P
   AxisInfo *arg1 = (AxisInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AxisInfo_m_name_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_name_get" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
@@ -86103,16 +84111,15 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_min_set(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AxisInfo_m_min_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AxisInfo_m_min_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_min_set" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
   arg1 = reinterpret_cast< AxisInfo * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AxisInfo_m_min_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -86130,11 +84137,12 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_min_get(PyObject *SWIGUNUSEDPARM(self), Py
   AxisInfo *arg1 = (AxisInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AxisInfo_m_min_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_min_get" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
@@ -86155,16 +84163,15 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_max_set(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AxisInfo_m_max_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AxisInfo_m_max_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_max_set" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
   arg1 = reinterpret_cast< AxisInfo * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AxisInfo_m_max_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -86182,11 +84189,12 @@ SWIGINTERN PyObject *_wrap_AxisInfo_m_max_get(PyObject *SWIGUNUSEDPARM(self), Py
   AxisInfo *arg1 = (AxisInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AxisInfo_m_max_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AxisInfo_m_max_get" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
@@ -86203,7 +84211,7 @@ SWIGINTERN PyObject *_wrap_new_AxisInfo(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   AxisInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_AxisInfo")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_AxisInfo", 0, 0, 0)) SWIG_fail;
   result = (AxisInfo *)new AxisInfo();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AxisInfo, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -86217,10 +84225,11 @@ SWIGINTERN PyObject *_wrap_delete_AxisInfo(PyObject *SWIGUNUSEDPARM(self), PyObj
   AxisInfo *arg1 = (AxisInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_AxisInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxisInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxisInfo, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AxisInfo" "', argument " "1"" of type '" "AxisInfo *""'"); 
   }
@@ -86235,16 +84244,20 @@ fail:
 
 SWIGINTERN PyObject *AxisInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AxisInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AxisInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   SimulationResult *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SimulationResult")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (SimulationResult *)new SimulationResult();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SimulationResult, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -86253,7 +84266,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = 0 ;
   IUnitConverter *arg2 = 0 ;
@@ -86261,12 +84274,10 @@ SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_SimulationResult",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SimulationResult" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -86274,7 +84285,7 @@ SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_1(PyObject *SWIGUNUSEDPARM
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SimulationResult" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IUnitConverter,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IUnitConverter,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SimulationResult" "', argument " "2"" of type '" "IUnitConverter const &""'"); 
   }
@@ -86290,16 +84301,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SimulationResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SimulationResult" "', argument " "1"" of type '" "SimulationResult const &""'"); 
   }
@@ -86315,16 +84325,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SimulationResult *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SimulationResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SimulationResult,  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SimulationResult,  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SimulationResult" "', argument " "1"" of type '" "SimulationResult &&""'"); 
   }
@@ -86345,48 +84354,44 @@ SWIGINTERN PyObject *_wrap_new_SimulationResult(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_SimulationResult", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_SimulationResult__SWIG_0(self, args);
+    return _wrap_new_SimulationResult__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_SimulationResult, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_SimulationResult, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_SimulationResult__SWIG_2(self, args);
+      return _wrap_new_SimulationResult__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_SimulationResult__SWIG_3(self, args);
+      return _wrap_new_SimulationResult__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IUnitConverter, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IUnitConverter, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_SimulationResult__SWIG_1(self, args);
+        return _wrap_new_SimulationResult__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_SimulationResult'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_SimulationResult'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationResult::SimulationResult()\n"
     "    SimulationResult::SimulationResult(OutputData< double > const &,IUnitConverter const &)\n"
@@ -86396,7 +84401,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   AxesUnits arg2 ;
@@ -86404,17 +84409,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d__SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult_histogram2d",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_histogram2d" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_histogram2d" "', argument " "2"" of type '" "AxesUnits""'");
   } 
@@ -86427,16 +84430,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Histogram2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_histogram2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_histogram2d" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86454,20 +84456,16 @@ SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_histogram2d", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SimulationResult_histogram2d__SWIG_1(self, args);
+      return _wrap_SimulationResult_histogram2d__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -86481,13 +84479,13 @@ SWIGINTERN PyObject *_wrap_SimulationResult_histogram2d(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationResult_histogram2d__SWIG_0(self, args);
+        return _wrap_SimulationResult_histogram2d__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationResult_histogram2d'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_histogram2d'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationResult::histogram2d(AxesUnits) const\n"
     "    SimulationResult::histogram2d() const\n");
@@ -86495,7 +84493,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   AxesUnits arg2 ;
@@ -86503,17 +84501,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo__SWIG_0(PyObject *SWIGUNUSE
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< AxisInfo,std::allocator< AxisInfo > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult_axisInfo",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axisInfo" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axisInfo" "', argument " "2"" of type '" "AxesUnits""'");
   } 
@@ -86526,16 +84522,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< AxisInfo,std::allocator< AxisInfo > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_axisInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axisInfo" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86553,20 +84548,16 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo(PyObject *self, PyObject *a
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_axisInfo", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SimulationResult_axisInfo__SWIG_1(self, args);
+      return _wrap_SimulationResult_axisInfo__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -86580,13 +84571,13 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axisInfo(PyObject *self, PyObject *a
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationResult_axisInfo__SWIG_0(self, args);
+        return _wrap_SimulationResult_axisInfo__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationResult_axisInfo'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_axisInfo'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationResult::axisInfo(AxesUnits) const\n"
     "    SimulationResult::axisInfo() const\n");
@@ -86599,11 +84590,12 @@ SWIGINTERN PyObject *_wrap_SimulationResult_converter(PyObject *SWIGUNUSEDPARM(s
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IUnitConverter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_converter",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_converter" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86621,11 +84613,12 @@ SWIGINTERN PyObject *_wrap_SimulationResult_size(PyObject *SWIGUNUSEDPARM(self),
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_size" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86638,7 +84631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_array__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_array__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   AxesUnits arg2 ;
@@ -86646,17 +84639,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_array__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult_array",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_array" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_array" "', argument " "2"" of type '" "AxesUnits""'");
   } 
@@ -86669,16 +84660,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_array__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_array__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_array",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_array" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86696,20 +84686,16 @@ SWIGINTERN PyObject *_wrap_SimulationResult_array(PyObject *self, PyObject *args
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_array", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SimulationResult_array__SWIG_1(self, args);
+      return _wrap_SimulationResult_array__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -86723,13 +84709,13 @@ SWIGINTERN PyObject *_wrap_SimulationResult_array(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationResult_array__SWIG_0(self, args);
+        return _wrap_SimulationResult_array__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationResult_array'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_array'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationResult::array(AxesUnits) const\n"
     "    SimulationResult::array() const\n");
@@ -86737,7 +84723,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   AxesUnits arg2 ;
@@ -86745,17 +84731,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult_axis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "AxesUnits""'");
   } 
@@ -86768,16 +84752,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationResult_axis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
@@ -86790,7 +84773,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   size_t arg2 ;
@@ -86801,23 +84784,20 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_2(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SimulationResult_axis",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationResult_axis" "', argument " "3"" of type '" "AxesUnits""'");
   } 
@@ -86830,7 +84810,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   size_t arg2 ;
@@ -86838,17 +84818,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_3(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult_axis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -86866,20 +84844,16 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_axis", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SimulationResult_axis__SWIG_1(self, args);
+      return _wrap_SimulationResult_axis__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -86893,7 +84867,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationResult_axis__SWIG_0(self, args);
+        return _wrap_SimulationResult_axis__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -86908,7 +84882,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SimulationResult_axis__SWIG_3(self, args);
+        return _wrap_SimulationResult_axis__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -86928,14 +84902,14 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_SimulationResult_axis__SWIG_2(self, args);
+          return _wrap_SimulationResult_axis__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationResult_axis'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_axis'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SimulationResult::axis(AxesUnits) const\n"
     "    SimulationResult::axis() const\n"
@@ -86953,17 +84927,16 @@ SWIGINTERN PyObject *_wrap_SimulationResult___getitem__(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationResult___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationResult___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult___getitem__" "', argument " "1"" of type '" "SimulationResult *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult___getitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -86987,23 +84960,21 @@ SWIGINTERN PyObject *_wrap_SimulationResult___setitem__(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SimulationResult___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationResult___setitem__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult___setitem__" "', argument " "1"" of type '" "SimulationResult *""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult___setitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationResult___setitem__" "', argument " "3"" of type '" "double""'");
   } 
@@ -87021,10 +84992,11 @@ SWIGINTERN PyObject *_wrap_delete_SimulationResult(PyObject *SWIGUNUSEDPARM(self
   SimulationResult *arg1 = (SimulationResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SimulationResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationResult, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SimulationResult" "', argument " "1"" of type '" "SimulationResult *""'"); 
   }
@@ -87039,20 +85011,25 @@ fail:
 
 SWIGINTERN PyObject *SimulationResult_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SimulationResult, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SimulationResult_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IBackground *arg1 = (IBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IBackground",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IBackground, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IBackground, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IBackground" "', argument " "1"" of type '" "IBackground *""'"); 
   }
@@ -87070,11 +85047,12 @@ SWIGINTERN PyObject *_wrap_IBackground_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   IBackground *arg1 = (IBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IBackground_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IBackground, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IBackground_clone" "', argument " "1"" of type '" "IBackground const *""'"); 
   }
@@ -87095,17 +85073,16 @@ SWIGINTERN PyObject *_wrap_IBackground_addBackGround(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IBackground_addBackGround",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IBackground, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IBackground_addBackGround", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IBackground_addBackGround" "', argument " "1"" of type '" "IBackground const *""'"); 
   }
   arg1 = reinterpret_cast< IBackground * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IBackground_addBackGround" "', argument " "2"" of type '" "double""'");
   } 
@@ -87120,7 +85097,7 @@ fail:
 
 SWIGINTERN PyObject *IBackground_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IBackground, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -87130,11 +85107,12 @@ SWIGINTERN PyObject *_wrap_new_ConstantBackground(PyObject *SWIGUNUSEDPARM(self)
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ConstantBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ConstantBackground",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_ConstantBackground" "', argument " "1"" of type '" "double""'");
   } 
@@ -87152,10 +85130,11 @@ SWIGINTERN PyObject *_wrap_delete_ConstantBackground(PyObject *SWIGUNUSEDPARM(se
   ConstantBackground *arg1 = (ConstantBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstantBackground",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstantBackground, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstantBackground, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstantBackground" "', argument " "1"" of type '" "ConstantBackground *""'"); 
   }
@@ -87173,11 +85152,12 @@ SWIGINTERN PyObject *_wrap_ConstantBackground_clone(PyObject *SWIGUNUSEDPARM(sel
   ConstantBackground *arg1 = (ConstantBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ConstantBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ConstantBackground_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantBackground_clone" "', argument " "1"" of type '" "ConstantBackground const *""'"); 
   }
@@ -87195,11 +85175,12 @@ SWIGINTERN PyObject *_wrap_ConstantBackground_backgroundValue(PyObject *SWIGUNUS
   ConstantBackground *arg1 = (ConstantBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ConstantBackground_backgroundValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantBackground_backgroundValue" "', argument " "1"" of type '" "ConstantBackground const *""'"); 
   }
@@ -87220,16 +85201,15 @@ SWIGINTERN PyObject *_wrap_ConstantBackground_accept(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ConstantBackground_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ConstantBackground_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantBackground_accept" "', argument " "1"" of type '" "ConstantBackground const *""'"); 
   }
   arg1 = reinterpret_cast< ConstantBackground * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConstantBackground_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -87250,17 +85230,16 @@ SWIGINTERN PyObject *_wrap_ConstantBackground_addBackGround(PyObject *SWIGUNUSED
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ConstantBackground_addBackGround",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ConstantBackground_addBackGround", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ConstantBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantBackground_addBackGround" "', argument " "1"" of type '" "ConstantBackground const *""'"); 
   }
   arg1 = reinterpret_cast< ConstantBackground * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ConstantBackground_addBackGround" "', argument " "2"" of type '" "double""'");
   } 
@@ -87275,21 +85254,26 @@ fail:
 
 SWIGINTERN PyObject *ConstantBackground_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ConstantBackground, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ConstantBackground_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_IDetector_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_clone" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87307,10 +85291,11 @@ SWIGINTERN PyObject *_wrap_delete_IDetector(PyObject *SWIGUNUSEDPARM(self), PyOb
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IDetector" "', argument " "1"" of type '" "IDetector *""'"); 
   }
@@ -87331,16 +85316,15 @@ SWIGINTERN PyObject *_wrap_IDetector_init(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_init",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_init", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_init" "', argument " "1"" of type '" "IDetector *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Beam,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Beam,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_init" "', argument " "2"" of type '" "Beam const &""'"); 
   }
@@ -87361,10 +85345,11 @@ SWIGINTERN PyObject *_wrap_IDetector_clear(PyObject *SWIGUNUSEDPARM(self), PyObj
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_clear" "', argument " "1"" of type '" "IDetector *""'"); 
   }
@@ -87385,16 +85370,15 @@ SWIGINTERN PyObject *_wrap_IDetector_addAxis(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_addAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_addAxis", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_addAxis" "', argument " "1"" of type '" "IDetector *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_addAxis" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -87418,17 +85402,16 @@ SWIGINTERN PyObject *_wrap_IDetector_getAxis(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_getAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_getAxis", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_getAxis" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDetector_getAxis" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -87446,11 +85429,12 @@ SWIGINTERN PyObject *_wrap_IDetector_dimension(PyObject *SWIGUNUSEDPARM(self), P
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_dimension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_dimension" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87474,23 +85458,21 @@ SWIGINTERN PyObject *_wrap_IDetector_axisBinIndex(PyObject *SWIGUNUSEDPARM(self)
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDetector_axisBinIndex",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_axisBinIndex", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_axisBinIndex" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDetector_axisBinIndex" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector_axisBinIndex" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -87508,11 +85490,12 @@ SWIGINTERN PyObject *_wrap_IDetector_totalSize(PyObject *SWIGUNUSEDPARM(self), P
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_totalSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_totalSize" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87530,11 +85513,12 @@ SWIGINTERN PyObject *_wrap_IDetector_detectorMask(PyObject *SWIGUNUSEDPARM(self)
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DetectorMask *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_detectorMask",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_detectorMask" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87561,19 +85545,16 @@ SWIGINTERN PyObject *_wrap_IDetector_setAnalyzerProperties(PyObject *SWIGUNUSEDP
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IDetector_setAnalyzerProperties",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_setAnalyzerProperties", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_setAnalyzerProperties" "', argument " "1"" of type '" "IDetector *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_setAnalyzerProperties" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -87585,12 +85566,12 @@ SWIGINTERN PyObject *_wrap_IDetector_setAnalyzerProperties(PyObject *SWIGUNUSEDP
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector_setAnalyzerProperties" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IDetector_setAnalyzerProperties" "', argument " "4"" of type '" "double""'");
   } 
@@ -87611,16 +85592,15 @@ SWIGINTERN PyObject *_wrap_IDetector_setDetectorResolution(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_setDetectorResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_setDetectorResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_setDetectorResolution" "', argument " "1"" of type '" "IDetector *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDetectorResolution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetectorResolution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_setDetectorResolution" "', argument " "2"" of type '" "IDetectorResolution const &""'"); 
   }
@@ -87644,16 +85624,15 @@ SWIGINTERN PyObject *_wrap_IDetector_setResolutionFunction(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_setResolutionFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_setResolutionFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_setResolutionFunction" "', argument " "1"" of type '" "IDetector *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_setResolutionFunction" "', argument " "2"" of type '" "IResolutionFunction2D const &""'"); 
   }
@@ -87677,16 +85656,15 @@ SWIGINTERN PyObject *_wrap_IDetector_applyDetectorResolution(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_applyDetectorResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_applyDetectorResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_applyDetectorResolution" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_applyDetectorResolution" "', argument " "2"" of type '" "OutputData< double > *""'"); 
   }
@@ -87704,10 +85682,11 @@ SWIGINTERN PyObject *_wrap_IDetector_removeDetectorResolution(PyObject *SWIGUNUS
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_removeDetectorResolution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_removeDetectorResolution" "', argument " "1"" of type '" "IDetector *""'"); 
   }
@@ -87725,11 +85704,12 @@ SWIGINTERN PyObject *_wrap_IDetector_detectorResolution(PyObject *SWIGUNUSEDPARM
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IDetectorResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_detectorResolution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_detectorResolution" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87747,11 +85727,12 @@ SWIGINTERN PyObject *_wrap_IDetector_regionOfInterest(PyObject *SWIGUNUSEDPARM(s
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RegionOfInterest *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_regionOfInterest",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_regionOfInterest" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87769,10 +85750,11 @@ SWIGINTERN PyObject *_wrap_IDetector_resetRegionOfInterest(PyObject *SWIGUNUSEDP
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_resetRegionOfInterest",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_resetRegionOfInterest" "', argument " "1"" of type '" "IDetector *""'"); 
   }
@@ -87790,11 +85772,12 @@ SWIGINTERN PyObject *_wrap_IDetector_detectionProperties(PyObject *SWIGUNUSEDPAR
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DetectionProperties *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_detectionProperties",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_detectionProperties" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87815,17 +85798,16 @@ SWIGINTERN PyObject *_wrap_IDetector_createDetectorIntensity(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_createDetectorIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector_createDetectorIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_createDetectorIntensity" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_createDetectorIntensity" "', argument " "2"" of type '" "std::vector< SimulationElement,std::allocator< SimulationElement > > const &""'"); 
   }
@@ -87846,11 +85828,12 @@ SWIGINTERN PyObject *_wrap_IDetector_defaultAxesUnits(PyObject *SWIGUNUSEDPARM(s
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AxesUnits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_defaultAxesUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_defaultAxesUnits" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87868,11 +85851,12 @@ SWIGINTERN PyObject *_wrap_IDetector_numberOfSimulationElements(PyObject *SWIGUN
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_numberOfSimulationElements",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_numberOfSimulationElements" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87890,11 +85874,12 @@ SWIGINTERN PyObject *_wrap_IDetector_getChildren(PyObject *SWIGUNUSEDPARM(self),
   IDetector *arg1 = (IDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_getChildren" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
@@ -87907,7 +85892,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDetector *arg1 = (IDetector *) 0 ;
   std::function< void (IDetector::const_iterator) > arg2 ;
@@ -87918,18 +85903,15 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDetector_iterate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_iterate" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_iterate" "', argument " "2"" of type '" "std::function< void (IDetector::const_iterator) >""'"); 
     }  
@@ -87941,7 +85923,7 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_0(PyObject *SWIGUNUSEDPARM(se
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector_iterate" "', argument " "3"" of type '" "bool""'");
   } 
@@ -87954,7 +85936,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDetector *arg1 = (IDetector *) 0 ;
   std::function< void (IDetector::const_iterator) > arg2 ;
@@ -87962,17 +85944,15 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector_iterate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_iterate" "', argument " "1"" of type '" "IDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector_iterate" "', argument " "2"" of type '" "std::function< void (IDetector::const_iterator) >""'"); 
     }  
@@ -87997,23 +85977,19 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IDetector_iterate", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IDetector, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IDetector_iterate__SWIG_1(self, args);
+        return _wrap_IDetector_iterate__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -88023,7 +85999,7 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IDetector, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -88031,14 +86007,14 @@ SWIGINTERN PyObject *_wrap_IDetector_iterate(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IDetector_iterate__SWIG_0(self, args);
+          return _wrap_IDetector_iterate__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IDetector_iterate'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IDetector_iterate'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IDetector::iterate(std::function< void (IDetector::const_iterator) >,bool) const\n"
     "    IDetector::iterate(std::function< void (IDetector::const_iterator) >) const\n");
@@ -88048,7 +86024,7 @@ fail:
 
 SWIGINTERN PyObject *IDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IDetector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -88058,11 +86034,12 @@ SWIGINTERN PyObject *_wrap_IDetector2D_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IDetector2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_clone" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
@@ -88080,10 +86057,11 @@ SWIGINTERN PyObject *_wrap_delete_IDetector2D(PyObject *SWIGUNUSEDPARM(self), Py
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IDetector2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IDetector2D" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
@@ -88119,46 +86097,40 @@ SWIGINTERN PyObject *_wrap_IDetector2D_setDetectorParameters(PyObject *SWIGUNUSE
   int ecode6 = 0 ;
   double val7 ;
   int ecode7 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
+  PyObject *swig_obj[7] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:IDetector2D_setDetectorParameters",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector2D_setDetectorParameters", 7, 7, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_setDetectorParameters" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDetector2D_setDetectorParameters" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector2D_setDetectorParameters" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IDetector2D_setDetectorParameters" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_size_t(obj4, &val5);
+  ecode5 = SWIG_AsVal_size_t(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "IDetector2D_setDetectorParameters" "', argument " "5"" of type '" "size_t""'");
   } 
   arg5 = static_cast< size_t >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "IDetector2D_setDetectorParameters" "', argument " "6"" of type '" "double""'");
   } 
   arg6 = static_cast< double >(val6);
-  ecode7 = SWIG_AsVal_double(obj6, &val7);
+  ecode7 = SWIG_AsVal_double(swig_obj[6], &val7);
   if (!SWIG_IsOK(ecode7)) {
     SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "IDetector2D_setDetectorParameters" "', argument " "7"" of type '" "double""'");
   } 
@@ -88182,17 +86154,15 @@ SWIGINTERN PyObject *_wrap_IDetector2D_setDetectorAxes(PyObject *SWIGUNUSEDPARM(
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDetector2D_setDetectorAxes",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector2D_setDetectorAxes", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_setDetectorAxes" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector2D_setDetectorAxes" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -88200,7 +86170,7 @@ SWIGINTERN PyObject *_wrap_IDetector2D_setDetectorAxes(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IDetector2D_setDetectorAxes" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
   arg2 = reinterpret_cast< IAxis * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IAxis,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IDetector2D_setDetectorAxes" "', argument " "3"" of type '" "IAxis const &""'"); 
   }
@@ -88221,10 +86191,11 @@ SWIGINTERN PyObject *_wrap_IDetector2D_removeMasks(PyObject *SWIGUNUSEDPARM(self
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_removeMasks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_removeMasks" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
@@ -88242,11 +86213,12 @@ SWIGINTERN PyObject *_wrap_IDetector2D_detectorMask(PyObject *SWIGUNUSEDPARM(sel
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DetectorMask *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_detectorMask",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_detectorMask" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
@@ -88259,7 +86231,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   IShape2D *arg2 = 0 ;
@@ -88270,17 +86242,14 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IDetector2D_addMask",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_addMask" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
@@ -88288,7 +86257,7 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_0(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IDetector2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
   arg2 = reinterpret_cast< IShape2D * >(argp2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector2D_addMask" "', argument " "3"" of type '" "bool""'");
   } 
@@ -88301,7 +86270,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   IShape2D *arg2 = 0 ;
@@ -88309,16 +86278,14 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask__SWIG_1(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector2D_addMask",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_addMask" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IShape2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector2D_addMask" "', argument " "2"" of type '" "IShape2D const &""'"); 
   }
@@ -88339,23 +86306,19 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IDetector2D_addMask", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IDetector2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IDetector2D_addMask__SWIG_1(self, args);
+        return _wrap_IDetector2D_addMask__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -88365,7 +86328,7 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IDetector2D, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IShape2D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -88373,14 +86336,14 @@ SWIGINTERN PyObject *_wrap_IDetector2D_addMask(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IDetector2D_addMask__SWIG_0(self, args);
+          return _wrap_IDetector2D_addMask__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IDetector2D_addMask'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IDetector2D_addMask'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IDetector2D::addMask(IShape2D const &,bool)\n"
     "    IDetector2D::addMask(IShape2D const &)\n");
@@ -88393,10 +86356,11 @@ SWIGINTERN PyObject *_wrap_IDetector2D_maskAll(PyObject *SWIGUNUSEDPARM(self), P
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_maskAll",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_maskAll" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
@@ -88414,11 +86378,12 @@ SWIGINTERN PyObject *_wrap_IDetector2D_regionOfInterest(PyObject *SWIGUNUSEDPARM
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RegionOfInterest *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_regionOfInterest",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_regionOfInterest" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
@@ -88448,34 +86413,30 @@ SWIGINTERN PyObject *_wrap_IDetector2D_setRegionOfInterest(PyObject *SWIGUNUSEDP
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
+  PyObject *swig_obj[5] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:IDetector2D_setRegionOfInterest",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector2D_setRegionOfInterest", 5, 5, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_setRegionOfInterest" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDetector2D_setRegionOfInterest" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IDetector2D_setRegionOfInterest" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IDetector2D_setRegionOfInterest" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "IDetector2D_setRegionOfInterest" "', argument " "5"" of type '" "double""'");
   } 
@@ -88493,10 +86454,11 @@ SWIGINTERN PyObject *_wrap_IDetector2D_resetRegionOfInterest(PyObject *SWIGUNUSE
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_resetRegionOfInterest",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_resetRegionOfInterest" "', argument " "1"" of type '" "IDetector2D *""'"); 
   }
@@ -88514,11 +86476,12 @@ SWIGINTERN PyObject *_wrap_IDetector2D_active_indices(PyObject *SWIGUNUSEDPARM(s
   IDetector2D *arg1 = (IDetector2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< size_t,std::allocator< size_t > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_active_indices",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_active_indices" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
@@ -88539,17 +86502,16 @@ SWIGINTERN PyObject *_wrap_IDetector2D_createPixel(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector2D_createPixel",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector2D_createPixel", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_createPixel" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IDetector2D_createPixel" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -88570,17 +86532,16 @@ SWIGINTERN PyObject *_wrap_IDetector2D_getIndexOfSpecular(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetector2D_getIndexOfSpecular",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetector2D_getIndexOfSpecular", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_getIndexOfSpecular" "', argument " "1"" of type '" "IDetector2D const *""'"); 
   }
   arg1 = reinterpret_cast< IDetector2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Beam,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Beam,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetector2D_getIndexOfSpecular" "', argument " "2"" of type '" "Beam const &""'"); 
   }
@@ -88598,7 +86559,7 @@ fail:
 
 SWIGINTERN PyObject *IDetector2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IDetector2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -88608,10 +86569,11 @@ SWIGINTERN PyObject *_wrap_delete_IDetectorResolution(PyObject *SWIGUNUSEDPARM(s
   IDetectorResolution *arg1 = (IDetectorResolution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IDetectorResolution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetectorResolution, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetectorResolution, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IDetectorResolution" "', argument " "1"" of type '" "IDetectorResolution *""'"); 
   }
@@ -88632,16 +86594,15 @@ SWIGINTERN PyObject *_wrap_IDetectorResolution_applyDetectorResolution(PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IDetectorResolution_applyDetectorResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetectorResolution, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IDetectorResolution_applyDetectorResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetectorResolution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetectorResolution_applyDetectorResolution" "', argument " "1"" of type '" "IDetectorResolution const *""'"); 
   }
   arg1 = reinterpret_cast< IDetectorResolution * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IDetectorResolution_applyDetectorResolution" "', argument " "2"" of type '" "OutputData< double > *""'"); 
   }
@@ -88659,11 +86620,12 @@ SWIGINTERN PyObject *_wrap_IDetectorResolution_clone(PyObject *SWIGUNUSEDPARM(se
   IDetectorResolution *arg1 = (IDetectorResolution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IDetectorResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IDetectorResolution_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetectorResolution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetectorResolution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetectorResolution_clone" "', argument " "1"" of type '" "IDetectorResolution const *""'"); 
   }
@@ -88678,19 +86640,18 @@ fail:
 
 SWIGINTERN PyObject *IDetectorResolution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IDetectorResolution, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_IInterferenceFunction__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IInterferenceFunction__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IInterferenceFunction",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (IInterferenceFunction *)new SwigDirector_IInterferenceFunction(arg1); 
@@ -88706,19 +86667,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IInterferenceFunction__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IInterferenceFunction__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IInterferenceFunction *arg2 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IInterferenceFunction",&obj0,&obj1)) SWIG_fail;
-  arg1 = obj0;
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  arg1 = swig_obj[0];
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_IInterferenceFunction" "', argument " "2"" of type '" "IInterferenceFunction const &""'"); 
   }
@@ -88746,34 +86705,30 @@ SWIGINTERN PyObject *_wrap_new_IInterferenceFunction(PyObject *self, PyObject *a
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_IInterferenceFunction", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      return _wrap_new_IInterferenceFunction__SWIG_0(self, args);
+      return _wrap_new_IInterferenceFunction__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IInterferenceFunction, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IInterferenceFunction, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_IInterferenceFunction__SWIG_1(self, args);
+        return _wrap_new_IInterferenceFunction__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_IInterferenceFunction'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_IInterferenceFunction'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IInterferenceFunction::IInterferenceFunction()\n"
     "    IInterferenceFunction::IInterferenceFunction(PyObject *,IInterferenceFunction const &)\n");
@@ -88786,10 +86741,11 @@ SWIGINTERN PyObject *_wrap_delete_IInterferenceFunction(PyObject *SWIGUNUSEDPARM
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IInterferenceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IInterferenceFunction" "', argument " "1"" of type '" "IInterferenceFunction *""'"); 
   }
@@ -88807,19 +86763,20 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_clone(PyObject *SWIGUNUSEDPARM(
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IInterferenceFunction_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_clone" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IInterferenceFunction::clone");
@@ -88853,24 +86810,23 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_accept(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IInterferenceFunction_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IInterferenceFunction_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_accept" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IInterferenceFunction_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
   arg2 = reinterpret_cast< INodeVisitor * >(argp2);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       Swig::DirectorPureVirtualException::raise("IInterferenceFunction::accept");
@@ -88887,7 +86843,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   kvector_t arg2 ;
@@ -88898,21 +86854,18 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_0(PyObject *SWIG
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IInterferenceFunction_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_evaluate" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IInterferenceFunction_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -88924,13 +86877,13 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_0(PyObject *SWIG
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IInterferenceFunction_evaluate" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IInterferenceFunction const *)arg1)->IInterferenceFunction::evaluate(arg2,arg3);
@@ -88947,7 +86900,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   kvector_t arg2 ;
@@ -88955,20 +86908,18 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_1(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IInterferenceFunction_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_evaluate" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IInterferenceFunction_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -88981,7 +86932,7 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate__SWIG_1(PyObject *SWIG
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IInterferenceFunction const *)arg1)->IInterferenceFunction::evaluate(arg2);
@@ -89003,23 +86954,19 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate(PyObject *self, PyObje
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IInterferenceFunction_evaluate", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IInterferenceFunction, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IInterferenceFunction_evaluate__SWIG_1(self, args);
+        return _wrap_IInterferenceFunction_evaluate__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -89029,7 +86976,7 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate(PyObject *self, PyObje
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IInterferenceFunction, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -89037,14 +86984,14 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_evaluate(PyObject *self, PyObje
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IInterferenceFunction_evaluate__SWIG_0(self, args);
+          return _wrap_IInterferenceFunction_evaluate__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IInterferenceFunction_evaluate'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IInterferenceFunction_evaluate'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IInterferenceFunction::evaluate(kvector_t const,double) const\n"
     "    IInterferenceFunction::evaluate(kvector_t const) const\n");
@@ -89060,16 +87007,15 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_setPositionVariance(PyObject *S
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IInterferenceFunction_setPositionVariance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IInterferenceFunction_setPositionVariance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_setPositionVariance" "', argument " "1"" of type '" "IInterferenceFunction *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IInterferenceFunction_setPositionVariance" "', argument " "2"" of type '" "double""'");
   } 
@@ -89087,11 +87033,12 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_positionVariance(PyObject *SWIG
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IInterferenceFunction_positionVariance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_positionVariance" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
@@ -89109,19 +87056,20 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_getParticleDensity(PyObject *SW
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IInterferenceFunction_getParticleDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_getParticleDensity" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)((IInterferenceFunction const *)arg1)->IInterferenceFunction::getParticleDensity();
@@ -89143,19 +87091,20 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_supportsMultilayer(PyObject *SW
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   bool upcall = false;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IInterferenceFunction_supportsMultilayer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_supportsMultilayer" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (bool)((IInterferenceFunction const *)arg1)->IInterferenceFunction::supportsMultilayer();
@@ -89180,18 +87129,17 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_DWfactor(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IInterferenceFunction_DWfactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IInterferenceFunction_DWfactor", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_DWfactor" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IInterferenceFunction_DWfactor" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -89219,21 +87167,20 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_iff_without_dw(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   SwigDirector_IInterferenceFunction *darg = 0;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IInterferenceFunction_iff_without_dw",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IInterferenceFunction_iff_without_dw", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IInterferenceFunction_iff_without_dw" "', argument " "1"" of type '" "IInterferenceFunction const *""'"); 
   }
   arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IInterferenceFunction_iff_without_dw" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -89250,7 +87197,7 @@ SWIGINTERN PyObject *_wrap_IInterferenceFunction_iff_without_dw(PyObject *SWIGUN
     SWIG_SetErrorMsg(PyExc_RuntimeError,"accessing protected member iff_without_dw");
     SWIG_fail;
   }
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     darg = dynamic_cast<SwigDirector_IInterferenceFunction *>(arg1);
     if (upcall) {
@@ -89273,10 +87220,11 @@ SWIGINTERN PyObject *_wrap_disown_IInterferenceFunction(PyObject *SWIGUNUSEDPARM
   IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_IInterferenceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_IInterferenceFunction" "', argument " "1"" of type '" "IInterferenceFunction *""'"); 
   }
@@ -89295,20 +87243,25 @@ fail:
 
 SWIGINTERN PyObject *IInterferenceFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IInterferenceFunction, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IInterferenceFunction_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_ILayout(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ILayout",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ILayout" "', argument " "1"" of type '" "ILayout *""'"); 
   }
@@ -89326,11 +87279,12 @@ SWIGINTERN PyObject *_wrap_ILayout_clone(PyObject *SWIGUNUSEDPARM(self), PyObjec
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ILayout *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_clone" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89351,16 +87305,15 @@ SWIGINTERN PyObject *_wrap_ILayout_accept(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ILayout_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ILayout_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_accept" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
   arg1 = reinterpret_cast< ILayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ILayout_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -89378,11 +87331,12 @@ SWIGINTERN PyObject *_wrap_ILayout_particles(PyObject *SWIGUNUSEDPARM(self), PyO
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< SafePointerVector< IParticle > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_particles",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_particles" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89400,12 +87354,13 @@ SWIGINTERN PyObject *_wrap_ILayout_interferenceFunction(PyObject *SWIGUNUSEDPARM
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_interferenceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_interferenceFunction" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89429,11 +87384,12 @@ SWIGINTERN PyObject *_wrap_ILayout_getTotalAbundance(PyObject *SWIGUNUSEDPARM(se
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_getTotalAbundance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_getTotalAbundance" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89451,11 +87407,12 @@ SWIGINTERN PyObject *_wrap_ILayout_totalParticleSurfaceDensity(PyObject *SWIGUNU
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_totalParticleSurfaceDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_totalParticleSurfaceDensity" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89476,16 +87433,15 @@ SWIGINTERN PyObject *_wrap_ILayout_setTotalParticleSurfaceDensity(PyObject *SWIG
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ILayout_setTotalParticleSurfaceDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ILayout_setTotalParticleSurfaceDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_setTotalParticleSurfaceDensity" "', argument " "1"" of type '" "ILayout *""'"); 
   }
   arg1 = reinterpret_cast< ILayout * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ILayout_setTotalParticleSurfaceDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -89503,11 +87459,12 @@ SWIGINTERN PyObject *_wrap_ILayout_weight(PyObject *SWIGUNUSEDPARM(self), PyObje
   ILayout *arg1 = (ILayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILayout_weight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_weight" "', argument " "1"" of type '" "ILayout const *""'"); 
   }
@@ -89528,16 +87485,15 @@ SWIGINTERN PyObject *_wrap_ILayout_setWeight(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ILayout_setWeight",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ILayout_setWeight", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILayout_setWeight" "', argument " "1"" of type '" "ILayout *""'"); 
   }
   arg1 = reinterpret_cast< ILayout * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ILayout_setWeight" "', argument " "2"" of type '" "double""'");
   } 
@@ -89552,7 +87508,7 @@ fail:
 
 SWIGINTERN PyObject *ILayout_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ILayout, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -89562,10 +87518,11 @@ SWIGINTERN PyObject *_wrap_delete_IAbstractParticle(PyObject *SWIGUNUSEDPARM(sel
   IAbstractParticle *arg1 = (IAbstractParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IAbstractParticle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IAbstractParticle" "', argument " "1"" of type '" "IAbstractParticle *""'"); 
   }
@@ -89583,11 +87540,12 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_clone(PyObject *SWIGUNUSEDPARM(self
   IAbstractParticle *arg1 = (IAbstractParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAbstractParticle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAbstractParticle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_clone" "', argument " "1"" of type '" "IAbstractParticle const *""'"); 
   }
@@ -89608,16 +87566,15 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAbstractParticle_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAbstractParticle_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_accept" "', argument " "1"" of type '" "IAbstractParticle const *""'"); 
   }
   arg1 = reinterpret_cast< IAbstractParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IAbstractParticle_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -89635,11 +87592,12 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_abundance(PyObject *SWIGUNUSEDPARM(
   IAbstractParticle *arg1 = (IAbstractParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IAbstractParticle_abundance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_abundance" "', argument " "1"" of type '" "IAbstractParticle const *""'"); 
   }
@@ -89660,16 +87618,15 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_setAbundance(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAbstractParticle_setAbundance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAbstractParticle_setAbundance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_setAbundance" "', argument " "1"" of type '" "IAbstractParticle *""'"); 
   }
   arg1 = reinterpret_cast< IAbstractParticle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IAbstractParticle_setAbundance" "', argument " "2"" of type '" "double""'");
   } 
@@ -89690,17 +87647,16 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_translate(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAbstractParticle_translate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAbstractParticle_translate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_translate" "', argument " "1"" of type '" "IAbstractParticle *""'"); 
   }
   arg1 = reinterpret_cast< IAbstractParticle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IAbstractParticle_translate" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -89728,16 +87684,15 @@ SWIGINTERN PyObject *_wrap_IAbstractParticle_rotate(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IAbstractParticle_rotate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IAbstractParticle_rotate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IAbstractParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IAbstractParticle_rotate" "', argument " "1"" of type '" "IAbstractParticle *""'"); 
   }
   arg1 = reinterpret_cast< IAbstractParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IAbstractParticle_rotate" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -89755,31 +87710,29 @@ fail:
 
 SWIGINTERN PyObject *IAbstractParticle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IAbstractParticle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_IParameterReal_clone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParameterReal_clone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParameter< double > *arg1 = (IParameter< double > *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IParameter< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterReal_clone",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_clone" "', argument " "1"" of type '" "IParameter< double > const *""'"); 
   }
   arg1 = reinterpret_cast< IParameter< double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterReal_clone" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -89798,16 +87751,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParameterReal_clone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParameterReal_clone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParameter< double > *arg1 = (IParameter< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IParameter< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterReal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_clone" "', argument " "1"" of type '" "IParameter< double > const *""'"); 
   }
@@ -89825,20 +87777,16 @@ SWIGINTERN PyObject *_wrap_IParameterReal_clone(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IParameterReal_clone", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IParameterT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IParameterReal_clone__SWIG_1(self, args);
+      return _wrap_IParameterReal_clone__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -89850,13 +87798,13 @@ SWIGINTERN PyObject *_wrap_IParameterReal_clone(PyObject *self, PyObject *args)
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IParameterReal_clone__SWIG_0(self, args);
+        return _wrap_IParameterReal_clone__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IParameterReal_clone'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IParameterReal_clone'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParameter< double >::clone(std::string const &) const\n"
     "    IParameter< double >::clone() const\n");
@@ -89869,11 +87817,12 @@ SWIGINTERN PyObject *_wrap_IParameterReal_isNull(PyObject *SWIGUNUSEDPARM(self),
   IParameter< double > *arg1 = (IParameter< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterReal_isNull",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_isNull" "', argument " "1"" of type '" "IParameter< double > const *""'"); 
   }
@@ -89891,11 +87840,12 @@ SWIGINTERN PyObject *_wrap_IParameterReal_getData(PyObject *SWIGUNUSEDPARM(self)
   IParameter< double > *arg1 = (IParameter< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParameterReal_getData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_getData" "', argument " "1"" of type '" "IParameter< double > const *""'"); 
   }
@@ -89916,16 +87866,15 @@ SWIGINTERN PyObject *_wrap_IParameterReal_setData(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterReal_setData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterReal_setData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_setData" "', argument " "1"" of type '" "IParameter< double > *""'"); 
   }
   arg1 = reinterpret_cast< IParameter< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_double,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_double,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterReal_setData" "', argument " "2"" of type '" "double &""'"); 
   }
@@ -89949,17 +87898,16 @@ SWIGINTERN PyObject *_wrap_IParameterReal_hasSameData(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParameterReal_hasSameData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParameterReal_hasSameData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParameterReal_hasSameData" "', argument " "1"" of type '" "IParameter< double > *""'"); 
   }
   arg1 = reinterpret_cast< IParameter< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IParameterT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IParameterT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParameterReal_hasSameData" "', argument " "2"" of type '" "IParameter< double > const &""'"); 
   }
@@ -89980,10 +87928,11 @@ SWIGINTERN PyObject *_wrap_delete_IParameterReal(PyObject *SWIGUNUSEDPARM(self),
   IParameter< double > *arg1 = (IParameter< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IParameterReal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParameterT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParameterT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IParameterReal" "', argument " "1"" of type '" "IParameter< double > *""'"); 
   }
@@ -89998,7 +87947,7 @@ fail:
 
 SWIGINTERN PyObject *IParameterReal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IParameterT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -90011,16 +87960,15 @@ SWIGINTERN PyObject *_wrap_ParticleLimits_m_bottom_set(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLimits_m_bottom_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleLimits_m_bottom_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLimits_m_bottom_set" "', argument " "1"" of type '" "ParticleLimits *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParticleLimits_m_bottom_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -90038,11 +87986,12 @@ SWIGINTERN PyObject *_wrap_ParticleLimits_m_bottom_get(PyObject *SWIGUNUSEDPARM(
   ParticleLimits *arg1 = (ParticleLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLimits_m_bottom_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLimits_m_bottom_get" "', argument " "1"" of type '" "ParticleLimits *""'"); 
   }
@@ -90063,16 +88012,15 @@ SWIGINTERN PyObject *_wrap_ParticleLimits_m_top_set(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLimits_m_top_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleLimits_m_top_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLimits_m_top_set" "', argument " "1"" of type '" "ParticleLimits *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParticleLimits_m_top_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -90090,11 +88038,12 @@ SWIGINTERN PyObject *_wrap_ParticleLimits_m_top_get(PyObject *SWIGUNUSEDPARM(sel
   ParticleLimits *arg1 = (ParticleLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLimits_m_top_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLimits_m_top_get" "', argument " "1"" of type '" "ParticleLimits *""'"); 
   }
@@ -90111,7 +88060,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleLimits(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   ParticleLimits *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParticleLimits")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_ParticleLimits", 0, 0, 0)) SWIG_fail;
   result = (ParticleLimits *)new ParticleLimits();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParticleLimits, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -90125,10 +88074,11 @@ SWIGINTERN PyObject *_wrap_delete_ParticleLimits(PyObject *SWIGUNUSEDPARM(self),
   ParticleLimits *arg1 = (ParticleLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParticleLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLimits, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLimits, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParticleLimits" "', argument " "1"" of type '" "ParticleLimits *""'"); 
   }
@@ -90143,20 +88093,25 @@ fail:
 
 SWIGINTERN PyObject *ParticleLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParticleLimits, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ParticleLimits_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IParticle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IParticle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IParticle" "', argument " "1"" of type '" "IParticle *""'"); 
   }
@@ -90174,11 +88129,12 @@ SWIGINTERN PyObject *_wrap_IParticle_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IParticle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_clone" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90199,16 +88155,15 @@ SWIGINTERN PyObject *_wrap_IParticle_accept(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParticle_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_accept" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -90226,12 +88181,13 @@ SWIGINTERN PyObject *_wrap_IParticle_createFormFactor(PyObject *SWIGUNUSEDPARM(s
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_createFormFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_createFormFactor" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90258,18 +88214,17 @@ SWIGINTERN PyObject *_wrap_IParticle_createSlicedParticle(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SlicedParticle result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_createSlicedParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParticle_createSlicedParticle", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_createSlicedParticle" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_createSlicedParticle" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -90296,11 +88251,12 @@ SWIGINTERN PyObject *_wrap_IParticle_position(PyObject *SWIGUNUSEDPARM(self), Py
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_position",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_position" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90313,7 +88269,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   kvector_t arg2 ;
@@ -90321,17 +88277,15 @@ SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_setPosition",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_setPosition" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_setPosition" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -90351,7 +88305,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   double arg2 ;
@@ -90365,28 +88319,24 @@ SWIGINTERN PyObject *_wrap_IParticle_setPosition__SWIG_1(PyObject *SWIGUNUSEDPAR
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IParticle_setPosition",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_setPosition" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IParticle_setPosition" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParticle_setPosition" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IParticle_setPosition" "', argument " "4"" of type '" "double""'");
   } 
@@ -90404,23 +88354,19 @@ SWIGINTERN PyObject *_wrap_IParticle_setPosition(PyObject *self, PyObject *args)
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IParticle_setPosition", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IParticle, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IParticle_setPosition__SWIG_0(self, args);
+        return _wrap_IParticle_setPosition__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -90445,7 +88391,7 @@ SWIGINTERN PyObject *_wrap_IParticle_setPosition(PyObject *self, PyObject *args)
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_IParticle_setPosition__SWIG_1(self, args);
+            return _wrap_IParticle_setPosition__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -90453,7 +88399,7 @@ SWIGINTERN PyObject *_wrap_IParticle_setPosition(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IParticle_setPosition'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IParticle_setPosition'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParticle::setPosition(kvector_t)\n"
     "    IParticle::setPosition(double,double,double)\n");
@@ -90469,17 +88415,16 @@ SWIGINTERN PyObject *_wrap_IParticle_translate(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_translate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParticle_translate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_translate" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_translate" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -90504,11 +88449,12 @@ SWIGINTERN PyObject *_wrap_IParticle_rotation(PyObject *SWIGUNUSEDPARM(self), Py
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_rotation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_rotation" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90529,16 +88475,15 @@ SWIGINTERN PyObject *_wrap_IParticle_setRotation(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_setRotation",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParticle_setRotation", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_setRotation" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_setRotation" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -90562,16 +88507,15 @@ SWIGINTERN PyObject *_wrap_IParticle_rotate(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_rotate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IParticle_rotate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_rotate" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IParticle_rotate" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -90592,11 +88536,12 @@ SWIGINTERN PyObject *_wrap_IParticle_getChildren(PyObject *SWIGUNUSEDPARM(self),
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_getChildren" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90609,7 +88554,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_registerAbundance__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_registerAbundance__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   bool arg2 ;
@@ -90617,16 +88562,14 @@ SWIGINTERN PyObject *_wrap_IParticle_registerAbundance__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_registerAbundance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_registerAbundance" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IParticle_registerAbundance" "', argument " "2"" of type '" "bool""'");
   } 
@@ -90639,15 +88582,14 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_registerAbundance__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_registerAbundance__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_registerAbundance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_registerAbundance" "', argument " "1"" of type '" "IParticle *""'"); 
   }
@@ -90665,20 +88607,16 @@ SWIGINTERN PyObject *_wrap_IParticle_registerAbundance(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IParticle_registerAbundance", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IParticle, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IParticle_registerAbundance__SWIG_1(self, args);
+      return _wrap_IParticle_registerAbundance__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -90692,13 +88630,13 @@ SWIGINTERN PyObject *_wrap_IParticle_registerAbundance(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IParticle_registerAbundance__SWIG_0(self, args);
+        return _wrap_IParticle_registerAbundance__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IParticle_registerAbundance'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IParticle_registerAbundance'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParticle::registerAbundance(bool)\n"
     "    IParticle::registerAbundance()\n");
@@ -90706,7 +88644,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_registerPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_registerPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   bool arg2 ;
@@ -90714,16 +88652,14 @@ SWIGINTERN PyObject *_wrap_IParticle_registerPosition__SWIG_0(PyObject *SWIGUNUS
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IParticle_registerPosition",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_registerPosition" "', argument " "1"" of type '" "IParticle *""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IParticle_registerPosition" "', argument " "2"" of type '" "bool""'");
   } 
@@ -90736,15 +88672,14 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IParticle_registerPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IParticle_registerPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_registerPosition",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_registerPosition" "', argument " "1"" of type '" "IParticle *""'"); 
   }
@@ -90762,20 +88697,16 @@ SWIGINTERN PyObject *_wrap_IParticle_registerPosition(PyObject *self, PyObject *
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IParticle_registerPosition", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_IParticle, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IParticle_registerPosition__SWIG_1(self, args);
+      return _wrap_IParticle_registerPosition__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -90789,13 +88720,13 @@ SWIGINTERN PyObject *_wrap_IParticle_registerPosition(PyObject *self, PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IParticle_registerPosition__SWIG_0(self, args);
+        return _wrap_IParticle_registerPosition__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IParticle_registerPosition'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IParticle_registerPosition'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IParticle::registerPosition(bool)\n"
     "    IParticle::registerPosition()\n");
@@ -90808,11 +88739,12 @@ SWIGINTERN PyObject *_wrap_IParticle_decompose(PyObject *SWIGUNUSEDPARM(self), P
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< SafePointerVector< IParticle > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_decompose",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_decompose" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90830,11 +88762,12 @@ SWIGINTERN PyObject *_wrap_IParticle_bottomTopZ(PyObject *SWIGUNUSEDPARM(self),
   IParticle *arg1 = (IParticle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IParticle_bottomTopZ",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IParticle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IParticle_bottomTopZ" "', argument " "1"" of type '" "IParticle const *""'"); 
   }
@@ -90849,7 +88782,7 @@ fail:
 
 SWIGINTERN PyObject *IParticle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IParticle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -90859,10 +88792,11 @@ SWIGINTERN PyObject *_wrap_delete_IPeakShape(PyObject *SWIGUNUSEDPARM(self), PyO
   IPeakShape *arg1 = (IPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IPeakShape" "', argument " "1"" of type '" "IPeakShape *""'"); 
   }
@@ -90880,11 +88814,12 @@ SWIGINTERN PyObject *_wrap_IPeakShape_clone(PyObject *SWIGUNUSEDPARM(self), PyOb
   IPeakShape *arg1 = (IPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPeakShape_clone" "', argument " "1"" of type '" "IPeakShape const *""'"); 
   }
@@ -90908,19 +88843,17 @@ SWIGINTERN PyObject *_wrap_IPeakShape_evaluate(PyObject *SWIGUNUSEDPARM(self), P
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPeakShape_evaluate" "', argument " "1"" of type '" "IPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< IPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -90933,7 +88866,7 @@ SWIGINTERN PyObject *_wrap_IPeakShape_evaluate(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "IPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -90958,11 +88891,12 @@ SWIGINTERN PyObject *_wrap_IPeakShape_angularDisorder(PyObject *SWIGUNUSEDPARM(s
   IPeakShape *arg1 = (IPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IPeakShape_angularDisorder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPeakShape_angularDisorder" "', argument " "1"" of type '" "IPeakShape const *""'"); 
   }
@@ -90977,7 +88911,7 @@ fail:
 
 SWIGINTERN PyObject *IPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -90990,17 +88924,16 @@ SWIGINTERN PyObject *_wrap_new_IsotropicGaussPeakShape(PyObject *SWIGUNUSEDPARM(
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IsotropicGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IsotropicGaussPeakShape",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_IsotropicGaussPeakShape", 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 '" "new_IsotropicGaussPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IsotropicGaussPeakShape" "', argument " "2"" of type '" "double""'");
   } 
@@ -91018,10 +88951,11 @@ SWIGINTERN PyObject *_wrap_delete_IsotropicGaussPeakShape(PyObject *SWIGUNUSEDPA
   IsotropicGaussPeakShape *arg1 = (IsotropicGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IsotropicGaussPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IsotropicGaussPeakShape" "', argument " "1"" of type '" "IsotropicGaussPeakShape *""'"); 
   }
@@ -91039,11 +88973,12 @@ SWIGINTERN PyObject *_wrap_IsotropicGaussPeakShape_clone(PyObject *SWIGUNUSEDPAR
   IsotropicGaussPeakShape *arg1 = (IsotropicGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IsotropicGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IsotropicGaussPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicGaussPeakShape_clone" "', argument " "1"" of type '" "IsotropicGaussPeakShape const *""'"); 
   }
@@ -91064,16 +88999,15 @@ SWIGINTERN PyObject *_wrap_IsotropicGaussPeakShape_accept(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IsotropicGaussPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IsotropicGaussPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicGaussPeakShape_accept" "', argument " "1"" of type '" "IsotropicGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< IsotropicGaussPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IsotropicGaussPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -91097,19 +89031,17 @@ SWIGINTERN PyObject *_wrap_IsotropicGaussPeakShape_evaluate(PyObject *SWIGUNUSED
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IsotropicGaussPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IsotropicGaussPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicGaussPeakShape_evaluate" "', argument " "1"" of type '" "IsotropicGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< IsotropicGaussPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IsotropicGaussPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -91122,7 +89054,7 @@ SWIGINTERN PyObject *_wrap_IsotropicGaussPeakShape_evaluate(PyObject *SWIGUNUSED
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "IsotropicGaussPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -91144,11 +89076,15 @@ fail:
 
 SWIGINTERN PyObject *IsotropicGaussPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IsotropicGaussPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IsotropicGaussPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_IsotropicLorentzPeakShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -91157,17 +89093,16 @@ SWIGINTERN PyObject *_wrap_new_IsotropicLorentzPeakShape(PyObject *SWIGUNUSEDPAR
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IsotropicLorentzPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_IsotropicLorentzPeakShape",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_IsotropicLorentzPeakShape", 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 '" "new_IsotropicLorentzPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IsotropicLorentzPeakShape" "', argument " "2"" of type '" "double""'");
   } 
@@ -91185,10 +89120,11 @@ SWIGINTERN PyObject *_wrap_delete_IsotropicLorentzPeakShape(PyObject *SWIGUNUSED
   IsotropicLorentzPeakShape *arg1 = (IsotropicLorentzPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IsotropicLorentzPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IsotropicLorentzPeakShape" "', argument " "1"" of type '" "IsotropicLorentzPeakShape *""'"); 
   }
@@ -91206,11 +89142,12 @@ SWIGINTERN PyObject *_wrap_IsotropicLorentzPeakShape_clone(PyObject *SWIGUNUSEDP
   IsotropicLorentzPeakShape *arg1 = (IsotropicLorentzPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IsotropicLorentzPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IsotropicLorentzPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicLorentzPeakShape_clone" "', argument " "1"" of type '" "IsotropicLorentzPeakShape const *""'"); 
   }
@@ -91231,16 +89168,15 @@ SWIGINTERN PyObject *_wrap_IsotropicLorentzPeakShape_accept(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IsotropicLorentzPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IsotropicLorentzPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicLorentzPeakShape_accept" "', argument " "1"" of type '" "IsotropicLorentzPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< IsotropicLorentzPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IsotropicLorentzPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -91264,19 +89200,17 @@ SWIGINTERN PyObject *_wrap_IsotropicLorentzPeakShape_evaluate(PyObject *SWIGUNUS
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IsotropicLorentzPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IsotropicLorentzPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsotropicLorentzPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsotropicLorentzPeakShape_evaluate" "', argument " "1"" of type '" "IsotropicLorentzPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< IsotropicLorentzPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IsotropicLorentzPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -91289,7 +89223,7 @@ SWIGINTERN PyObject *_wrap_IsotropicLorentzPeakShape_evaluate(PyObject *SWIGUNUS
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "IsotropicLorentzPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -91311,11 +89245,15 @@ fail:
 
 SWIGINTERN PyObject *IsotropicLorentzPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IsotropicLorentzPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IsotropicLorentzPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_GaussFisherPeakShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -91327,23 +89265,21 @@ SWIGINTERN PyObject *_wrap_new_GaussFisherPeakShape(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   GaussFisherPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_GaussFisherPeakShape",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_GaussFisherPeakShape", 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 '" "new_GaussFisherPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GaussFisherPeakShape" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GaussFisherPeakShape" "', argument " "3"" of type '" "double""'");
   } 
@@ -91361,10 +89297,11 @@ SWIGINTERN PyObject *_wrap_delete_GaussFisherPeakShape(PyObject *SWIGUNUSEDPARM(
   GaussFisherPeakShape *arg1 = (GaussFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_GaussFisherPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GaussFisherPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GaussFisherPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GaussFisherPeakShape" "', argument " "1"" of type '" "GaussFisherPeakShape *""'"); 
   }
@@ -91382,11 +89319,12 @@ SWIGINTERN PyObject *_wrap_GaussFisherPeakShape_clone(PyObject *SWIGUNUSEDPARM(s
   GaussFisherPeakShape *arg1 = (GaussFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   GaussFisherPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GaussFisherPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GaussFisherPeakShape_clone" "', argument " "1"" of type '" "GaussFisherPeakShape const *""'"); 
   }
@@ -91407,16 +89345,15 @@ SWIGINTERN PyObject *_wrap_GaussFisherPeakShape_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:GaussFisherPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "GaussFisherPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GaussFisherPeakShape_accept" "', argument " "1"" of type '" "GaussFisherPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< GaussFisherPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GaussFisherPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -91440,19 +89377,17 @@ SWIGINTERN PyObject *_wrap_GaussFisherPeakShape_evaluate(PyObject *SWIGUNUSEDPAR
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:GaussFisherPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "GaussFisherPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GaussFisherPeakShape_evaluate" "', argument " "1"" of type '" "GaussFisherPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< GaussFisherPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GaussFisherPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -91465,7 +89400,7 @@ SWIGINTERN PyObject *_wrap_GaussFisherPeakShape_evaluate(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "GaussFisherPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -91490,11 +89425,12 @@ SWIGINTERN PyObject *_wrap_GaussFisherPeakShape_angularDisorder(PyObject *SWIGUN
   GaussFisherPeakShape *arg1 = (GaussFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:GaussFisherPeakShape_angularDisorder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GaussFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GaussFisherPeakShape_angularDisorder" "', argument " "1"" of type '" "GaussFisherPeakShape const *""'"); 
   }
@@ -91509,11 +89445,15 @@ fail:
 
 SWIGINTERN PyObject *GaussFisherPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_GaussFisherPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *GaussFisherPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_LorentzFisherPeakShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -91525,23 +89465,21 @@ SWIGINTERN PyObject *_wrap_new_LorentzFisherPeakShape(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   LorentzFisherPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_LorentzFisherPeakShape",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_LorentzFisherPeakShape", 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 '" "new_LorentzFisherPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_LorentzFisherPeakShape" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_LorentzFisherPeakShape" "', argument " "3"" of type '" "double""'");
   } 
@@ -91559,10 +89497,11 @@ SWIGINTERN PyObject *_wrap_delete_LorentzFisherPeakShape(PyObject *SWIGUNUSEDPAR
   LorentzFisherPeakShape *arg1 = (LorentzFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_LorentzFisherPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LorentzFisherPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LorentzFisherPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_LorentzFisherPeakShape" "', argument " "1"" of type '" "LorentzFisherPeakShape *""'"); 
   }
@@ -91580,11 +89519,12 @@ SWIGINTERN PyObject *_wrap_LorentzFisherPeakShape_clone(PyObject *SWIGUNUSEDPARM
   LorentzFisherPeakShape *arg1 = (LorentzFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   LorentzFisherPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LorentzFisherPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LorentzFisherPeakShape_clone" "', argument " "1"" of type '" "LorentzFisherPeakShape const *""'"); 
   }
@@ -91605,16 +89545,15 @@ SWIGINTERN PyObject *_wrap_LorentzFisherPeakShape_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LorentzFisherPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LorentzFisherPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LorentzFisherPeakShape_accept" "', argument " "1"" of type '" "LorentzFisherPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< LorentzFisherPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LorentzFisherPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -91638,19 +89577,17 @@ SWIGINTERN PyObject *_wrap_LorentzFisherPeakShape_evaluate(PyObject *SWIGUNUSEDP
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:LorentzFisherPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LorentzFisherPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LorentzFisherPeakShape_evaluate" "', argument " "1"" of type '" "LorentzFisherPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< LorentzFisherPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LorentzFisherPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -91663,7 +89600,7 @@ SWIGINTERN PyObject *_wrap_LorentzFisherPeakShape_evaluate(PyObject *SWIGUNUSEDP
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "LorentzFisherPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -91688,11 +89625,12 @@ SWIGINTERN PyObject *_wrap_LorentzFisherPeakShape_angularDisorder(PyObject *SWIG
   LorentzFisherPeakShape *arg1 = (LorentzFisherPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LorentzFisherPeakShape_angularDisorder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LorentzFisherPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LorentzFisherPeakShape_angularDisorder" "', argument " "1"" of type '" "LorentzFisherPeakShape const *""'"); 
   }
@@ -91707,11 +89645,15 @@ fail:
 
 SWIGINTERN PyObject *LorentzFisherPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_LorentzFisherPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *LorentzFisherPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_VonMisesFisherGaussPeakShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -91729,26 +89671,22 @@ SWIGINTERN PyObject *_wrap_new_VonMisesFisherGaussPeakShape(PyObject *SWIGUNUSED
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
+  PyObject *swig_obj[5] ;
   VonMisesFisherGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_VonMisesFisherGaussPeakShape",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_VonMisesFisherGaussPeakShape", 5, 5, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_VonMisesFisherGaussPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_VonMisesFisherGaussPeakShape" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "new_VonMisesFisherGaussPeakShape" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -91760,12 +89698,12 @@ SWIGINTERN PyObject *_wrap_new_VonMisesFisherGaussPeakShape(PyObject *SWIGUNUSED
       if (SWIG_IsNewObj(res3)) delete temp;
     }
   }
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_VonMisesFisherGaussPeakShape" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_VonMisesFisherGaussPeakShape" "', argument " "5"" of type '" "double""'");
   } 
@@ -91783,10 +89721,11 @@ SWIGINTERN PyObject *_wrap_delete_VonMisesFisherGaussPeakShape(PyObject *SWIGUNU
   VonMisesFisherGaussPeakShape *arg1 = (VonMisesFisherGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VonMisesFisherGaussPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VonMisesFisherGaussPeakShape" "', argument " "1"" of type '" "VonMisesFisherGaussPeakShape *""'"); 
   }
@@ -91804,11 +89743,12 @@ SWIGINTERN PyObject *_wrap_VonMisesFisherGaussPeakShape_clone(PyObject *SWIGUNUS
   VonMisesFisherGaussPeakShape *arg1 = (VonMisesFisherGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VonMisesFisherGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VonMisesFisherGaussPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesFisherGaussPeakShape_clone" "', argument " "1"" of type '" "VonMisesFisherGaussPeakShape const *""'"); 
   }
@@ -91829,16 +89769,15 @@ SWIGINTERN PyObject *_wrap_VonMisesFisherGaussPeakShape_accept(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VonMisesFisherGaussPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VonMisesFisherGaussPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesFisherGaussPeakShape_accept" "', argument " "1"" of type '" "VonMisesFisherGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< VonMisesFisherGaussPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VonMisesFisherGaussPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -91862,19 +89801,17 @@ SWIGINTERN PyObject *_wrap_VonMisesFisherGaussPeakShape_evaluate(PyObject *SWIGU
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VonMisesFisherGaussPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VonMisesFisherGaussPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesFisherGaussPeakShape_evaluate" "', argument " "1"" of type '" "VonMisesFisherGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< VonMisesFisherGaussPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VonMisesFisherGaussPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -91887,7 +89824,7 @@ SWIGINTERN PyObject *_wrap_VonMisesFisherGaussPeakShape_evaluate(PyObject *SWIGU
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "VonMisesFisherGaussPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -91912,11 +89849,12 @@ SWIGINTERN PyObject *_wrap_VonMisesFisherGaussPeakShape_angularDisorder(PyObject
   VonMisesFisherGaussPeakShape *arg1 = (VonMisesFisherGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VonMisesFisherGaussPeakShape_angularDisorder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesFisherGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesFisherGaussPeakShape_angularDisorder" "', argument " "1"" of type '" "VonMisesFisherGaussPeakShape const *""'"); 
   }
@@ -91931,11 +89869,15 @@ fail:
 
 SWIGINTERN PyObject *VonMisesFisherGaussPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VonMisesFisherGaussPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *VonMisesFisherGaussPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_VonMisesGaussPeakShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -91950,25 +89892,22 @@ SWIGINTERN PyObject *_wrap_new_VonMisesGaussPeakShape(PyObject *SWIGUNUSEDPARM(s
   int res3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   VonMisesGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_VonMisesGaussPeakShape",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_VonMisesGaussPeakShape", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_VonMisesGaussPeakShape" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_VonMisesGaussPeakShape" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "new_VonMisesGaussPeakShape" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -91980,7 +89919,7 @@ SWIGINTERN PyObject *_wrap_new_VonMisesGaussPeakShape(PyObject *SWIGUNUSEDPARM(s
       if (SWIG_IsNewObj(res3)) delete temp;
     }
   }
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_VonMisesGaussPeakShape" "', argument " "4"" of type '" "double""'");
   } 
@@ -91998,10 +89937,11 @@ SWIGINTERN PyObject *_wrap_delete_VonMisesGaussPeakShape(PyObject *SWIGUNUSEDPAR
   VonMisesGaussPeakShape *arg1 = (VonMisesGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VonMisesGaussPeakShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VonMisesGaussPeakShape" "', argument " "1"" of type '" "VonMisesGaussPeakShape *""'"); 
   }
@@ -92019,11 +89959,12 @@ SWIGINTERN PyObject *_wrap_VonMisesGaussPeakShape_clone(PyObject *SWIGUNUSEDPARM
   VonMisesGaussPeakShape *arg1 = (VonMisesGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VonMisesGaussPeakShape *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VonMisesGaussPeakShape_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesGaussPeakShape_clone" "', argument " "1"" of type '" "VonMisesGaussPeakShape const *""'"); 
   }
@@ -92044,16 +89985,15 @@ SWIGINTERN PyObject *_wrap_VonMisesGaussPeakShape_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:VonMisesGaussPeakShape_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VonMisesGaussPeakShape_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesGaussPeakShape_accept" "', argument " "1"" of type '" "VonMisesGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< VonMisesGaussPeakShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VonMisesGaussPeakShape_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -92077,19 +90017,17 @@ SWIGINTERN PyObject *_wrap_VonMisesGaussPeakShape_evaluate(PyObject *SWIGUNUSEDP
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VonMisesGaussPeakShape_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "VonMisesGaussPeakShape_evaluate", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesGaussPeakShape_evaluate" "', argument " "1"" of type '" "VonMisesGaussPeakShape const *""'"); 
   }
   arg1 = reinterpret_cast< VonMisesGaussPeakShape * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VonMisesGaussPeakShape_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -92102,7 +90040,7 @@ SWIGINTERN PyObject *_wrap_VonMisesGaussPeakShape_evaluate(PyObject *SWIGUNUSEDP
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "VonMisesGaussPeakShape_evaluate" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -92127,11 +90065,12 @@ SWIGINTERN PyObject *_wrap_VonMisesGaussPeakShape_angularDisorder(PyObject *SWIG
   VonMisesGaussPeakShape *arg1 = (VonMisesGaussPeakShape *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VonMisesGaussPeakShape_angularDisorder",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VonMisesGaussPeakShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VonMisesGaussPeakShape_angularDisorder" "', argument " "1"" of type '" "VonMisesGaussPeakShape const *""'"); 
   }
@@ -92146,20 +90085,25 @@ fail:
 
 SWIGINTERN PyObject *VonMisesGaussPeakShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VonMisesGaussPeakShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *VonMisesGaussPeakShape_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IResolutionFunction2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IResolutionFunction2D *arg1 = (IResolutionFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IResolutionFunction2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IResolutionFunction2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IResolutionFunction2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IResolutionFunction2D" "', argument " "1"" of type '" "IResolutionFunction2D *""'"); 
   }
@@ -92183,23 +90127,21 @@ SWIGINTERN PyObject *_wrap_IResolutionFunction2D_evaluateCDF(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IResolutionFunction2D_evaluateCDF",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IResolutionFunction2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IResolutionFunction2D_evaluateCDF", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IResolutionFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IResolutionFunction2D_evaluateCDF" "', argument " "1"" of type '" "IResolutionFunction2D const *""'"); 
   }
   arg1 = reinterpret_cast< IResolutionFunction2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IResolutionFunction2D_evaluateCDF" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IResolutionFunction2D_evaluateCDF" "', argument " "3"" of type '" "double""'");
   } 
@@ -92217,11 +90159,12 @@ SWIGINTERN PyObject *_wrap_IResolutionFunction2D_clone(PyObject *SWIGUNUSEDPARM(
   IResolutionFunction2D *arg1 = (IResolutionFunction2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IResolutionFunction2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IResolutionFunction2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IResolutionFunction2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IResolutionFunction2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IResolutionFunction2D_clone" "', argument " "1"" of type '" "IResolutionFunction2D const *""'"); 
   }
@@ -92236,7 +90179,7 @@ fail:
 
 SWIGINTERN PyObject *IResolutionFunction2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IResolutionFunction2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -92246,11 +90189,12 @@ SWIGINTERN PyObject *_wrap_IRotation_createRotation(PyObject *SWIGUNUSEDPARM(sel
   Transform3D *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IRotation_createRotation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Transform3D,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Transform3D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_createRotation" "', argument " "1"" of type '" "Transform3D const &""'"); 
   }
@@ -92270,7 +90214,7 @@ SWIGINTERN PyObject *_wrap_IRotation_createIdentity(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":IRotation_createIdentity")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "IRotation_createIdentity", 0, 0, 0)) SWIG_fail;
   result = (IRotation *)IRotation::createIdentity();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IRotation, 0 |  0 );
   return resultobj;
@@ -92284,10 +90228,11 @@ SWIGINTERN PyObject *_wrap_delete_IRotation(PyObject *SWIGUNUSEDPARM(self), PyOb
   IRotation *arg1 = (IRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IRotation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IRotation" "', argument " "1"" of type '" "IRotation *""'"); 
   }
@@ -92305,11 +90250,12 @@ SWIGINTERN PyObject *_wrap_IRotation_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   IRotation *arg1 = (IRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IRotation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_clone" "', argument " "1"" of type '" "IRotation const *""'"); 
   }
@@ -92327,11 +90273,12 @@ SWIGINTERN PyObject *_wrap_IRotation_createInverse(PyObject *SWIGUNUSEDPARM(self
   IRotation *arg1 = (IRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IRotation_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_createInverse" "', argument " "1"" of type '" "IRotation const *""'"); 
   }
@@ -92352,16 +90299,15 @@ SWIGINTERN PyObject *_wrap_IRotation_accept(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IRotation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IRotation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_accept" "', argument " "1"" of type '" "IRotation const *""'"); 
   }
   arg1 = reinterpret_cast< IRotation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IRotation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -92379,11 +90325,12 @@ SWIGINTERN PyObject *_wrap_IRotation_getTransform3D(PyObject *SWIGUNUSEDPARM(sel
   IRotation *arg1 = (IRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IRotation_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_getTransform3D" "', argument " "1"" of type '" "IRotation const *""'"); 
   }
@@ -92401,11 +90348,12 @@ SWIGINTERN PyObject *_wrap_IRotation_isIdentity(PyObject *SWIGUNUSEDPARM(self),
   IRotation *arg1 = (IRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IRotation_isIdentity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IRotation_isIdentity" "', argument " "1"" of type '" "IRotation const *""'"); 
   }
@@ -92420,7 +90368,7 @@ fail:
 
 SWIGINTERN PyObject *IRotation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IRotation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -92433,12 +90381,11 @@ SWIGINTERN PyObject *_wrap_createProduct(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:createProduct",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IRotation,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "createProduct", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "createProduct" "', argument " "1"" of type '" "IRotation const &""'"); 
   }
@@ -92446,7 +90393,7 @@ SWIGINTERN PyObject *_wrap_createProduct(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createProduct" "', argument " "1"" of type '" "IRotation const &""'"); 
   }
   arg1 = reinterpret_cast< IRotation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "createProduct" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -92467,11 +90414,12 @@ SWIGINTERN PyObject *_wrap_IsZRotation(PyObject *SWIGUNUSEDPARM(self), PyObject
   IRotation *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IsZRotation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IRotation,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsZRotation" "', argument " "1"" of type '" "IRotation const &""'"); 
   }
@@ -92491,7 +90439,7 @@ SWIGINTERN PyObject *_wrap_new_IdentityRotation(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   IdentityRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IdentityRotation")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IdentityRotation", 0, 0, 0)) SWIG_fail;
   result = (IdentityRotation *)new IdentityRotation();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IdentityRotation, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -92505,11 +90453,12 @@ SWIGINTERN PyObject *_wrap_IdentityRotation_clone(PyObject *SWIGUNUSEDPARM(self)
   IdentityRotation *arg1 = (IdentityRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IdentityRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IdentityRotation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IdentityRotation_clone" "', argument " "1"" of type '" "IdentityRotation const *""'"); 
   }
@@ -92527,11 +90476,12 @@ SWIGINTERN PyObject *_wrap_IdentityRotation_createInverse(PyObject *SWIGUNUSEDPA
   IdentityRotation *arg1 = (IdentityRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IdentityRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IdentityRotation_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IdentityRotation_createInverse" "', argument " "1"" of type '" "IdentityRotation const *""'"); 
   }
@@ -92552,16 +90502,15 @@ SWIGINTERN PyObject *_wrap_IdentityRotation_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IdentityRotation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IdentityRotation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IdentityRotation_accept" "', argument " "1"" of type '" "IdentityRotation const *""'"); 
   }
   arg1 = reinterpret_cast< IdentityRotation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IdentityRotation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -92579,11 +90528,12 @@ SWIGINTERN PyObject *_wrap_IdentityRotation_getTransform3D(PyObject *SWIGUNUSEDP
   IdentityRotation *arg1 = (IdentityRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IdentityRotation_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IdentityRotation_getTransform3D" "', argument " "1"" of type '" "IdentityRotation const *""'"); 
   }
@@ -92601,11 +90551,12 @@ SWIGINTERN PyObject *_wrap_IdentityRotation_isIdentity(PyObject *SWIGUNUSEDPARM(
   IdentityRotation *arg1 = (IdentityRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IdentityRotation_isIdentity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IdentityRotation_isIdentity" "', argument " "1"" of type '" "IdentityRotation const *""'"); 
   }
@@ -92623,10 +90574,11 @@ SWIGINTERN PyObject *_wrap_delete_IdentityRotation(PyObject *SWIGUNUSEDPARM(self
   IdentityRotation *arg1 = (IdentityRotation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IdentityRotation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IdentityRotation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IdentityRotation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IdentityRotation" "', argument " "1"" of type '" "IdentityRotation *""'"); 
   }
@@ -92641,21 +90593,26 @@ fail:
 
 SWIGINTERN PyObject *IdentityRotation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IdentityRotation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IdentityRotation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_RotationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationX *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_RotationX",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_RotationX" "', argument " "1"" of type '" "double""'");
   } 
@@ -92673,11 +90630,12 @@ SWIGINTERN PyObject *_wrap_RotationX_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   RotationX *arg1 = (RotationX *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationX *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationX_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationX_clone" "', argument " "1"" of type '" "RotationX const *""'"); 
   }
@@ -92695,11 +90653,12 @@ SWIGINTERN PyObject *_wrap_RotationX_createInverse(PyObject *SWIGUNUSEDPARM(self
   RotationX *arg1 = (RotationX *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationX *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationX_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationX_createInverse" "', argument " "1"" of type '" "RotationX const *""'"); 
   }
@@ -92720,16 +90679,15 @@ SWIGINTERN PyObject *_wrap_RotationX_accept(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RotationX_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RotationX_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationX_accept" "', argument " "1"" of type '" "RotationX const *""'"); 
   }
   arg1 = reinterpret_cast< RotationX * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RotationX_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -92747,11 +90705,12 @@ SWIGINTERN PyObject *_wrap_RotationX_getAngle(PyObject *SWIGUNUSEDPARM(self), Py
   RotationX *arg1 = (RotationX *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationX_getAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationX_getAngle" "', argument " "1"" of type '" "RotationX const *""'"); 
   }
@@ -92769,11 +90728,12 @@ SWIGINTERN PyObject *_wrap_RotationX_getTransform3D(PyObject *SWIGUNUSEDPARM(sel
   RotationX *arg1 = (RotationX *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationX_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationX_getTransform3D" "', argument " "1"" of type '" "RotationX const *""'"); 
   }
@@ -92791,10 +90751,11 @@ SWIGINTERN PyObject *_wrap_delete_RotationX(PyObject *SWIGUNUSEDPARM(self), PyOb
   RotationX *arg1 = (RotationX *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RotationX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationX, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationX, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RotationX" "', argument " "1"" of type '" "RotationX *""'"); 
   }
@@ -92809,21 +90770,26 @@ fail:
 
 SWIGINTERN PyObject *RotationX_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RotationX, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RotationX_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_RotationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationY *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_RotationY",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_RotationY" "', argument " "1"" of type '" "double""'");
   } 
@@ -92841,11 +90807,12 @@ SWIGINTERN PyObject *_wrap_RotationY_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   RotationY *arg1 = (RotationY *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationY *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationY_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationY_clone" "', argument " "1"" of type '" "RotationY const *""'"); 
   }
@@ -92863,11 +90830,12 @@ SWIGINTERN PyObject *_wrap_RotationY_createInverse(PyObject *SWIGUNUSEDPARM(self
   RotationY *arg1 = (RotationY *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationY *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationY_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationY_createInverse" "', argument " "1"" of type '" "RotationY const *""'"); 
   }
@@ -92888,16 +90856,15 @@ SWIGINTERN PyObject *_wrap_RotationY_accept(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RotationY_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RotationY_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationY_accept" "', argument " "1"" of type '" "RotationY const *""'"); 
   }
   arg1 = reinterpret_cast< RotationY * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RotationY_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -92915,11 +90882,12 @@ SWIGINTERN PyObject *_wrap_RotationY_getAngle(PyObject *SWIGUNUSEDPARM(self), Py
   RotationY *arg1 = (RotationY *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationY_getAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationY_getAngle" "', argument " "1"" of type '" "RotationY const *""'"); 
   }
@@ -92937,11 +90905,12 @@ SWIGINTERN PyObject *_wrap_RotationY_getTransform3D(PyObject *SWIGUNUSEDPARM(sel
   RotationY *arg1 = (RotationY *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationY_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationY_getTransform3D" "', argument " "1"" of type '" "RotationY const *""'"); 
   }
@@ -92959,10 +90928,11 @@ SWIGINTERN PyObject *_wrap_delete_RotationY(PyObject *SWIGUNUSEDPARM(self), PyOb
   RotationY *arg1 = (RotationY *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RotationY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationY, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationY, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RotationY" "', argument " "1"" of type '" "RotationY *""'"); 
   }
@@ -92977,21 +90947,24 @@ fail:
 
 SWIGINTERN PyObject *RotationY_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RotationY, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RotationY_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   RotationZ *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_RotationZ",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RotationZ" "', argument " "1"" of type '" "double""'");
   } 
@@ -93004,11 +90977,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   RotationZ *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RotationZ")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (RotationZ *)new RotationZ();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RotationZ, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -93022,15 +90995,11 @@ SWIGINTERN PyObject *_wrap_new_RotationZ(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RotationZ", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_RotationZ__SWIG_1(self, args);
+    return _wrap_new_RotationZ__SWIG_1(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -93039,12 +91008,12 @@ SWIGINTERN PyObject *_wrap_new_RotationZ(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_RotationZ__SWIG_0(self, args);
+      return _wrap_new_RotationZ__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RotationZ'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RotationZ'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RotationZ::RotationZ(double)\n"
     "    RotationZ::RotationZ()\n");
@@ -93057,11 +91026,12 @@ SWIGINTERN PyObject *_wrap_RotationZ_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   RotationZ *arg1 = (RotationZ *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationZ *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationZ_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationZ_clone" "', argument " "1"" of type '" "RotationZ const *""'"); 
   }
@@ -93079,11 +91049,12 @@ SWIGINTERN PyObject *_wrap_RotationZ_createInverse(PyObject *SWIGUNUSEDPARM(self
   RotationZ *arg1 = (RotationZ *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationZ *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationZ_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationZ_createInverse" "', argument " "1"" of type '" "RotationZ const *""'"); 
   }
@@ -93104,16 +91075,15 @@ SWIGINTERN PyObject *_wrap_RotationZ_accept(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RotationZ_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RotationZ_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationZ_accept" "', argument " "1"" of type '" "RotationZ const *""'"); 
   }
   arg1 = reinterpret_cast< RotationZ * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RotationZ_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -93131,11 +91101,12 @@ SWIGINTERN PyObject *_wrap_RotationZ_getAngle(PyObject *SWIGUNUSEDPARM(self), Py
   RotationZ *arg1 = (RotationZ *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationZ_getAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationZ_getAngle" "', argument " "1"" of type '" "RotationZ const *""'"); 
   }
@@ -93153,11 +91124,12 @@ SWIGINTERN PyObject *_wrap_RotationZ_getTransform3D(PyObject *SWIGUNUSEDPARM(sel
   RotationZ *arg1 = (RotationZ *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationZ_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationZ_getTransform3D" "', argument " "1"" of type '" "RotationZ const *""'"); 
   }
@@ -93175,10 +91147,11 @@ SWIGINTERN PyObject *_wrap_delete_RotationZ(PyObject *SWIGUNUSEDPARM(self), PyOb
   RotationZ *arg1 = (RotationZ *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RotationZ",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationZ, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationZ, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RotationZ" "', argument " "1"" of type '" "RotationZ *""'"); 
   }
@@ -93193,11 +91166,15 @@ fail:
 
 SWIGINTERN PyObject *RotationZ_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RotationZ, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RotationZ_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_RotationEuler(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -93209,23 +91186,21 @@ SWIGINTERN PyObject *_wrap_new_RotationEuler(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RotationEuler *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RotationEuler",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_RotationEuler", 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 '" "new_RotationEuler" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RotationEuler" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RotationEuler" "', argument " "3"" of type '" "double""'");
   } 
@@ -93243,11 +91218,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_clone(PyObject *SWIGUNUSEDPARM(self), P
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RotationEuler *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_clone" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93265,11 +91241,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_createInverse(PyObject *SWIGUNUSEDPARM(
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IRotation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_createInverse",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_createInverse" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93290,16 +91267,15 @@ SWIGINTERN PyObject *_wrap_RotationEuler_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RotationEuler_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RotationEuler_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_accept" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
   arg1 = reinterpret_cast< RotationEuler * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RotationEuler_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -93317,11 +91293,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_getAlpha(PyObject *SWIGUNUSEDPARM(self)
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_getAlpha",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_getAlpha" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93339,11 +91316,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_getBeta(PyObject *SWIGUNUSEDPARM(self),
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_getBeta",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_getBeta" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93361,11 +91339,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_getGamma(PyObject *SWIGUNUSEDPARM(self)
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_getGamma",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_getGamma" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93383,11 +91362,12 @@ SWIGINTERN PyObject *_wrap_RotationEuler_getTransform3D(PyObject *SWIGUNUSEDPARM
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RotationEuler_getTransform3D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_getTransform3D" "', argument " "1"" of type '" "RotationEuler const *""'"); 
   }
@@ -93405,10 +91385,11 @@ SWIGINTERN PyObject *_wrap_delete_RotationEuler(PyObject *SWIGUNUSEDPARM(self),
   RotationEuler *arg1 = (RotationEuler *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RotationEuler",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RotationEuler, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RotationEuler" "', argument " "1"" of type '" "RotationEuler *""'"); 
   }
@@ -93423,20 +91404,25 @@ fail:
 
 SWIGINTERN PyObject *RotationEuler_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RotationEuler, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RotationEuler_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_ISelectionRule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ISelectionRule *arg1 = (ISelectionRule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ISelectionRule",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISelectionRule, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISelectionRule, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ISelectionRule" "', argument " "1"" of type '" "ISelectionRule *""'"); 
   }
@@ -93454,11 +91440,12 @@ SWIGINTERN PyObject *_wrap_ISelectionRule_clone(PyObject *SWIGUNUSEDPARM(self),
   ISelectionRule *arg1 = (ISelectionRule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ISelectionRule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ISelectionRule_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISelectionRule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISelectionRule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISelectionRule_clone" "', argument " "1"" of type '" "ISelectionRule const *""'"); 
   }
@@ -93479,17 +91466,16 @@ SWIGINTERN PyObject *_wrap_ISelectionRule_coordinateSelected(PyObject *SWIGUNUSE
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ISelectionRule_coordinateSelected",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ISelectionRule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ISelectionRule_coordinateSelected", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISelectionRule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISelectionRule_coordinateSelected" "', argument " "1"" of type '" "ISelectionRule const *""'"); 
   }
   arg1 = reinterpret_cast< ISelectionRule * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_int_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ISelectionRule_coordinateSelected" "', argument " "2"" of type '" "ivector_t const &""'"); 
   }
@@ -93507,7 +91493,7 @@ fail:
 
 SWIGINTERN PyObject *ISelectionRule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ISelectionRule, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93526,29 +91512,26 @@ SWIGINTERN PyObject *_wrap_new_SimpleSelectionRule(PyObject *SWIGUNUSEDPARM(self
   int ecode3 = 0 ;
   int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   SimpleSelectionRule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_SimpleSelectionRule",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_SimpleSelectionRule", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SimpleSelectionRule" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SimpleSelectionRule" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SimpleSelectionRule" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_SimpleSelectionRule" "', argument " "4"" of type '" "int""'");
   } 
@@ -93566,10 +91549,11 @@ SWIGINTERN PyObject *_wrap_delete_SimpleSelectionRule(PyObject *SWIGUNUSEDPARM(s
   SimpleSelectionRule *arg1 = (SimpleSelectionRule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SimpleSelectionRule",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimpleSelectionRule, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimpleSelectionRule, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SimpleSelectionRule" "', argument " "1"" of type '" "SimpleSelectionRule *""'"); 
   }
@@ -93587,11 +91571,12 @@ SWIGINTERN PyObject *_wrap_SimpleSelectionRule_clone(PyObject *SWIGUNUSEDPARM(se
   SimpleSelectionRule *arg1 = (SimpleSelectionRule *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimpleSelectionRule *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimpleSelectionRule_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimpleSelectionRule, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimpleSelectionRule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimpleSelectionRule_clone" "', argument " "1"" of type '" "SimpleSelectionRule const *""'"); 
   }
@@ -93612,17 +91597,16 @@ SWIGINTERN PyObject *_wrap_SimpleSelectionRule_coordinateSelected(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimpleSelectionRule_coordinateSelected",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimpleSelectionRule, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimpleSelectionRule_coordinateSelected", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimpleSelectionRule, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimpleSelectionRule_coordinateSelected" "', argument " "1"" of type '" "SimpleSelectionRule const *""'"); 
   }
   arg1 = reinterpret_cast< SimpleSelectionRule * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_int_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimpleSelectionRule_coordinateSelected" "', argument " "2"" of type '" "ivector_t const &""'"); 
   }
@@ -93640,16 +91624,20 @@ fail:
 
 SWIGINTERN PyObject *SimpleSelectionRule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SimpleSelectionRule, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SimpleSelectionRule_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Instrument *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Instrument")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Instrument *)new Instrument();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Instrument, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -93658,16 +91646,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Instrument *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Instrument *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Instrument",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Instrument,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Instrument,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Instrument" "', argument " "1"" of type '" "Instrument const &""'"); 
   }
@@ -93688,27 +91675,23 @@ SWIGINTERN PyObject *_wrap_new_Instrument(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Instrument", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Instrument__SWIG_0(self, args);
+    return _wrap_new_Instrument__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Instrument, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Instrument, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Instrument__SWIG_1(self, args);
+      return _wrap_new_Instrument__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Instrument'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Instrument'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Instrument::Instrument()\n"
     "    Instrument::Instrument(Instrument const &)\n");
@@ -93721,10 +91704,11 @@ SWIGINTERN PyObject *_wrap_delete_Instrument(PyObject *SWIGUNUSEDPARM(self), PyO
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Instrument",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Instrument" "', argument " "1"" of type '" "Instrument *""'"); 
   }
@@ -93745,16 +91729,15 @@ SWIGINTERN PyObject *_wrap_Instrument_accept(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_accept" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -93767,16 +91750,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Instrument_getBeam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Instrument_getBeam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Beam *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getBeam",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getBeam" "', argument " "1"" of type '" "Instrument *""'"); 
   }
@@ -93789,16 +91771,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Instrument_getBeam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Instrument_getBeam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Beam *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getBeam",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getBeam" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -93816,20 +91797,16 @@ SWIGINTERN PyObject *_wrap_Instrument_getBeam(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Instrument_getBeam", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Instrument_getBeam__SWIG_0(self, args);
+      return _wrap_Instrument_getBeam__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -93838,12 +91815,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getBeam(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Instrument_getBeam__SWIG_1(self, args);
+      return _wrap_Instrument_getBeam__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Instrument_getBeam'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Instrument_getBeam'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Instrument::getBeam()\n"
     "    Instrument::getBeam() const\n");
@@ -93859,16 +91836,15 @@ SWIGINTERN PyObject *_wrap_Instrument_setBeam(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_setBeam",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setBeam", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setBeam" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Beam,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Beam,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setBeam" "', argument " "2"" of type '" "Beam const &""'"); 
   }
@@ -93898,28 +91874,25 @@ SWIGINTERN PyObject *_wrap_Instrument_setBeamParameters(PyObject *SWIGUNUSEDPARM
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Instrument_setBeamParameters",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setBeamParameters", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setBeamParameters" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Instrument_setBeamParameters" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Instrument_setBeamParameters" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Instrument_setBeamParameters" "', argument " "4"" of type '" "double""'");
   } 
@@ -93940,16 +91913,15 @@ SWIGINTERN PyObject *_wrap_Instrument_setBeamIntensity(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_setBeamIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setBeamIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setBeamIntensity" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Instrument_setBeamIntensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -93970,17 +91942,16 @@ SWIGINTERN PyObject *_wrap_Instrument_setBeamPolarization(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_setBeamPolarization",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setBeamPolarization", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setBeamPolarization" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setBeamPolarization" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -94005,11 +91976,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getBeamIntensity(PyObject *SWIGUNUSEDPARM(
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getBeamIntensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getBeamIntensity" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -94022,16 +91994,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetector" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -94044,16 +92015,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetector" "', argument " "1"" of type '" "Instrument *""'"); 
   }
@@ -94071,20 +92041,16 @@ SWIGINTERN PyObject *_wrap_Instrument_getDetector(PyObject *self, PyObject *args
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Instrument_getDetector", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Instrument_getDetector__SWIG_1(self, args);
+      return _wrap_Instrument_getDetector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -94093,12 +92059,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getDetector(PyObject *self, PyObject *args
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Instrument_getDetector__SWIG_0(self, args);
+      return _wrap_Instrument_getDetector__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Instrument_getDetector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Instrument_getDetector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Instrument::getDetector() const\n"
     "    Instrument::getDetector()\n");
@@ -94111,11 +92077,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getDetectorMask(PyObject *SWIGUNUSEDPARM(s
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DetectorMask *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getDetectorMask",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetectorMask" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -94136,17 +92103,16 @@ SWIGINTERN PyObject *_wrap_Instrument_getDetectorAxis(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_getDetectorAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_getDetectorAxis", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetectorAxis" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Instrument_getDetectorAxis" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -94164,11 +92130,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getDetectorDimension(PyObject *SWIGUNUSEDP
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getDetectorDimension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetectorDimension" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -94189,16 +92156,15 @@ SWIGINTERN PyObject *_wrap_Instrument_setDetector(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_setDetector",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setDetector", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setDetector" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDetector,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetector,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setDetector" "', argument " "2"" of type '" "IDetector const &""'"); 
   }
@@ -94222,16 +92188,15 @@ SWIGINTERN PyObject *_wrap_Instrument_setDetectorResolutionFunction(PyObject *SW
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_setDetectorResolutionFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setDetectorResolutionFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setDetectorResolutionFunction" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IResolutionFunction2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setDetectorResolutionFunction" "', argument " "2"" of type '" "IResolutionFunction2D const &""'"); 
   }
@@ -94252,10 +92217,11 @@ SWIGINTERN PyObject *_wrap_Instrument_removeDetectorResolution(PyObject *SWIGUNU
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_removeDetectorResolution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_removeDetectorResolution" "', argument " "1"" of type '" "Instrument *""'"); 
   }
@@ -94282,19 +92248,16 @@ SWIGINTERN PyObject *_wrap_Instrument_setAnalyzerProperties(PyObject *SWIGUNUSED
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Instrument_setAnalyzerProperties",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_setAnalyzerProperties", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setAnalyzerProperties" "', argument " "1"" of type '" "Instrument *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setAnalyzerProperties" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -94306,12 +92269,12 @@ SWIGINTERN PyObject *_wrap_Instrument_setAnalyzerProperties(PyObject *SWIGUNUSED
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Instrument_setAnalyzerProperties" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Instrument_setAnalyzerProperties" "', argument " "4"" of type '" "double""'");
   } 
@@ -94332,16 +92295,15 @@ SWIGINTERN PyObject *_wrap_Instrument_applyDetectorResolution(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_applyDetectorResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_applyDetectorResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_applyDetectorResolution" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_applyDetectorResolution" "', argument " "2"" of type '" "OutputData< double > *""'"); 
   }
@@ -94362,17 +92324,16 @@ SWIGINTERN PyObject *_wrap_Instrument_createDetectorIntensity(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Instrument_createDetectorIntensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Instrument_createDetectorIntensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_createDetectorIntensity" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
   arg1 = reinterpret_cast< Instrument * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_SimulationElement_std__allocatorT_SimulationElement_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_createDetectorIntensity" "', argument " "2"" of type '" "std::vector< SimulationElement,std::allocator< SimulationElement > > const &""'"); 
   }
@@ -94393,10 +92354,11 @@ SWIGINTERN PyObject *_wrap_Instrument_initDetector(PyObject *SWIGUNUSEDPARM(self
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_initDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_initDetector" "', argument " "1"" of type '" "Instrument *""'"); 
   }
@@ -94414,11 +92376,12 @@ SWIGINTERN PyObject *_wrap_Instrument_getChildren(PyObject *SWIGUNUSEDPARM(self)
   Instrument *arg1 = (Instrument *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Instrument_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getChildren" "', argument " "1"" of type '" "Instrument const *""'"); 
   }
@@ -94433,11 +92396,15 @@ fail:
 
 SWIGINTERN PyObject *Instrument_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Instrument, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Instrument_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_RelativeDifference(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SimulationResult *arg1 = 0 ;
@@ -94446,12 +92413,11 @@ SWIGINTERN PyObject *_wrap_RelativeDifference(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RelativeDifference",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "RelativeDifference", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RelativeDifference" "', argument " "1"" of type '" "SimulationResult const &""'"); 
   }
@@ -94459,7 +92425,7 @@ SWIGINTERN PyObject *_wrap_RelativeDifference(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RelativeDifference" "', argument " "1"" of type '" "SimulationResult const &""'"); 
   }
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_SimulationResult,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_SimulationResult,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RelativeDifference" "', argument " "2"" of type '" "SimulationResult const &""'"); 
   }
@@ -94475,7 +92441,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = 0 ;
   OutputData< double > *arg2 = 0 ;
@@ -94483,12 +92449,10 @@ SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:getRelativeDifference",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getRelativeDifference" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94496,7 +92460,7 @@ SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_0(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "getRelativeDifference" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "getRelativeDifference" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94512,7 +92476,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IHistogram *arg1 = 0 ;
   IHistogram *arg2 = 0 ;
@@ -94520,12 +92484,10 @@ SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:getRelativeDifference",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IHistogram,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getRelativeDifference" "', argument " "1"" of type '" "IHistogram const &""'"); 
   }
@@ -94533,7 +92495,7 @@ SWIGINTERN PyObject *_wrap_getRelativeDifference__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "getRelativeDifference" "', argument " "1"" of type '" "IHistogram const &""'"); 
   }
   arg1 = reinterpret_cast< IHistogram * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "getRelativeDifference" "', argument " "2"" of type '" "IHistogram const &""'"); 
   }
@@ -94554,40 +92516,36 @@ SWIGINTERN PyObject *_wrap_getRelativeDifference(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "getRelativeDifference", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_getRelativeDifference__SWIG_0(self, args);
+        return _wrap_getRelativeDifference__SWIG_0(self, argc, argv);
       }
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IHistogram, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IHistogram, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IHistogram, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IHistogram, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_getRelativeDifference__SWIG_1(self, args);
+        return _wrap_getRelativeDifference__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'getRelativeDifference'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'getRelativeDifference'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityDataFunctions::getRelativeDifference(OutputData< double > const &,OutputData< double > const &)\n"
     "    IntensityDataFunctions::getRelativeDifference(IHistogram const &,IHistogram const &)\n");
@@ -94595,7 +92553,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   IAxis *arg2 = 0 ;
@@ -94603,17 +92561,15 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:coordinateToBinf",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "coordinateToBinf" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "coordinateToBinf" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -94629,7 +92585,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   IAxis *arg2 = 0 ;
@@ -94637,17 +92593,15 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:coordinateFromBinf",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "coordinateFromBinf" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "coordinateFromBinf" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -94663,7 +92617,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double *arg1 = 0 ;
   double *arg2 = 0 ;
@@ -94674,12 +92628,9 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:coordinateToBinf",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_double,  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_double,  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "coordinateToBinf" "', argument " "1"" of type '" "double &""'"); 
   }
@@ -94687,7 +92638,7 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "coordinateToBinf" "', argument " "1"" of type '" "double &""'"); 
   }
   arg1 = reinterpret_cast< double * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_double,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_double,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "coordinateToBinf" "', argument " "2"" of type '" "double &""'"); 
   }
@@ -94695,7 +92646,7 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "coordinateToBinf" "', argument " "2"" of type '" "double &""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "coordinateToBinf" "', argument " "3"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94716,13 +92667,9 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "coordinateToBinf", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -94730,34 +92677,34 @@ SWIGINTERN PyObject *_wrap_coordinateToBinf(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_coordinateToBinf__SWIG_0(self, args);
+        return _wrap_coordinateToBinf__SWIG_0(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_double, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_double, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_coordinateToBinf__SWIG_1(self, args);
+          return _wrap_coordinateToBinf__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'coordinateToBinf'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'coordinateToBinf'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityDataFunctions::coordinateToBinf(double,IAxis const &)\n"
     "    IntensityDataFunctions::coordinateToBinf(double &,double &,OutputData< double > const &)\n");
@@ -94765,7 +92712,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double *arg1 = 0 ;
   double *arg2 = 0 ;
@@ -94776,12 +92723,9 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:coordinateFromBinf",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_double,  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_double,  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "coordinateFromBinf" "', argument " "1"" of type '" "double &""'"); 
   }
@@ -94789,7 +92733,7 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "coordinateFromBinf" "', argument " "1"" of type '" "double &""'"); 
   }
   arg1 = reinterpret_cast< double * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_double,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_double,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "coordinateFromBinf" "', argument " "2"" of type '" "double &""'"); 
   }
@@ -94797,7 +92741,7 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf__SWIG_1(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "coordinateFromBinf" "', argument " "2"" of type '" "double &""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "coordinateFromBinf" "', argument " "3"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94818,13 +92762,9 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "coordinateFromBinf", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -94832,34 +92772,34 @@ SWIGINTERN PyObject *_wrap_coordinateFromBinf(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_coordinateFromBinf__SWIG_0(self, args);
+        return _wrap_coordinateFromBinf__SWIG_0(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_double, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_double, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, SWIG_POINTER_NO_NULL);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_coordinateFromBinf__SWIG_1(self, args);
+          return _wrap_coordinateFromBinf__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'coordinateFromBinf'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'coordinateFromBinf'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityDataFunctions::coordinateFromBinf(double,IAxis const &)\n"
     "    IntensityDataFunctions::coordinateFromBinf(double &,double &,OutputData< double > const &)\n");
@@ -94872,11 +92812,12 @@ SWIGINTERN PyObject *_wrap_create2DArrayfromOutputData(PyObject *SWIGUNUSEDPARM(
   OutputData< double > *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:create2DArrayfromOutputData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "create2DArrayfromOutputData" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94896,13 +92837,14 @@ SWIGINTERN PyObject *_wrap_FT2DArray(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FT2DArray",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FT2DArray" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -94921,7 +92863,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ConvertData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ConvertData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = 0 ;
   OutputData< double > *arg2 = 0 ;
@@ -94932,13 +92874,10 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ConvertData",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Simulation,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Simulation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
@@ -94946,7 +92885,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvertData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -94954,7 +92893,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConvertData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
   arg2 = reinterpret_cast< OutputData< double > * >(argp2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ConvertData" "', argument " "3"" of type '" "bool""'");
   } 
@@ -94967,7 +92906,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ConvertData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ConvertData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = 0 ;
   OutputData< double > *arg2 = 0 ;
@@ -94975,12 +92914,10 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ConvertData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Simulation,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Simulation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
@@ -94988,7 +92925,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
   arg1 = reinterpret_cast< Simulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvertData" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -95004,7 +92941,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ConvertData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ConvertData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = 0 ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg2 = 0 ;
@@ -95014,13 +92951,10 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   int res2 = SWIG_OLDOBJ ;
   bool val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ConvertData",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Simulation,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Simulation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
@@ -95030,7 +92964,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvertData" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -95039,7 +92973,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  ecode3 = SWIG_AsVal_bool(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ConvertData" "', argument " "3"" of type '" "bool""'");
   } 
@@ -95054,19 +92988,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ConvertData__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ConvertData__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Simulation *arg1 = 0 ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ConvertData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Simulation,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Simulation,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvertData" "', argument " "1"" of type '" "Simulation const &""'"); 
   }
@@ -95076,7 +93008,7 @@ SWIGINTERN PyObject *_wrap_ConvertData__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< Simulation * >(argp1);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvertData" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -95100,43 +93032,39 @@ SWIGINTERN PyObject *_wrap_ConvertData(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ConvertData", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ConvertData__SWIG_1(self, args);
+        return _wrap_ConvertData__SWIG_1(self, argc, argv);
       }
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = swig::asptr(argv[1], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ConvertData__SWIG_3(self, args);
+        return _wrap_ConvertData__SWIG_3(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -95144,14 +93072,14 @@ SWIGINTERN PyObject *_wrap_ConvertData(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_ConvertData__SWIG_0(self, args);
+          return _wrap_ConvertData__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Simulation, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = swig::asptr(argv[1], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -95162,14 +93090,14 @@ SWIGINTERN PyObject *_wrap_ConvertData(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_ConvertData__SWIG_2(self, args);
+          return _wrap_ConvertData__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ConvertData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ConvertData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IntensityDataFunctions::ConvertData(Simulation const &,OutputData< double > const &,bool)\n"
     "    IntensityDataFunctions::ConvertData(Simulation const &,OutputData< double > const &)\n"
@@ -95183,13 +93111,14 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_readOutputData(PyObject *SWIGU
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityDataIOFactory_readOutputData",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_readOutputData" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -95212,13 +93141,14 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_readReflectometryData(PyObject
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityDataIOFactory_readReflectometryData",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_readReflectometryData" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -95241,13 +93171,14 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_readIntensityData(PyObject *SW
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IHistogram *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityDataIOFactory_readIntensityData",&obj0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_readIntensityData" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -95273,11 +93204,10 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeOutputData(PyObject *SWIG
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityDataIOFactory_writeOutputData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "IntensityDataIOFactory_writeOutputData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_writeOutputData" "', argument " "1"" of type '" "OutputData< double > const &""'"); 
   }
@@ -95287,7 +93217,7 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeOutputData(PyObject *SWIG
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityDataIOFactory_writeOutputData" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -95313,11 +93243,10 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeIntensityData(PyObject *S
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityDataIOFactory_writeIntensityData",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IHistogram,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "IntensityDataIOFactory_writeIntensityData", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IHistogram,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_writeIntensityData" "', argument " "1"" of type '" "IHistogram const &""'"); 
   }
@@ -95327,7 +93256,7 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeIntensityData(PyObject *S
   arg1 = reinterpret_cast< IHistogram * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityDataIOFactory_writeIntensityData" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -95353,11 +93282,10 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeSimulationResult(PyObject
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityDataIOFactory_writeSimulationResult",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "IntensityDataIOFactory_writeSimulationResult", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SimulationResult,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityDataIOFactory_writeSimulationResult" "', argument " "1"" of type '" "SimulationResult const &""'"); 
   }
@@ -95367,7 +93295,7 @@ SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_writeSimulationResult(PyObject
   arg1 = reinterpret_cast< SimulationResult * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityDataIOFactory_writeSimulationResult" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -95390,7 +93318,7 @@ SWIGINTERN PyObject *_wrap_new_IntensityDataIOFactory(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   IntensityDataIOFactory *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityDataIOFactory")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IntensityDataIOFactory", 0, 0, 0)) SWIG_fail;
   result = (IntensityDataIOFactory *)new IntensityDataIOFactory();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IntensityDataIOFactory, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -95404,10 +93332,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityDataIOFactory(PyObject *SWIGUNUSEDPAR
   IntensityDataIOFactory *arg1 = (IntensityDataIOFactory *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityDataIOFactory",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IntensityDataIOFactory, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IntensityDataIOFactory, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityDataIOFactory" "', argument " "1"" of type '" "IntensityDataIOFactory *""'"); 
   }
@@ -95422,11 +93351,15 @@ fail:
 
 SWIGINTERN PyObject *IntensityDataIOFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IntensityDataIOFactory, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IntensityDataIOFactory_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunction1DLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -95435,17 +93368,16 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction1DLattice(PyObject *SWIGUNUSE
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   InterferenceFunction1DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_InterferenceFunction1DLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_InterferenceFunction1DLattice", 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 '" "new_InterferenceFunction1DLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction1DLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -95463,10 +93395,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunction1DLattice(PyObject *SWIGUN
   InterferenceFunction1DLattice *arg1 = (InterferenceFunction1DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunction1DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunction1DLattice" "', argument " "1"" of type '" "InterferenceFunction1DLattice *""'"); 
   }
@@ -95484,11 +93417,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction1DLattice_clone(PyObject *SWIGUNU
   InterferenceFunction1DLattice *arg1 = (InterferenceFunction1DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction1DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction1DLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction1DLattice_clone" "', argument " "1"" of type '" "InterferenceFunction1DLattice const *""'"); 
   }
@@ -95509,16 +93443,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction1DLattice_accept(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction1DLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction1DLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction1DLattice_accept" "', argument " "1"" of type '" "InterferenceFunction1DLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction1DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction1DLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -95539,16 +93472,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction1DLattice_setDecayFunction(PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction1DLattice_setDecayFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction1DLattice_setDecayFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction1DLattice_setDecayFunction" "', argument " "1"" of type '" "InterferenceFunction1DLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction1DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFTDecayFunction1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFTDecayFunction1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction1DLattice_setDecayFunction" "', argument " "2"" of type '" "IFTDecayFunction1D const &""'"); 
   }
@@ -95569,11 +93501,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction1DLattice_getLatticeParameters(Py
   InterferenceFunction1DLattice *arg1 = (InterferenceFunction1DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice1DParameters result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction1DLattice_getLatticeParameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction1DLattice_getLatticeParameters" "', argument " "1"" of type '" "InterferenceFunction1DLattice const *""'"); 
   }
@@ -95591,11 +93524,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction1DLattice_getChildren(PyObject *S
   InterferenceFunction1DLattice *arg1 = (InterferenceFunction1DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction1DLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction1DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction1DLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunction1DLattice const *""'"); 
   }
@@ -95610,21 +93544,24 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunction1DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction1DLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *InterferenceFunction1DLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_InterferenceFunction2DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DLattice" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -95640,7 +93577,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -95654,29 +93591,25 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_1(PyObject *S
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_InterferenceFunction2DLattice",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DLattice" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunction2DLattice" "', argument " "4"" of type '" "double""'");
   } 
@@ -95689,7 +93622,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -95700,23 +93633,20 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice__SWIG_2(PyObject *S
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunction2DLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DLattice" "', argument " "3"" of type '" "double""'");
   } 
@@ -95734,19 +93664,15 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice(PyObject *self, PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_InterferenceFunction2DLattice", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_InterferenceFunction2DLattice__SWIG_0(self, args);
+      return _wrap_new_InterferenceFunction2DLattice__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 3) {
@@ -95766,7 +93692,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_InterferenceFunction2DLattice__SWIG_2(self, args);
+          return _wrap_new_InterferenceFunction2DLattice__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -95793,7 +93719,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice(PyObject *self, PyO
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_InterferenceFunction2DLattice__SWIG_1(self, args);
+            return _wrap_new_InterferenceFunction2DLattice__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -95801,7 +93727,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DLattice::InterferenceFunction2DLattice(Lattice2D const &)\n"
     "    InterferenceFunction2DLattice::InterferenceFunction2DLattice(double,double,double,double)\n"
@@ -95815,10 +93741,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunction2DLattice(PyObject *SWIGUN
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunction2DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunction2DLattice" "', argument " "1"" of type '" "InterferenceFunction2DLattice *""'"); 
   }
@@ -95836,11 +93763,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_clone(PyObject *SWIGUNU
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_clone" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -95861,16 +93789,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_accept(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_accept" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -95883,7 +93810,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -95891,17 +93818,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare__SWIG_0(Py
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DLattice_createSquare",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DLattice_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DLattice_createSquare" "', argument " "2"" of type '" "double""'");
   } 
@@ -95914,16 +93839,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_createSquare",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DLattice_createSquare" "', argument " "1"" of type '" "double""'");
   } 
@@ -95941,13 +93865,9 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare(PyObject *
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "InterferenceFunction2DLattice_createSquare", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -95955,7 +93875,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare(PyObject *
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_InterferenceFunction2DLattice_createSquare__SWIG_1(self, args);
+      return _wrap_InterferenceFunction2DLattice_createSquare__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -95970,13 +93890,13 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare(PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_InterferenceFunction2DLattice_createSquare__SWIG_0(self, args);
+        return _wrap_InterferenceFunction2DLattice_createSquare__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InterferenceFunction2DLattice_createSquare'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'InterferenceFunction2DLattice_createSquare'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DLattice::createSquare(double,double)\n"
     "    InterferenceFunction2DLattice::createSquare(double)\n");
@@ -95984,7 +93904,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -95992,17 +93912,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_0
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DLattice_createHexagonal",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DLattice_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DLattice_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
@@ -96015,16 +93933,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_createHexagonal",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DLattice_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
@@ -96042,13 +93959,9 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal(PyObjec
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "InterferenceFunction2DLattice_createHexagonal", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -96056,7 +93969,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal(PyObjec
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_1(self, args);
+      return _wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -96071,13 +93984,13 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal(PyObjec
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_0(self, args);
+        return _wrap_InterferenceFunction2DLattice_createHexagonal__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InterferenceFunction2DLattice_createHexagonal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'InterferenceFunction2DLattice_createHexagonal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DLattice::createHexagonal(double,double)\n"
     "    InterferenceFunction2DLattice::createHexagonal(double)\n");
@@ -96093,16 +94006,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_setDecayFunction(PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DLattice_setDecayFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DLattice_setDecayFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_setDecayFunction" "', argument " "1"" of type '" "InterferenceFunction2DLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFTDecayFunction2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFTDecayFunction2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DLattice_setDecayFunction" "', argument " "2"" of type '" "IFTDecayFunction2D const &""'"); 
   }
@@ -96126,16 +94038,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_setIntegrationOverXi(Py
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DLattice_setIntegrationOverXi",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DLattice_setIntegrationOverXi", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_setIntegrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DLattice * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DLattice_setIntegrationOverXi" "', argument " "2"" of type '" "bool""'");
   } 
@@ -96153,11 +94064,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_integrationOverXi(PyObj
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_integrationOverXi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_integrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -96175,11 +94087,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_lattice(PyObject *SWIGU
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_lattice" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -96197,11 +94110,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_getParticleDensity(PyOb
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_getParticleDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_getParticleDensity" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -96219,11 +94133,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_getChildren(PyObject *S
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunction2DLattice const *""'"); 
   }
@@ -96241,10 +94156,11 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_onChange(PyObject *SWIG
   InterferenceFunction2DLattice *arg1 = (InterferenceFunction2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DLattice_onChange",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DLattice_onChange" "', argument " "1"" of type '" "InterferenceFunction2DLattice *""'"); 
   }
@@ -96259,12 +94175,16 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunction2DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction2DLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *InterferenceFunction2DLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   double arg2 ;
@@ -96278,14 +94198,10 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(PyObjec
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -96293,17 +94209,17 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "4"" of type '" "double""'");
   } 
@@ -96316,7 +94232,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   double arg2 ;
@@ -96327,13 +94243,10 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(PyObjec
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -96341,12 +94254,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "3"" of type '" "double""'");
   } 
@@ -96359,7 +94272,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   double arg2 ;
@@ -96367,12 +94280,10 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(PyObjec
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -96380,7 +94291,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
@@ -96393,16 +94304,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_InterferenceFunction2DParaCrystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -96418,7 +94328,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96435,35 +94345,30 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_4(PyObjec
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "5"" of type '" "double""'");
   } 
@@ -96476,7 +94381,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96490,29 +94395,25 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_5(PyObjec
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "4"" of type '" "double""'");
   } 
@@ -96525,7 +94426,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96536,23 +94437,20 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal__SWIG_6(PyObjec
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunction2DParaCrystal",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DParaCrystal" "', argument " "3"" of type '" "double""'");
   } 
@@ -96570,24 +94468,20 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_InterferenceFunction2DParaCrystal", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_3(self, args);
+      return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -96595,13 +94489,13 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(self, args);
+        return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_2(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -96614,7 +94508,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(self, args);
+          return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -96636,14 +94530,14 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_6(self, args);
+          return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_6(self, argc, argv);
         }
       }
     }
   }
   if (argc == 4) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -96661,7 +94555,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(self, args);
+            return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -96689,7 +94583,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_5(self, args);
+            return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_5(self, argc, argv);
           }
         }
       }
@@ -96722,7 +94616,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_4(self, args);
+              return _wrap_new_InterferenceFunction2DParaCrystal__SWIG_4(self, argc, argv);
             }
           }
         }
@@ -96731,7 +94625,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DParaCrystal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DParaCrystal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(Lattice2D const &,double,double,double)\n"
     "    InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(Lattice2D const &,double,double)\n"
@@ -96749,10 +94643,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunction2DParaCrystal(PyObject *SW
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunction2DParaCrystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunction2DParaCrystal" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal *""'"); 
   }
@@ -96770,11 +94665,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_clone(PyObject *SWI
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_clone" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -96795,16 +94691,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_accept(PyObject *SW
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DParaCrystal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_accept" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DParaCrystal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -96817,7 +94712,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96831,29 +94726,25 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunction2DParaCrystal_createSquare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "4"" of type '" "double""'");
   } 
@@ -96866,7 +94757,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96877,23 +94768,20 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:InterferenceFunction2DParaCrystal_createSquare",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "3"" of type '" "double""'");
   } 
@@ -96906,7 +94794,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -96914,17 +94802,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DParaCrystal_createSquare",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "2"" of type '" "double""'");
   } 
@@ -96937,16 +94823,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_createSquare",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createSquare" "', argument " "1"" of type '" "double""'");
   } 
@@ -96964,13 +94849,9 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_createSquare", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -96978,7 +94859,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_3(self, args);
+      return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -96993,7 +94874,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_2(self, args);
+        return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -97014,7 +94895,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_1(self, args);
+          return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -97041,7 +94922,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_0(self, args);
+            return _wrap_InterferenceFunction2DParaCrystal_createSquare__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -97049,7 +94930,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InterferenceFunction2DParaCrystal_createSquare'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'InterferenceFunction2DParaCrystal_createSquare'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DParaCrystal::createSquare(double,double,double,double)\n"
     "    InterferenceFunction2DParaCrystal::createSquare(double,double,double)\n"
@@ -97059,7 +94940,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -97073,29 +94954,25 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SW
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunction2DParaCrystal_createHexagonal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "4"" of type '" "double""'");
   } 
@@ -97108,7 +94985,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -97119,23 +94996,20 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SW
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:InterferenceFunction2DParaCrystal_createHexagonal",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "3"" of type '" "double""'");
   } 
@@ -97148,7 +95022,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -97156,17 +95030,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SW
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DParaCrystal_createHexagonal",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
@@ -97179,16 +95051,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunction2DParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_createHexagonal",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DParaCrystal_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
@@ -97206,13 +95077,9 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_createHexagonal", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -97220,7 +95087,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_3(self, args);
+      return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -97235,7 +95102,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_2(self, args);
+        return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -97256,7 +95123,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_1(self, args);
+          return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -97283,7 +95150,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_0(self, args);
+            return _wrap_InterferenceFunction2DParaCrystal_createHexagonal__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -97291,7 +95158,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InterferenceFunction2DParaCrystal_createHexagonal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'InterferenceFunction2DParaCrystal_createHexagonal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DParaCrystal::createHexagonal(double,double,double,double)\n"
     "    InterferenceFunction2DParaCrystal::createHexagonal(double,double,double)\n"
@@ -97312,22 +95179,20 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_setDomainSizes(PyOb
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:InterferenceFunction2DParaCrystal_setDomainSizes",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_setDomainSizes", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_setDomainSizes" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_setDomainSizes" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DParaCrystal_setDomainSizes" "', argument " "3"" of type '" "double""'");
   } 
@@ -97351,17 +95216,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_setProbabilityDistr
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:InterferenceFunction2DParaCrystal_setProbabilityDistributions",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_setProbabilityDistributions", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_setProbabilityDistributions" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFTDistribution2D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFTDistribution2D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DParaCrystal_setProbabilityDistributions" "', argument " "2"" of type '" "IFTDistribution2D const &""'"); 
   }
@@ -97369,7 +95232,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_setProbabilityDistr
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "InterferenceFunction2DParaCrystal_setProbabilityDistributions" "', argument " "2"" of type '" "IFTDistribution2D const &""'"); 
   }
   arg2 = reinterpret_cast< IFTDistribution2D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IFTDistribution2D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IFTDistribution2D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "InterferenceFunction2DParaCrystal_setProbabilityDistributions" "', argument " "3"" of type '" "IFTDistribution2D const &""'"); 
   }
@@ -97393,16 +95256,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_setDampingLength(Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DParaCrystal_setDampingLength",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_setDampingLength", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_setDampingLength" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_setDampingLength" "', argument " "2"" of type '" "double""'");
   } 
@@ -97420,11 +95282,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_domainSizes(PyObjec
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_domainSizes",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_domainSizes" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97445,16 +95308,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_setIntegrationOverX
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DParaCrystal_setIntegrationOverXi",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DParaCrystal_setIntegrationOverXi", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_setIntegrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DParaCrystal_setIntegrationOverXi" "', argument " "2"" of type '" "bool""'");
   } 
@@ -97472,11 +95334,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_integrationOverXi(P
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_integrationOverXi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_integrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97494,11 +95357,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_dampingLength(PyObj
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_dampingLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_dampingLength" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97516,11 +95380,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_lattice(PyObject *S
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_lattice" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97538,11 +95403,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_getParticleDensity(
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_getParticleDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_getParticleDensity" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97560,11 +95426,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_getChildren(PyObjec
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_getChildren" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97582,11 +95449,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_pdf1(PyObject *SWIG
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDistribution2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_pdf1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_pdf1" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97604,11 +95472,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_pdf2(PyObject *SWIG
   InterferenceFunction2DParaCrystal *arg1 = (InterferenceFunction2DParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFTDistribution2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DParaCrystal_pdf2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DParaCrystal_pdf2" "', argument " "1"" of type '" "InterferenceFunction2DParaCrystal const *""'"); 
   }
@@ -97623,12 +95492,16 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunction2DParaCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction2DParaCrystal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *InterferenceFunction2DParaCrystal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   unsigned int arg2 ;
@@ -97639,13 +95512,10 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(PyObje
   int ecode2 = 0 ;
   unsigned int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunction2DSuperLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunction2DSuperLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -97653,12 +95523,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(PyObje
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "3"" of type '" "unsigned int""'");
   } 
@@ -97671,7 +95541,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -97691,41 +95561,35 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice__SWIG_1(PyObje
   int ecode5 = 0 ;
   unsigned int val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   InterferenceFunction2DSuperLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_InterferenceFunction2DSuperLattice",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5);
+  ecode5 = SWIG_AsVal_unsigned_SS_int(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "5"" of type '" "unsigned int""'");
   } 
   arg5 = static_cast< unsigned int >(val5);
-  ecode6 = SWIG_AsVal_unsigned_SS_int(obj5, &val6);
+  ecode6 = SWIG_AsVal_unsigned_SS_int(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_InterferenceFunction2DSuperLattice" "', argument " "6"" of type '" "unsigned int""'");
   } 
@@ -97743,16 +95607,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice(PyObject *self
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_InterferenceFunction2DSuperLattice", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -97765,7 +95625,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice(PyObject *self
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(self, args);
+          return _wrap_new_InterferenceFunction2DSuperLattice__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -97802,7 +95662,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice(PyObject *self
                 _v = SWIG_CheckState(res);
               }
               if (_v) {
-                return _wrap_new_InterferenceFunction2DSuperLattice__SWIG_1(self, args);
+                return _wrap_new_InterferenceFunction2DSuperLattice__SWIG_1(self, argc, argv);
               }
             }
           }
@@ -97812,7 +95672,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DSuperLattice(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DSuperLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_InterferenceFunction2DSuperLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DSuperLattice::InterferenceFunction2DSuperLattice(Lattice2D const &,unsigned int,unsigned int)\n"
     "    InterferenceFunction2DSuperLattice::InterferenceFunction2DSuperLattice(double,double,double,double,unsigned int,unsigned int)\n");
@@ -97825,10 +95685,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunction2DSuperLattice(PyObject *S
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunction2DSuperLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunction2DSuperLattice" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice *""'"); 
   }
@@ -97846,11 +95707,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_clone(PyObject *SW
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction2DSuperLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_clone" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -97871,16 +95733,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_accept(PyObject *S
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DSuperLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_accept" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DSuperLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DSuperLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -97901,16 +95762,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_setSubstructureIFF
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DSuperLattice_setSubstructureIFF",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_setSubstructureIFF", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_setSubstructureIFF" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DSuperLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DSuperLattice_setSubstructureIFF" "', argument " "2"" of type '" "IInterferenceFunction const &""'"); 
   }
@@ -97931,12 +95791,13 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_substructureIFF(Py
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_substructureIFF",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_substructureIFF" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -97969,29 +95830,26 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_createSquare(PyObj
   int ecode3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   InterferenceFunction2DSuperLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunction2DSuperLattice_createSquare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_createSquare", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "3"" of type '" "unsigned int""'");
   } 
   arg3 = static_cast< unsigned int >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "4"" of type '" "unsigned int""'");
   } 
@@ -98018,29 +95876,26 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_createHexagonal(Py
   int ecode3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   InterferenceFunction2DSuperLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunction2DSuperLattice_createHexagonal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_createHexagonal", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "3"" of type '" "unsigned int""'");
   } 
   arg3 = static_cast< unsigned int >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "4"" of type '" "unsigned int""'");
   } 
@@ -98053,7 +95908,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   kvector_t arg2 ;
@@ -98064,19 +95919,16 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(P
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:InterferenceFunction2DSuperLattice_evaluate",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_evaluate" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DSuperLattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DSuperLattice_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -98088,7 +95940,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(P
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DSuperLattice_evaluate" "', argument " "3"" of type '" "double""'");
   } 
@@ -98101,7 +95953,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   kvector_t arg2 ;
@@ -98109,18 +95961,16 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_1(P
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DSuperLattice_evaluate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_evaluate" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DSuperLattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction2DSuperLattice_evaluate" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -98145,23 +95995,19 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate(PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_evaluate", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_1(self, args);
+        return _wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -98171,7 +96017,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate(PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -98179,14 +96025,14 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate(PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(self, args);
+          return _wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InterferenceFunction2DSuperLattice_evaluate'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'InterferenceFunction2DSuperLattice_evaluate'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunction2DSuperLattice::evaluate(kvector_t const,double) const\n"
     "    InterferenceFunction2DSuperLattice::evaluate(kvector_t const) const\n");
@@ -98199,11 +96045,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_domainSize1(PyObje
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_domainSize1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_domainSize1" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -98221,11 +96068,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_domainSize2(PyObje
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_domainSize2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_domainSize2" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -98246,16 +96094,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_setIntegrationOver
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction2DSuperLattice_setIntegrationOverXi",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_setIntegrationOverXi", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_setIntegrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction2DSuperLattice * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DSuperLattice_setIntegrationOverXi" "', argument " "2"" of type '" "bool""'");
   } 
@@ -98273,11 +96120,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_integrationOverXi(
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_integrationOverXi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_integrationOverXi" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -98295,11 +96143,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_lattice(PyObject *
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_lattice" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -98317,11 +96166,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_getChildren(PyObje
   InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction2DSuperLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction2DSuperLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction2DSuperLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunction2DSuperLattice const *""'"); 
   }
@@ -98336,21 +96186,26 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunction2DSuperLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction2DSuperLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunction2DSuperLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunction3DLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Lattice *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction3DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_InterferenceFunction3DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunction3DLattice" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
@@ -98371,10 +96226,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunction3DLattice(PyObject *SWIGUN
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunction3DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunction3DLattice" "', argument " "1"" of type '" "InterferenceFunction3DLattice *""'"); 
   }
@@ -98392,11 +96248,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_clone(PyObject *SWIGUNU
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunction3DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction3DLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_clone" "', argument " "1"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
@@ -98417,16 +96274,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_accept(PyObject *SWIGUN
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction3DLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction3DLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_accept" "', argument " "1"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction3DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction3DLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -98447,16 +96303,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_setPeakShape(PyObject *
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunction3DLattice_setPeakShape",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction3DLattice_setPeakShape", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_setPeakShape" "', argument " "1"" of type '" "InterferenceFunction3DLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunction3DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IPeakShape,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IPeakShape,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunction3DLattice_setPeakShape" "', argument " "2"" of type '" "IPeakShape const &""'"); 
   }
@@ -98477,11 +96332,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_lattice(PyObject *SWIGU
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction3DLattice_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_lattice" "', argument " "1"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
@@ -98499,11 +96355,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_supportsMultilayer(PyOb
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction3DLattice_supportsMultilayer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_supportsMultilayer" "', argument " "1"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
@@ -98521,11 +96378,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_getChildren(PyObject *S
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction3DLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunction3DLattice const *""'"); 
   }
@@ -98543,10 +96401,11 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction3DLattice_onChange(PyObject *SWIG
   InterferenceFunction3DLattice *arg1 = (InterferenceFunction3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunction3DLattice_onChange",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunction3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunction3DLattice_onChange" "', argument " "1"" of type '" "InterferenceFunction3DLattice *""'"); 
   }
@@ -98561,12 +96420,16 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunction3DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction3DLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *InterferenceFunction3DLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = 0 ;
   unsigned int arg2 ;
@@ -98577,13 +96440,10 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(PyObj
   int ecode2 = 0 ;
   unsigned int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   InterferenceFunctionFinite2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunctionFinite2DLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
@@ -98591,12 +96451,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(PyObj
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "1"" of type '" "Lattice2D const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "3"" of type '" "unsigned int""'");
   } 
@@ -98609,7 +96469,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -98629,41 +96489,35 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice__SWIG_1(PyObj
   int ecode5 = 0 ;
   unsigned int val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   InterferenceFunctionFinite2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_InterferenceFunctionFinite2DLattice",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5);
+  ecode5 = SWIG_AsVal_unsigned_SS_int(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "5"" of type '" "unsigned int""'");
   } 
   arg5 = static_cast< unsigned int >(val5);
-  ecode6 = SWIG_AsVal_unsigned_SS_int(obj5, &val6);
+  ecode6 = SWIG_AsVal_unsigned_SS_int(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_InterferenceFunctionFinite2DLattice" "', argument " "6"" of type '" "unsigned int""'");
   } 
@@ -98681,16 +96535,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice(PyObject *sel
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionFinite2DLattice", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -98703,7 +96553,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice(PyObject *sel
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(self, args);
+          return _wrap_new_InterferenceFunctionFinite2DLattice__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -98740,7 +96590,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice(PyObject *sel
                 _v = SWIG_CheckState(res);
               }
               if (_v) {
-                return _wrap_new_InterferenceFunctionFinite2DLattice__SWIG_1(self, args);
+                return _wrap_new_InterferenceFunctionFinite2DLattice__SWIG_1(self, argc, argv);
               }
             }
           }
@@ -98750,7 +96600,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite2DLattice(PyObject *sel
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_InterferenceFunctionFinite2DLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_InterferenceFunctionFinite2DLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunctionFinite2DLattice::InterferenceFunctionFinite2DLattice(Lattice2D const &,unsigned int,unsigned int)\n"
     "    InterferenceFunctionFinite2DLattice::InterferenceFunctionFinite2DLattice(double,double,double,double,unsigned int,unsigned int)\n");
@@ -98763,10 +96613,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionFinite2DLattice(PyObject *
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionFinite2DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionFinite2DLattice" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice *""'"); 
   }
@@ -98784,11 +96635,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_clone(PyObject *S
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionFinite2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_clone" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -98809,16 +96661,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_accept(PyObject *
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionFinite2DLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionFinite2DLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_accept" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionFinite2DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionFinite2DLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -98845,29 +96696,26 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_createSquare(PyOb
   int ecode3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   InterferenceFunctionFinite2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunctionFinite2DLattice_createSquare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionFinite2DLattice_createSquare", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunctionFinite2DLattice_createSquare" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionFinite2DLattice_createSquare" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunctionFinite2DLattice_createSquare" "', argument " "3"" of type '" "unsigned int""'");
   } 
   arg3 = static_cast< unsigned int >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunctionFinite2DLattice_createSquare" "', argument " "4"" of type '" "unsigned int""'");
   } 
@@ -98894,29 +96742,26 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_createHexagonal(P
   int ecode3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   InterferenceFunctionFinite2DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:InterferenceFunctionFinite2DLattice_createHexagonal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionFinite2DLattice_createHexagonal", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunctionFinite2DLattice_createHexagonal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionFinite2DLattice_createHexagonal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunctionFinite2DLattice_createHexagonal" "', argument " "3"" of type '" "unsigned int""'");
   } 
   arg3 = static_cast< unsigned int >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunctionFinite2DLattice_createHexagonal" "', argument " "4"" of type '" "unsigned int""'");
   } 
@@ -98934,11 +96779,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_numberUnitCells1(
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_numberUnitCells1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_numberUnitCells1" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -98956,11 +96802,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_numberUnitCells2(
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_numberUnitCells2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_numberUnitCells2" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -98981,16 +96828,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_setIntegrationOve
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionFinite2DLattice_setIntegrationOverXi",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionFinite2DLattice_setIntegrationOverXi", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_setIntegrationOverXi" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionFinite2DLattice * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionFinite2DLattice_setIntegrationOverXi" "', argument " "2"" of type '" "bool""'");
   } 
@@ -99008,11 +96854,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_integrationOverXi
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_integrationOverXi",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_integrationOverXi" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -99030,11 +96877,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_lattice(PyObject
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_lattice" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -99052,11 +96900,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_getParticleDensit
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_getParticleDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_getParticleDensity" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -99074,11 +96923,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite2DLattice_getChildren(PyObj
   InterferenceFunctionFinite2DLattice *arg1 = (InterferenceFunctionFinite2DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite2DLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite2DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite2DLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunctionFinite2DLattice const *""'"); 
   }
@@ -99093,11 +96943,15 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionFinite2DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionFinite2DLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunctionFinite2DLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite3DLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Lattice *arg1 = 0 ;
@@ -99112,14 +96966,11 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite3DLattice(PyObject *SWI
   int ecode3 = 0 ;
   unsigned int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   InterferenceFunctionFinite3DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_InterferenceFunctionFinite3DLattice",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionFinite3DLattice", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunctionFinite3DLattice" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
@@ -99127,17 +96978,17 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionFinite3DLattice(PyObject *SWI
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunctionFinite3DLattice" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionFinite3DLattice" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunctionFinite3DLattice" "', argument " "3"" of type '" "unsigned int""'");
   } 
   arg3 = static_cast< unsigned int >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_InterferenceFunctionFinite3DLattice" "', argument " "4"" of type '" "unsigned int""'");
   } 
@@ -99155,10 +97006,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionFinite3DLattice(PyObject *
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionFinite3DLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionFinite3DLattice" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice *""'"); 
   }
@@ -99176,11 +97028,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_clone(PyObject *S
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionFinite3DLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_clone" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99201,16 +97054,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_accept(PyObject *
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionFinite3DLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionFinite3DLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_accept" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionFinite3DLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionFinite3DLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -99228,11 +97080,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_numberUnitCells1(
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_numberUnitCells1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_numberUnitCells1" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99250,11 +97103,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_numberUnitCells2(
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_numberUnitCells2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_numberUnitCells2" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99272,11 +97126,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_numberUnitCells3(
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_numberUnitCells3",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_numberUnitCells3" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99294,11 +97149,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_lattice(PyObject
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_lattice" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99316,11 +97172,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_supportsMultilaye
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_supportsMultilayer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_supportsMultilayer" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99338,11 +97195,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionFinite3DLattice_getChildren(PyObj
   InterferenceFunctionFinite3DLattice *arg1 = (InterferenceFunctionFinite3DLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionFinite3DLattice_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionFinite3DLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionFinite3DLattice_getChildren" "', argument " "1"" of type '" "InterferenceFunctionFinite3DLattice const *""'"); 
   }
@@ -99357,11 +97215,15 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionFinite3DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionFinite3DLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunctionFinite3DLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunctionHardDisk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -99370,17 +97232,16 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionHardDisk(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   InterferenceFunctionHardDisk *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_InterferenceFunctionHardDisk",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionHardDisk", 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 '" "new_InterferenceFunctionHardDisk" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionHardDisk" "', argument " "2"" of type '" "double""'");
   } 
@@ -99398,10 +97259,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionHardDisk(PyObject *SWIGUNU
   InterferenceFunctionHardDisk *arg1 = (InterferenceFunctionHardDisk *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionHardDisk",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionHardDisk" "', argument " "1"" of type '" "InterferenceFunctionHardDisk *""'"); 
   }
@@ -99419,11 +97281,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionHardDisk_clone(PyObject *SWIGUNUS
   InterferenceFunctionHardDisk *arg1 = (InterferenceFunctionHardDisk *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionHardDisk *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionHardDisk_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionHardDisk_clone" "', argument " "1"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
@@ -99444,16 +97307,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionHardDisk_accept(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionHardDisk_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionHardDisk_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionHardDisk_accept" "', argument " "1"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionHardDisk * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionHardDisk_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -99471,11 +97333,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionHardDisk_getParticleDensity(PyObj
   InterferenceFunctionHardDisk *arg1 = (InterferenceFunctionHardDisk *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionHardDisk_getParticleDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionHardDisk_getParticleDensity" "', argument " "1"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
@@ -99493,11 +97356,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionHardDisk_radius(PyObject *SWIGUNU
   InterferenceFunctionHardDisk *arg1 = (InterferenceFunctionHardDisk *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionHardDisk_radius",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionHardDisk_radius" "', argument " "1"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
@@ -99515,11 +97379,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionHardDisk_density(PyObject *SWIGUN
   InterferenceFunctionHardDisk *arg1 = (InterferenceFunctionHardDisk *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionHardDisk_density",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionHardDisk, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionHardDisk_density" "', argument " "1"" of type '" "InterferenceFunctionHardDisk const *""'"); 
   }
@@ -99534,16 +97399,20 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionHardDisk_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionHardDisk, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunctionHardDisk_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunctionNone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   InterferenceFunctionNone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_InterferenceFunctionNone")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionNone", 0, 0, 0)) SWIG_fail;
   result = (InterferenceFunctionNone *)new InterferenceFunctionNone();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_InterferenceFunctionNone, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -99557,11 +97426,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionNone_clone(PyObject *SWIGUNUSEDPA
   InterferenceFunctionNone *arg1 = (InterferenceFunctionNone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionNone *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionNone_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionNone_clone" "', argument " "1"" of type '" "InterferenceFunctionNone const *""'"); 
   }
@@ -99582,16 +97452,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionNone_accept(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionNone_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionNone_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionNone, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionNone_accept" "', argument " "1"" of type '" "InterferenceFunctionNone const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionNone * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionNone_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -99609,10 +97478,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionNone(PyObject *SWIGUNUSEDP
   InterferenceFunctionNone *arg1 = (InterferenceFunctionNone *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionNone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionNone, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionNone, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionNone" "', argument " "1"" of type '" "InterferenceFunctionNone *""'"); 
   }
@@ -99627,12 +97497,16 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionNone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionNone, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *InterferenceFunctionNone_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -99640,17 +97514,15 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_0(PyO
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   InterferenceFunctionRadialParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_InterferenceFunctionRadialParaCrystal",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunctionRadialParaCrystal" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionRadialParaCrystal" "', argument " "2"" of type '" "double""'");
   } 
@@ -99663,16 +97535,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   InterferenceFunctionRadialParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_InterferenceFunctionRadialParaCrystal",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InterferenceFunctionRadialParaCrystal" "', argument " "1"" of type '" "double""'");
   } 
@@ -99690,13 +97561,9 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal(PyObject *s
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionRadialParaCrystal", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -99704,7 +97571,7 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal(PyObject *s
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_1(self, args);
+      return _wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -99719,13 +97586,13 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal(PyObject *s
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_0(self, args);
+        return _wrap_new_InterferenceFunctionRadialParaCrystal__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_InterferenceFunctionRadialParaCrystal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_InterferenceFunctionRadialParaCrystal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(double,double)\n"
     "    InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(double)\n");
@@ -99738,11 +97605,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_clone(PyObject
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionRadialParaCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_clone" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -99763,16 +97631,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_accept(PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionRadialParaCrystal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionRadialParaCrystal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_accept" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionRadialParaCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionRadialParaCrystal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -99793,16 +97660,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_setKappa(PyObje
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionRadialParaCrystal_setKappa",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionRadialParaCrystal_setKappa", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_setKappa" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionRadialParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionRadialParaCrystal_setKappa" "', argument " "2"" of type '" "double""'");
   } 
@@ -99820,11 +97686,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_kappa(PyObject
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_kappa",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_kappa" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -99845,16 +97712,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_setDomainSize(P
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionRadialParaCrystal_setDomainSize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionRadialParaCrystal_setDomainSize", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_setDomainSize" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionRadialParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionRadialParaCrystal_setDomainSize" "', argument " "2"" of type '" "double""'");
   } 
@@ -99872,11 +97738,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_domainSize(PyOb
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_domainSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_domainSize" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -99897,17 +97764,16 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_FTPDF(PyObject
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionRadialParaCrystal_FTPDF",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionRadialParaCrystal_FTPDF", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_FTPDF" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionRadialParaCrystal * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunctionRadialParaCrystal_FTPDF" "', argument " "2"" of type '" "double""'");
   } 
@@ -99928,16 +97794,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_setProbabilityD
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionRadialParaCrystal_setProbabilityDistribution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionRadialParaCrystal_setProbabilityDistribution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_setProbabilityDistribution" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionRadialParaCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFTDistribution1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFTDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionRadialParaCrystal_setProbabilityDistribution" "', argument " "2"" of type '" "IFTDistribution1D const &""'"); 
   }
@@ -99958,11 +97823,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_peakDistance(Py
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_peakDistance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_peakDistance" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -99980,11 +97846,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_dampingLength(P
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_dampingLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_dampingLength" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -100002,11 +97869,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_getChildren(PyO
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_getChildren" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -100024,11 +97892,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionRadialParaCrystal_randomSample(Py
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionRadialParaCrystal_randomSample",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionRadialParaCrystal_randomSample" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal const *""'"); 
   }
@@ -100046,10 +97915,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionRadialParaCrystal(PyObject
   InterferenceFunctionRadialParaCrystal *arg1 = (InterferenceFunctionRadialParaCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionRadialParaCrystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionRadialParaCrystal" "', argument " "1"" of type '" "InterferenceFunctionRadialParaCrystal *""'"); 
   }
@@ -100064,11 +97934,15 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionRadialParaCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunctionRadialParaCrystal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_InterferenceFunctionTwin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   kvector_t *arg1 = 0 ;
@@ -100080,13 +97954,11 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionTwin(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   InterferenceFunctionTwin *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_InterferenceFunctionTwin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_InterferenceFunctionTwin", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_InterferenceFunctionTwin" "', argument " "1"" of type '" "kvector_t const &""'"); 
   }
@@ -100094,12 +97966,12 @@ SWIGINTERN PyObject *_wrap_new_InterferenceFunctionTwin(PyObject *SWIGUNUSEDPARM
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_InterferenceFunctionTwin" "', argument " "1"" of type '" "kvector_t const &""'"); 
   }
   arg1 = reinterpret_cast< kvector_t * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InterferenceFunctionTwin" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_InterferenceFunctionTwin" "', argument " "3"" of type '" "double""'");
   } 
@@ -100117,11 +97989,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionTwin_clone(PyObject *SWIGUNUSEDPA
   InterferenceFunctionTwin *arg1 = (InterferenceFunctionTwin *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   InterferenceFunctionTwin *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionTwin_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionTwin_clone" "', argument " "1"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
@@ -100142,16 +98015,15 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionTwin_accept(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:InterferenceFunctionTwin_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "InterferenceFunctionTwin_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionTwin_accept" "', argument " "1"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
   arg1 = reinterpret_cast< InterferenceFunctionTwin * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InterferenceFunctionTwin_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -100169,11 +98041,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionTwin_direction(PyObject *SWIGUNUS
   InterferenceFunctionTwin *arg1 = (InterferenceFunctionTwin *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionTwin_direction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionTwin_direction" "', argument " "1"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
@@ -100191,11 +98064,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionTwin_meanDistance(PyObject *SWIGU
   InterferenceFunctionTwin *arg1 = (InterferenceFunctionTwin *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionTwin_meanDistance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionTwin_meanDistance" "', argument " "1"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
@@ -100213,11 +98087,12 @@ SWIGINTERN PyObject *_wrap_InterferenceFunctionTwin_stdDev(PyObject *SWIGUNUSEDP
   InterferenceFunctionTwin *arg1 = (InterferenceFunctionTwin *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:InterferenceFunctionTwin_stdDev",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InterferenceFunctionTwin_stdDev" "', argument " "1"" of type '" "InterferenceFunctionTwin const *""'"); 
   }
@@ -100235,10 +98110,11 @@ SWIGINTERN PyObject *_wrap_delete_InterferenceFunctionTwin(PyObject *SWIGUNUSEDP
   InterferenceFunctionTwin *arg1 = (InterferenceFunctionTwin *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_InterferenceFunctionTwin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_InterferenceFunctionTwin, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_InterferenceFunctionTwin, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InterferenceFunctionTwin" "', argument " "1"" of type '" "InterferenceFunctionTwin *""'"); 
   }
@@ -100253,20 +98129,25 @@ fail:
 
 SWIGINTERN PyObject *InterferenceFunctionTwin_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionTwin, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *InterferenceFunctionTwin_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IPixel *arg1 = (IPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IPixel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IPixel" "', argument " "1"" of type '" "IPixel *""'"); 
   }
@@ -100284,11 +98165,12 @@ SWIGINTERN PyObject *_wrap_IPixel_clone(PyObject *SWIGUNUSEDPARM(self), PyObject
   IPixel *arg1 = (IPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IPixel_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPixel_clone" "', argument " "1"" of type '" "IPixel const *""'"); 
   }
@@ -100312,23 +98194,21 @@ SWIGINTERN PyObject *_wrap_IPixel_createZeroSizePixel(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   IPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IPixel_createZeroSizePixel",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IPixel_createZeroSizePixel", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPixel_createZeroSizePixel" "', argument " "1"" of type '" "IPixel const *""'"); 
   }
   arg1 = reinterpret_cast< IPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IPixel_createZeroSizePixel" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IPixel_createZeroSizePixel" "', argument " "3"" of type '" "double""'");
   } 
@@ -100355,29 +98235,26 @@ SWIGINTERN PyObject *_wrap_IPixel_getK(PyObject *SWIGUNUSEDPARM(self), PyObject
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:IPixel_getK",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IPixel_getK", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPixel_getK" "', argument " "1"" of type '" "IPixel const *""'"); 
   }
   arg1 = reinterpret_cast< IPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IPixel_getK" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IPixel_getK" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IPixel_getK" "', argument " "4"" of type '" "double""'");
   } 
@@ -100401,23 +98278,21 @@ SWIGINTERN PyObject *_wrap_IPixel_getIntegrationFactor(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IPixel_getIntegrationFactor",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IPixel_getIntegrationFactor", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPixel_getIntegrationFactor" "', argument " "1"" of type '" "IPixel const *""'"); 
   }
   arg1 = reinterpret_cast< IPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IPixel_getIntegrationFactor" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IPixel_getIntegrationFactor" "', argument " "3"" of type '" "double""'");
   } 
@@ -100435,11 +98310,12 @@ SWIGINTERN PyObject *_wrap_IPixel_getSolidAngle(PyObject *SWIGUNUSEDPARM(self),
   IPixel *arg1 = (IPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IPixel_getSolidAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IPixel_getSolidAngle" "', argument " "1"" of type '" "IPixel const *""'"); 
   }
@@ -100454,16 +98330,16 @@ fail:
 
 SWIGINTERN PyObject *IPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IPixel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   SphericalDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SphericalDetector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (SphericalDetector *)new SphericalDetector();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SphericalDetector, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -100472,7 +98348,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -100492,41 +98368,35 @@ SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_1(PyObject *SWIGUNUSEDPAR
   int ecode5 = 0 ;
   double val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   SphericalDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_SphericalDetector",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SphericalDetector" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SphericalDetector" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SphericalDetector" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  ecode4 = SWIG_AsVal_size_t(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_SphericalDetector" "', argument " "4"" of type '" "size_t""'");
   } 
   arg4 = static_cast< size_t >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_SphericalDetector" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_SphericalDetector" "', argument " "6"" of type '" "double""'");
   } 
@@ -100539,16 +98409,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SphericalDetector *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SphericalDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SphericalDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SphericalDetector,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SphericalDetector,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SphericalDetector" "', argument " "1"" of type '" "SphericalDetector const &""'"); 
   }
@@ -100569,22 +98438,18 @@ SWIGINTERN PyObject *_wrap_new_SphericalDetector(PyObject *self, PyObject *args)
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_SphericalDetector", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_SphericalDetector__SWIG_0(self, args);
+    return _wrap_new_SphericalDetector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_SphericalDetector, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_SphericalDetector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_SphericalDetector__SWIG_2(self, args);
+      return _wrap_new_SphericalDetector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 6) {
@@ -100619,7 +98484,7 @@ SWIGINTERN PyObject *_wrap_new_SphericalDetector(PyObject *self, PyObject *args)
                 _v = SWIG_CheckState(res);
               }
               if (_v) {
-                return _wrap_new_SphericalDetector__SWIG_1(self, args);
+                return _wrap_new_SphericalDetector__SWIG_1(self, argc, argv);
               }
             }
           }
@@ -100629,7 +98494,7 @@ SWIGINTERN PyObject *_wrap_new_SphericalDetector(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_SphericalDetector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_SphericalDetector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SphericalDetector::SphericalDetector()\n"
     "    SphericalDetector::SphericalDetector(size_t,double,double,size_t,double,double)\n"
@@ -100643,11 +98508,12 @@ SWIGINTERN PyObject *_wrap_SphericalDetector_clone(PyObject *SWIGUNUSEDPARM(self
   SphericalDetector *arg1 = (SphericalDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SphericalDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SphericalDetector_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalDetector_clone" "', argument " "1"" of type '" "SphericalDetector const *""'"); 
   }
@@ -100668,16 +98534,15 @@ SWIGINTERN PyObject *_wrap_SphericalDetector_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SphericalDetector_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SphericalDetector_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalDetector_accept" "', argument " "1"" of type '" "SphericalDetector const *""'"); 
   }
   arg1 = reinterpret_cast< SphericalDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SphericalDetector_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -100695,10 +98560,11 @@ SWIGINTERN PyObject *_wrap_delete_SphericalDetector(PyObject *SWIGUNUSEDPARM(sel
   SphericalDetector *arg1 = (SphericalDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SphericalDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalDetector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalDetector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SphericalDetector" "', argument " "1"" of type '" "SphericalDetector *""'"); 
   }
@@ -100716,11 +98582,12 @@ SWIGINTERN PyObject *_wrap_SphericalDetector_defaultAxesUnits(PyObject *SWIGUNUS
   SphericalDetector *arg1 = (SphericalDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AxesUnits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SphericalDetector_defaultAxesUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalDetector_defaultAxesUnits" "', argument " "1"" of type '" "SphericalDetector const *""'"); 
   }
@@ -100735,11 +98602,15 @@ fail:
 
 SWIGINTERN PyObject *SphericalDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SphericalDetector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SphericalDetector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SphericalPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Bin1D *arg1 = 0 ;
@@ -100748,12 +98619,11 @@ SWIGINTERN PyObject *_wrap_new_SphericalPixel(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SphericalPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_SphericalPixel",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Bin1D,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_SphericalPixel", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SphericalPixel" "', argument " "1"" of type '" "Bin1D const &""'"); 
   }
@@ -100761,7 +98631,7 @@ SWIGINTERN PyObject *_wrap_new_SphericalPixel(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SphericalPixel" "', argument " "1"" of type '" "Bin1D const &""'"); 
   }
   arg1 = reinterpret_cast< Bin1D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SphericalPixel" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -100782,11 +98652,12 @@ SWIGINTERN PyObject *_wrap_SphericalPixel_clone(PyObject *SWIGUNUSEDPARM(self),
   SphericalPixel *arg1 = (SphericalPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SphericalPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SphericalPixel_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_clone" "', argument " "1"" of type '" "SphericalPixel const *""'"); 
   }
@@ -100810,23 +98681,21 @@ SWIGINTERN PyObject *_wrap_SphericalPixel_createZeroSizePixel(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   SphericalPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SphericalPixel_createZeroSizePixel",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_createZeroSizePixel", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "1"" of type '" "SphericalPixel const *""'"); 
   }
   arg1 = reinterpret_cast< SphericalPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "3"" of type '" "double""'");
   } 
@@ -100853,29 +98722,26 @@ SWIGINTERN PyObject *_wrap_SphericalPixel_getK(PyObject *SWIGUNUSEDPARM(self), P
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:SphericalPixel_getK",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_getK", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getK" "', argument " "1"" of type '" "SphericalPixel const *""'"); 
   }
   arg1 = reinterpret_cast< SphericalPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_getK" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_getK" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "SphericalPixel_getK" "', argument " "4"" of type '" "double""'");
   } 
@@ -100899,23 +98765,21 @@ SWIGINTERN PyObject *_wrap_SphericalPixel_getIntegrationFactor(PyObject *SWIGUNU
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SphericalPixel_getIntegrationFactor",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_getIntegrationFactor", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "1"" of type '" "SphericalPixel const *""'"); 
   }
   arg1 = reinterpret_cast< SphericalPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "3"" of type '" "double""'");
   } 
@@ -100933,11 +98797,12 @@ SWIGINTERN PyObject *_wrap_SphericalPixel_getSolidAngle(PyObject *SWIGUNUSEDPARM
   SphericalPixel *arg1 = (SphericalPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SphericalPixel_getSolidAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getSolidAngle" "', argument " "1"" of type '" "SphericalPixel const *""'"); 
   }
@@ -100955,10 +98820,11 @@ SWIGINTERN PyObject *_wrap_delete_SphericalPixel(PyObject *SWIGUNUSEDPARM(self),
   SphericalPixel *arg1 = (SphericalPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SphericalPixel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SphericalPixel, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SphericalPixel" "', argument " "1"" of type '" "SphericalPixel *""'"); 
   }
@@ -100973,16 +98839,20 @@ fail:
 
 SWIGINTERN PyObject *SphericalPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SphericalPixel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SphericalPixel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   IsGISAXSDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IsGISAXSDetector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (IsGISAXSDetector *)new IsGISAXSDetector();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IsGISAXSDetector, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -100991,7 +98861,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -101011,41 +98881,35 @@ SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_1(PyObject *SWIGUNUSEDPARM
   int ecode5 = 0 ;
   double val6 ;
   int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   IsGISAXSDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_IsGISAXSDetector",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IsGISAXSDetector" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IsGISAXSDetector" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_IsGISAXSDetector" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_size_t(obj3, &val4);
+  ecode4 = SWIG_AsVal_size_t(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_IsGISAXSDetector" "', argument " "4"" of type '" "size_t""'");
   } 
   arg4 = static_cast< size_t >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_IsGISAXSDetector" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  ecode6 = SWIG_AsVal_double(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_IsGISAXSDetector" "', argument " "6"" of type '" "double""'");
   } 
@@ -101058,16 +98922,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IsGISAXSDetector *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IsGISAXSDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_IsGISAXSDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IsGISAXSDetector,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IsGISAXSDetector,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IsGISAXSDetector" "', argument " "1"" of type '" "IsGISAXSDetector const &""'"); 
   }
@@ -101088,22 +98951,18 @@ SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector(PyObject *self, PyObject *args)
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_IsGISAXSDetector", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_IsGISAXSDetector__SWIG_0(self, args);
+    return _wrap_new_IsGISAXSDetector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IsGISAXSDetector, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IsGISAXSDetector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_IsGISAXSDetector__SWIG_2(self, args);
+      return _wrap_new_IsGISAXSDetector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 6) {
@@ -101138,7 +98997,7 @@ SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector(PyObject *self, PyObject *args)
                 _v = SWIG_CheckState(res);
               }
               if (_v) {
-                return _wrap_new_IsGISAXSDetector__SWIG_1(self, args);
+                return _wrap_new_IsGISAXSDetector__SWIG_1(self, argc, argv);
               }
             }
           }
@@ -101148,7 +99007,7 @@ SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_IsGISAXSDetector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_IsGISAXSDetector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IsGISAXSDetector::IsGISAXSDetector()\n"
     "    IsGISAXSDetector::IsGISAXSDetector(size_t,double,double,size_t,double,double)\n"
@@ -101162,11 +99021,12 @@ SWIGINTERN PyObject *_wrap_IsGISAXSDetector_clone(PyObject *SWIGUNUSEDPARM(self)
   IsGISAXSDetector *arg1 = (IsGISAXSDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IsGISAXSDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IsGISAXSDetector_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsGISAXSDetector_clone" "', argument " "1"" of type '" "IsGISAXSDetector const *""'"); 
   }
@@ -101187,16 +99047,15 @@ SWIGINTERN PyObject *_wrap_IsGISAXSDetector_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IsGISAXSDetector_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IsGISAXSDetector_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsGISAXSDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IsGISAXSDetector_accept" "', argument " "1"" of type '" "IsGISAXSDetector const *""'"); 
   }
   arg1 = reinterpret_cast< IsGISAXSDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IsGISAXSDetector_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -101214,10 +99073,11 @@ SWIGINTERN PyObject *_wrap_delete_IsGISAXSDetector(PyObject *SWIGUNUSEDPARM(self
   IsGISAXSDetector *arg1 = (IsGISAXSDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IsGISAXSDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IsGISAXSDetector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IsGISAXSDetector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IsGISAXSDetector" "', argument " "1"" of type '" "IsGISAXSDetector *""'"); 
   }
@@ -101232,20 +99092,25 @@ fail:
 
 SWIGINTERN PyObject *IsGISAXSDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IsGISAXSDetector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *IsGISAXSDetector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_ILatticeOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ILatticeOrientation *arg1 = (ILatticeOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ILatticeOrientation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILatticeOrientation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILatticeOrientation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ILatticeOrientation" "', argument " "1"" of type '" "ILatticeOrientation *""'"); 
   }
@@ -101263,11 +99128,12 @@ SWIGINTERN PyObject *_wrap_ILatticeOrientation_clone(PyObject *SWIGUNUSEDPARM(se
   ILatticeOrientation *arg1 = (ILatticeOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ILatticeOrientation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILatticeOrientation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILatticeOrientation_clone" "', argument " "1"" of type '" "ILatticeOrientation const *""'"); 
   }
@@ -101288,16 +99154,15 @@ SWIGINTERN PyObject *_wrap_ILatticeOrientation_usePrimitiveLattice(PyObject *SWI
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ILatticeOrientation_usePrimitiveLattice",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ILatticeOrientation_usePrimitiveLattice", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILatticeOrientation_usePrimitiveLattice" "', argument " "1"" of type '" "ILatticeOrientation *""'"); 
   }
   arg1 = reinterpret_cast< ILatticeOrientation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Lattice,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ILatticeOrientation_usePrimitiveLattice" "', argument " "2"" of type '" "Lattice const &""'"); 
   }
@@ -101318,11 +99183,12 @@ SWIGINTERN PyObject *_wrap_ILatticeOrientation_transformationMatrix(PyObject *SW
   ILatticeOrientation *arg1 = (ILatticeOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ILatticeOrientation_transformationMatrix",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ILatticeOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ILatticeOrientation_transformationMatrix" "', argument " "1"" of type '" "ILatticeOrientation const *""'"); 
   }
@@ -101337,7 +99203,7 @@ fail:
 
 SWIGINTERN PyObject *ILatticeOrientation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ILatticeOrientation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101353,23 +99219,21 @@ SWIGINTERN PyObject *_wrap_new_MillerIndex(PyObject *SWIGUNUSEDPARM(self), PyObj
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   MillerIndex *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_MillerIndex",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_MillerIndex", 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 '" "new_MillerIndex" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MillerIndex" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_MillerIndex" "', argument " "3"" of type '" "double""'");
   } 
@@ -101390,16 +99254,15 @@ SWIGINTERN PyObject *_wrap_MillerIndex_h_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MillerIndex_h_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MillerIndex_h_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_h_set" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
   arg1 = reinterpret_cast< MillerIndex * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MillerIndex_h_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -101417,11 +99280,12 @@ SWIGINTERN PyObject *_wrap_MillerIndex_h_get(PyObject *SWIGUNUSEDPARM(self), PyO
   MillerIndex *arg1 = (MillerIndex *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MillerIndex_h_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_h_get" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
@@ -101442,16 +99306,15 @@ SWIGINTERN PyObject *_wrap_MillerIndex_k_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MillerIndex_k_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MillerIndex_k_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_k_set" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
   arg1 = reinterpret_cast< MillerIndex * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MillerIndex_k_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -101469,11 +99332,12 @@ SWIGINTERN PyObject *_wrap_MillerIndex_k_get(PyObject *SWIGUNUSEDPARM(self), PyO
   MillerIndex *arg1 = (MillerIndex *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MillerIndex_k_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_k_get" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
@@ -101494,16 +99358,15 @@ SWIGINTERN PyObject *_wrap_MillerIndex_l_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MillerIndex_l_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MillerIndex_l_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_l_set" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
   arg1 = reinterpret_cast< MillerIndex * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MillerIndex_l_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -101521,11 +99384,12 @@ SWIGINTERN PyObject *_wrap_MillerIndex_l_get(PyObject *SWIGUNUSEDPARM(self), PyO
   MillerIndex *arg1 = (MillerIndex *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MillerIndex_l_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndex_l_get" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
@@ -101543,10 +99407,11 @@ SWIGINTERN PyObject *_wrap_delete_MillerIndex(PyObject *SWIGUNUSEDPARM(self), Py
   MillerIndex *arg1 = (MillerIndex *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MillerIndex",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndex, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndex, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MillerIndex" "', argument " "1"" of type '" "MillerIndex *""'"); 
   }
@@ -101561,11 +99426,15 @@ fail:
 
 SWIGINTERN PyObject *MillerIndex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MillerIndex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *MillerIndex_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_MillerIndexOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   MillerIndexOrientation::QComponent arg1 ;
@@ -101580,20 +99449,17 @@ SWIGINTERN PyObject *_wrap_new_MillerIndexOrientation(PyObject *SWIGUNUSEDPARM(s
   int ecode3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   MillerIndexOrientation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_MillerIndexOrientation",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_MillerIndexOrientation", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_MillerIndexOrientation" "', argument " "1"" of type '" "MillerIndexOrientation::QComponent""'");
   } 
   arg1 = static_cast< MillerIndexOrientation::QComponent >(val1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_MillerIndex,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_MillerIndex,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_MillerIndexOrientation" "', argument " "2"" of type '" "MillerIndex""'"); 
     }  
@@ -101605,13 +99471,13 @@ SWIGINTERN PyObject *_wrap_new_MillerIndexOrientation(PyObject *SWIGUNUSEDPARM(s
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_MillerIndexOrientation" "', argument " "3"" of type '" "MillerIndexOrientation::QComponent""'");
   } 
   arg3 = static_cast< MillerIndexOrientation::QComponent >(val3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_MillerIndex,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_MillerIndex,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_MillerIndexOrientation" "', argument " "4"" of type '" "MillerIndex""'"); 
     }  
@@ -101636,10 +99502,11 @@ SWIGINTERN PyObject *_wrap_delete_MillerIndexOrientation(PyObject *SWIGUNUSEDPAR
   MillerIndexOrientation *arg1 = (MillerIndexOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MillerIndexOrientation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndexOrientation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndexOrientation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MillerIndexOrientation" "', argument " "1"" of type '" "MillerIndexOrientation *""'"); 
   }
@@ -101657,11 +99524,12 @@ SWIGINTERN PyObject *_wrap_MillerIndexOrientation_clone(PyObject *SWIGUNUSEDPARM
   MillerIndexOrientation *arg1 = (MillerIndexOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   MillerIndexOrientation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MillerIndexOrientation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndexOrientation_clone" "', argument " "1"" of type '" "MillerIndexOrientation const *""'"); 
   }
@@ -101682,16 +99550,15 @@ SWIGINTERN PyObject *_wrap_MillerIndexOrientation_usePrimitiveLattice(PyObject *
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MillerIndexOrientation_usePrimitiveLattice",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MillerIndexOrientation_usePrimitiveLattice", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndexOrientation_usePrimitiveLattice" "', argument " "1"" of type '" "MillerIndexOrientation *""'"); 
   }
   arg1 = reinterpret_cast< MillerIndexOrientation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Lattice,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MillerIndexOrientation_usePrimitiveLattice" "', argument " "2"" of type '" "Lattice const &""'"); 
   }
@@ -101712,11 +99579,12 @@ SWIGINTERN PyObject *_wrap_MillerIndexOrientation_transformationMatrix(PyObject
   MillerIndexOrientation *arg1 = (MillerIndexOrientation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Transform3D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MillerIndexOrientation_transformationMatrix",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MillerIndexOrientation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MillerIndexOrientation_transformationMatrix" "', argument " "1"" of type '" "MillerIndexOrientation const *""'"); 
   }
@@ -101731,16 +99599,20 @@ fail:
 
 SWIGINTERN PyObject *MillerIndexOrientation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MillerIndexOrientation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MillerIndexOrientation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Lattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Lattice")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Lattice *)new Lattice();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Lattice, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -101749,7 +99621,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   kvector_t arg1 ;
   kvector_t arg2 ;
@@ -101760,14 +99632,11 @@ SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Lattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Lattice",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Lattice" "', argument " "1"" of type '" "kvector_t const""'"); 
     }  
@@ -101780,7 +99649,7 @@ SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Lattice" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -101793,7 +99662,7 @@ SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "new_Lattice" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -101813,16 +99682,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Lattice__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Lattice *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Lattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Lattice,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Lattice,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Lattice" "', argument " "1"" of type '" "Lattice const &""'"); 
   }
@@ -101843,43 +99711,39 @@ SWIGINTERN PyObject *_wrap_new_Lattice(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Lattice", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Lattice__SWIG_0(self, args);
+    return _wrap_new_Lattice__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Lattice, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Lattice__SWIG_2(self, args);
+      return _wrap_new_Lattice__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_Lattice__SWIG_1(self, args);
+          return _wrap_new_Lattice__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Lattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Lattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Lattice::Lattice()\n"
     "    Lattice::Lattice(kvector_t const,kvector_t const,kvector_t const)\n"
@@ -101893,10 +99757,11 @@ SWIGINTERN PyObject *_wrap_delete_Lattice(PyObject *SWIGUNUSEDPARM(self), PyObje
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Lattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Lattice" "', argument " "1"" of type '" "Lattice *""'"); 
   }
@@ -101917,16 +99782,15 @@ SWIGINTERN PyObject *_wrap_Lattice_accept(PyObject *SWIGUNUSEDPARM(self), PyObje
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_accept" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -101947,17 +99811,16 @@ SWIGINTERN PyObject *_wrap_Lattice_createTransformedLattice(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_createTransformedLattice",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_createTransformedLattice", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_createTransformedLattice" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_createTransformedLattice" "', argument " "2"" of type '" "Transform3D const &""'"); 
   }
@@ -101978,10 +99841,11 @@ SWIGINTERN PyObject *_wrap_Lattice_initialize(PyObject *SWIGUNUSEDPARM(self), Py
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_initialize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_initialize" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
@@ -101999,11 +99863,12 @@ SWIGINTERN PyObject *_wrap_Lattice_getBasisVectorA(PyObject *SWIGUNUSEDPARM(self
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_getBasisVectorA",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getBasisVectorA" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
@@ -102021,11 +99886,12 @@ SWIGINTERN PyObject *_wrap_Lattice_getBasisVectorB(PyObject *SWIGUNUSEDPARM(self
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_getBasisVectorB",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getBasisVectorB" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
@@ -102043,11 +99909,12 @@ SWIGINTERN PyObject *_wrap_Lattice_getBasisVectorC(PyObject *SWIGUNUSEDPARM(self
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_getBasisVectorC",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getBasisVectorC" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
@@ -102074,19 +99941,16 @@ SWIGINTERN PyObject *_wrap_Lattice_resetBasis(PyObject *SWIGUNUSEDPARM(self), Py
   int res3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Lattice_resetBasis",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_resetBasis", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_resetBasis" "', argument " "1"" of type '" "Lattice *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_resetBasis" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -102099,7 +99963,7 @@ SWIGINTERN PyObject *_wrap_Lattice_resetBasis(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "Lattice_resetBasis" "', argument " "3"" of type '" "kvector_t const""'"); 
     }  
@@ -102112,7 +99976,7 @@ SWIGINTERN PyObject *_wrap_Lattice_resetBasis(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Lattice_resetBasis" "', argument " "4"" of type '" "kvector_t const""'"); 
     }  
@@ -102146,29 +100010,26 @@ SWIGINTERN PyObject *_wrap_Lattice_getMillerDirection(PyObject *SWIGUNUSEDPARM(s
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Lattice_getMillerDirection",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_getMillerDirection", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getMillerDirection" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice_getMillerDirection" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Lattice_getMillerDirection" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Lattice_getMillerDirection" "', argument " "4"" of type '" "double""'");
   } 
@@ -102186,11 +100047,12 @@ SWIGINTERN PyObject *_wrap_Lattice_volume(PyObject *SWIGUNUSEDPARM(self), PyObje
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_volume",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_volume" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
@@ -102217,18 +100079,15 @@ SWIGINTERN PyObject *_wrap_Lattice_getReciprocalLatticeBasis(PyObject *SWIGUNUSE
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Lattice_getReciprocalLatticeBasis",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_getReciprocalLatticeBasis", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "2"" of type '" "kvector_t &""'"); 
   }
@@ -102236,7 +100095,7 @@ SWIGINTERN PyObject *_wrap_Lattice_getReciprocalLatticeBasis(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "2"" of type '" "kvector_t &""'"); 
   }
   arg2 = reinterpret_cast< kvector_t * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "3"" of type '" "kvector_t &""'"); 
   }
@@ -102244,7 +100103,7 @@ SWIGINTERN PyObject *_wrap_Lattice_getReciprocalLatticeBasis(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "3"" of type '" "kvector_t &""'"); 
   }
   arg3 = reinterpret_cast< kvector_t * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0 );
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Lattice_getReciprocalLatticeBasis" "', argument " "4"" of type '" "kvector_t &""'"); 
   }
@@ -102268,18 +100127,17 @@ SWIGINTERN PyObject *_wrap_Lattice_getNearestLatticeVectorCoordinates(PyObject *
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< BasicVector3D< int > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_getNearestLatticeVectorCoordinates",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_getNearestLatticeVectorCoordinates", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getNearestLatticeVectorCoordinates" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_getNearestLatticeVectorCoordinates" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -102307,18 +100165,17 @@ SWIGINTERN PyObject *_wrap_Lattice_getNearestReciprocalLatticeVectorCoordinates(
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< BasicVector3D< int > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_getNearestReciprocalLatticeVectorCoordinates",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_getNearestReciprocalLatticeVectorCoordinates", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_getNearestReciprocalLatticeVectorCoordinates" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_getNearestReciprocalLatticeVectorCoordinates" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -102349,19 +100206,17 @@ SWIGINTERN PyObject *_wrap_Lattice_reciprocalLatticeVectorsWithinRadius(PyObject
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< kvector_t,std::allocator< kvector_t > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Lattice_reciprocalLatticeVectorsWithinRadius",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_reciprocalLatticeVectorsWithinRadius", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_reciprocalLatticeVectorsWithinRadius" "', argument " "1"" of type '" "Lattice const *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_reciprocalLatticeVectorsWithinRadius" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -102373,7 +100228,7 @@ SWIGINTERN PyObject *_wrap_Lattice_reciprocalLatticeVectorsWithinRadius(PyObject
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Lattice_reciprocalLatticeVectorsWithinRadius" "', argument " "3"" of type '" "double""'");
   } 
@@ -102394,16 +100249,15 @@ SWIGINTERN PyObject *_wrap_Lattice_setSelectionRule(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_setSelectionRule",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_setSelectionRule", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_setSelectionRule" "', argument " "1"" of type '" "Lattice *""'"); 
   }
   arg1 = reinterpret_cast< Lattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ISelectionRule,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ISelectionRule,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Lattice_setSelectionRule" "', argument " "2"" of type '" "ISelectionRule const &""'"); 
   }
@@ -102424,11 +100278,12 @@ SWIGINTERN PyObject *_wrap_Lattice_createCubicLattice(PyObject *SWIGUNUSEDPARM(s
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_createCubicLattice",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "Lattice_createCubicLattice" "', argument " "1"" of type '" "double""'");
   } 
@@ -102446,11 +100301,12 @@ SWIGINTERN PyObject *_wrap_Lattice_createFCCLattice(PyObject *SWIGUNUSEDPARM(sel
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_createFCCLattice",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "Lattice_createFCCLattice" "', argument " "1"" of type '" "double""'");
   } 
@@ -102471,17 +100327,16 @@ SWIGINTERN PyObject *_wrap_Lattice_createHexagonalLattice(PyObject *SWIGUNUSEDPA
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_createHexagonalLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_createHexagonalLattice", 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 '" "Lattice_createHexagonalLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice_createHexagonalLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -102502,17 +100357,16 @@ SWIGINTERN PyObject *_wrap_Lattice_createHCPLattice(PyObject *SWIGUNUSEDPARM(sel
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_createHCPLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_createHCPLattice", 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 '" "Lattice_createHCPLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice_createHCPLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -102533,17 +100387,16 @@ SWIGINTERN PyObject *_wrap_Lattice_createTetragonalLattice(PyObject *SWIGUNUSEDP
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_createTetragonalLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_createTetragonalLattice", 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 '" "Lattice_createTetragonalLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice_createTetragonalLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -102564,17 +100417,16 @@ SWIGINTERN PyObject *_wrap_Lattice_createBCTLattice(PyObject *SWIGUNUSEDPARM(sel
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice_createBCTLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "Lattice_createBCTLattice", 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 '" "Lattice_createBCTLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice_createBCTLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -102592,10 +100444,11 @@ SWIGINTERN PyObject *_wrap_Lattice_onChange(PyObject *SWIGUNUSEDPARM(self), PyOb
   Lattice *arg1 = (Lattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice_onChange",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice_onChange" "', argument " "1"" of type '" "Lattice *""'"); 
   }
@@ -102610,11 +100463,15 @@ fail:
 
 SWIGINTERN PyObject *Lattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Lattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Lattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_CreateFCCLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -102623,17 +100480,16 @@ SWIGINTERN PyObject *_wrap_CreateFCCLattice(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CreateFCCLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ILatticeOrientation,  0  | 0);
+  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 &""'"); 
   }
@@ -102660,23 +100516,21 @@ SWIGINTERN PyObject *_wrap_CreateHCPLattice(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:CreateHCPLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  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""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ILatticeOrientation,  0  | 0);
+  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 &""'"); 
   }
@@ -102703,23 +100557,21 @@ SWIGINTERN PyObject *_wrap_CreateBCTLattice(PyObject *SWIGUNUSEDPARM(self), PyOb
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   SwigValueWrapper< Lattice > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:CreateBCTLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  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""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ILatticeOrientation,  0  | 0);
+  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 &""'"); 
   }
@@ -102735,11 +100587,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Lattice1DParameters__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Lattice1DParameters__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Lattice1DParameters *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Lattice1DParameters")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Lattice1DParameters *)new Lattice1DParameters();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Lattice1DParameters, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -102748,7 +100600,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Lattice1DParameters__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Lattice1DParameters__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -102756,17 +100608,15 @@ SWIGINTERN PyObject *_wrap_new_Lattice1DParameters__SWIG_1(PyObject *SWIGUNUSEDP
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Lattice1DParameters *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Lattice1DParameters",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Lattice1DParameters" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Lattice1DParameters" "', argument " "2"" of type '" "double""'");
   } 
@@ -102784,15 +100634,11 @@ SWIGINTERN PyObject *_wrap_new_Lattice1DParameters(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Lattice1DParameters", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Lattice1DParameters__SWIG_0(self, args);
+    return _wrap_new_Lattice1DParameters__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -102806,13 +100652,13 @@ SWIGINTERN PyObject *_wrap_new_Lattice1DParameters(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_Lattice1DParameters__SWIG_1(self, args);
+        return _wrap_new_Lattice1DParameters__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Lattice1DParameters'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Lattice1DParameters'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Lattice1DParameters::Lattice1DParameters()\n"
     "    Lattice1DParameters::Lattice1DParameters(double,double)\n");
@@ -102828,16 +100674,15 @@ SWIGINTERN PyObject *_wrap_Lattice1DParameters_m_length_set(PyObject *SWIGUNUSED
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice1DParameters_m_length_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice1DParameters_m_length_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice1DParameters_m_length_set" "', argument " "1"" of type '" "Lattice1DParameters *""'"); 
   }
   arg1 = reinterpret_cast< Lattice1DParameters * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice1DParameters_m_length_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -102855,11 +100700,12 @@ SWIGINTERN PyObject *_wrap_Lattice1DParameters_m_length_get(PyObject *SWIGUNUSED
   Lattice1DParameters *arg1 = (Lattice1DParameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice1DParameters_m_length_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice1DParameters_m_length_get" "', argument " "1"" of type '" "Lattice1DParameters *""'"); 
   }
@@ -102880,16 +100726,15 @@ SWIGINTERN PyObject *_wrap_Lattice1DParameters_m_xi_set(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice1DParameters_m_xi_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice1DParameters_m_xi_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice1DParameters_m_xi_set" "', argument " "1"" of type '" "Lattice1DParameters *""'"); 
   }
   arg1 = reinterpret_cast< Lattice1DParameters * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice1DParameters_m_xi_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -102907,11 +100752,12 @@ SWIGINTERN PyObject *_wrap_Lattice1DParameters_m_xi_get(PyObject *SWIGUNUSEDPARM
   Lattice1DParameters *arg1 = (Lattice1DParameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice1DParameters_m_xi_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice1DParameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice1DParameters_m_xi_get" "', argument " "1"" of type '" "Lattice1DParameters *""'"); 
   }
@@ -102929,10 +100775,11 @@ SWIGINTERN PyObject *_wrap_delete_Lattice1DParameters(PyObject *SWIGUNUSEDPARM(s
   Lattice1DParameters *arg1 = (Lattice1DParameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Lattice1DParameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice1DParameters, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice1DParameters, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Lattice1DParameters" "', argument " "1"" of type '" "Lattice1DParameters *""'"); 
   }
@@ -102947,21 +100794,26 @@ fail:
 
 SWIGINTERN PyObject *Lattice1DParameters_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Lattice1DParameters, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Lattice1DParameters_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_Lattice2D_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_clone" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -102979,11 +100831,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_length1(PyObject *SWIGUNUSEDPARM(self), PyO
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_length1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_length1" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103001,11 +100854,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_length2(PyObject *SWIGUNUSEDPARM(self), PyO
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_length2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_length2" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103023,11 +100877,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_latticeAngle(PyObject *SWIGUNUSEDPARM(self)
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_latticeAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_latticeAngle" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103045,11 +100900,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_unitCellArea(PyObject *SWIGUNUSEDPARM(self)
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_unitCellArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_unitCellArea" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103067,11 +100923,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_rotationAngle(PyObject *SWIGUNUSEDPARM(self
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_rotationAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_rotationAngle" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103089,11 +100946,12 @@ SWIGINTERN PyObject *_wrap_Lattice2D_reciprocalBases(PyObject *SWIGUNUSEDPARM(se
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Lattice2D::ReciprocalBases result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Lattice2D_reciprocalBases",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_reciprocalBases" "', argument " "1"" of type '" "Lattice2D const *""'"); 
   }
@@ -103114,16 +100972,15 @@ SWIGINTERN PyObject *_wrap_Lattice2D_setRotationEnabled(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Lattice2D_setRotationEnabled",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Lattice2D_setRotationEnabled", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Lattice2D_setRotationEnabled" "', argument " "1"" of type '" "Lattice2D *""'"); 
   }
   arg1 = reinterpret_cast< Lattice2D * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Lattice2D_setRotationEnabled" "', argument " "2"" of type '" "bool""'");
   } 
@@ -103141,10 +100998,11 @@ SWIGINTERN PyObject *_wrap_delete_Lattice2D(PyObject *SWIGUNUSEDPARM(self), PyOb
   Lattice2D *arg1 = (Lattice2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Lattice2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Lattice2D, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Lattice2D, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Lattice2D" "', argument " "1"" of type '" "Lattice2D *""'"); 
   }
@@ -103159,12 +101017,12 @@ fail:
 
 SWIGINTERN PyObject *Lattice2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Lattice2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -103178,29 +101036,25 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   BasicLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_BasicLattice",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_BasicLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_BasicLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BasicLattice" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_BasicLattice" "', argument " "4"" of type '" "double""'");
   } 
@@ -103213,7 +101067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -103224,23 +101078,20 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   BasicLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_BasicLattice",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_BasicLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_BasicLattice" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_BasicLattice" "', argument " "3"" of type '" "double""'");
   } 
@@ -103258,13 +101109,9 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_BasicLattice", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     {
@@ -103282,7 +101129,7 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_BasicLattice__SWIG_1(self, args);
+          return _wrap_new_BasicLattice__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -103309,7 +101156,7 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_BasicLattice__SWIG_0(self, args);
+            return _wrap_new_BasicLattice__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -103317,7 +101164,7 @@ SWIGINTERN PyObject *_wrap_new_BasicLattice(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_BasicLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_BasicLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    BasicLattice::BasicLattice(double,double,double,double)\n"
     "    BasicLattice::BasicLattice(double,double,double)\n");
@@ -103330,11 +101177,12 @@ SWIGINTERN PyObject *_wrap_BasicLattice_clone(PyObject *SWIGUNUSEDPARM(self), Py
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   BasicLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:BasicLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_clone" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
@@ -103355,16 +101203,15 @@ SWIGINTERN PyObject *_wrap_BasicLattice_accept(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:BasicLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "BasicLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_accept" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
   arg1 = reinterpret_cast< BasicLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BasicLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -103382,11 +101229,12 @@ SWIGINTERN PyObject *_wrap_BasicLattice_length1(PyObject *SWIGUNUSEDPARM(self),
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:BasicLattice_length1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_length1" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
@@ -103404,11 +101252,12 @@ SWIGINTERN PyObject *_wrap_BasicLattice_length2(PyObject *SWIGUNUSEDPARM(self),
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:BasicLattice_length2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_length2" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
@@ -103426,11 +101275,12 @@ SWIGINTERN PyObject *_wrap_BasicLattice_latticeAngle(PyObject *SWIGUNUSEDPARM(se
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:BasicLattice_latticeAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_latticeAngle" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
@@ -103448,11 +101298,12 @@ SWIGINTERN PyObject *_wrap_BasicLattice_unitCellArea(PyObject *SWIGUNUSEDPARM(se
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:BasicLattice_unitCellArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicLattice_unitCellArea" "', argument " "1"" of type '" "BasicLattice const *""'"); 
   }
@@ -103470,10 +101321,11 @@ SWIGINTERN PyObject *_wrap_delete_BasicLattice(PyObject *SWIGUNUSEDPARM(self), P
   BasicLattice *arg1 = (BasicLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_BasicLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BasicLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_BasicLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BasicLattice" "', argument " "1"" of type '" "BasicLattice *""'"); 
   }
@@ -103488,12 +101340,16 @@ fail:
 
 SWIGINTERN PyObject *BasicLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BasicLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_SquareLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *BasicLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_SquareLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -103501,17 +101357,15 @@ SWIGINTERN PyObject *_wrap_new_SquareLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SquareLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_SquareLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SquareLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SquareLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -103524,16 +101378,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SquareLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SquareLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   SquareLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SquareLattice",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SquareLattice" "', argument " "1"" of type '" "double""'");
   } 
@@ -103551,13 +101404,9 @@ SWIGINTERN PyObject *_wrap_new_SquareLattice(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_SquareLattice", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -103565,7 +101414,7 @@ SWIGINTERN PyObject *_wrap_new_SquareLattice(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_SquareLattice__SWIG_1(self, args);
+      return _wrap_new_SquareLattice__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -103580,13 +101429,13 @@ SWIGINTERN PyObject *_wrap_new_SquareLattice(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_SquareLattice__SWIG_0(self, args);
+        return _wrap_new_SquareLattice__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_SquareLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_SquareLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SquareLattice::SquareLattice(double,double)\n"
     "    SquareLattice::SquareLattice(double)\n");
@@ -103599,11 +101448,12 @@ SWIGINTERN PyObject *_wrap_SquareLattice_clone(PyObject *SWIGUNUSEDPARM(self), P
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SquareLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SquareLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_clone" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
@@ -103624,16 +101474,15 @@ SWIGINTERN PyObject *_wrap_SquareLattice_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SquareLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SquareLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_accept" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
   arg1 = reinterpret_cast< SquareLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SquareLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -103651,11 +101500,12 @@ SWIGINTERN PyObject *_wrap_SquareLattice_length1(PyObject *SWIGUNUSEDPARM(self),
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SquareLattice_length1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_length1" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
@@ -103673,11 +101523,12 @@ SWIGINTERN PyObject *_wrap_SquareLattice_length2(PyObject *SWIGUNUSEDPARM(self),
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SquareLattice_length2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_length2" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
@@ -103695,11 +101546,12 @@ SWIGINTERN PyObject *_wrap_SquareLattice_latticeAngle(PyObject *SWIGUNUSEDPARM(s
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SquareLattice_latticeAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_latticeAngle" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
@@ -103717,11 +101569,12 @@ SWIGINTERN PyObject *_wrap_SquareLattice_unitCellArea(PyObject *SWIGUNUSEDPARM(s
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SquareLattice_unitCellArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SquareLattice_unitCellArea" "', argument " "1"" of type '" "SquareLattice const *""'"); 
   }
@@ -103739,10 +101592,11 @@ SWIGINTERN PyObject *_wrap_delete_SquareLattice(PyObject *SWIGUNUSEDPARM(self),
   SquareLattice *arg1 = (SquareLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SquareLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SquareLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SquareLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SquareLattice" "', argument " "1"" of type '" "SquareLattice *""'"); 
   }
@@ -103757,12 +101611,16 @@ fail:
 
 SWIGINTERN PyObject *SquareLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SquareLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_HexagonalLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SquareLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_HexagonalLattice__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -103770,17 +101628,15 @@ SWIGINTERN PyObject *_wrap_new_HexagonalLattice__SWIG_0(PyObject *SWIGUNUSEDPARM
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   HexagonalLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_HexagonalLattice",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_HexagonalLattice" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_HexagonalLattice" "', argument " "2"" of type '" "double""'");
   } 
@@ -103793,16 +101649,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_HexagonalLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_HexagonalLattice__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   HexagonalLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_HexagonalLattice",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_HexagonalLattice" "', argument " "1"" of type '" "double""'");
   } 
@@ -103820,13 +101675,9 @@ SWIGINTERN PyObject *_wrap_new_HexagonalLattice(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_HexagonalLattice", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     {
@@ -103834,7 +101685,7 @@ SWIGINTERN PyObject *_wrap_new_HexagonalLattice(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_HexagonalLattice__SWIG_1(self, args);
+      return _wrap_new_HexagonalLattice__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -103849,13 +101700,13 @@ SWIGINTERN PyObject *_wrap_new_HexagonalLattice(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_HexagonalLattice__SWIG_0(self, args);
+        return _wrap_new_HexagonalLattice__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_HexagonalLattice'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_HexagonalLattice'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    HexagonalLattice::HexagonalLattice(double,double)\n"
     "    HexagonalLattice::HexagonalLattice(double)\n");
@@ -103868,11 +101719,12 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_clone(PyObject *SWIGUNUSEDPARM(self)
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   HexagonalLattice *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HexagonalLattice_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_clone" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -103893,16 +101745,15 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_accept(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:HexagonalLattice_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "HexagonalLattice_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_accept" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
   arg1 = reinterpret_cast< HexagonalLattice * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HexagonalLattice_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -103920,11 +101771,12 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_length1(PyObject *SWIGUNUSEDPARM(sel
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HexagonalLattice_length1",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_length1" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -103942,11 +101794,12 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_length2(PyObject *SWIGUNUSEDPARM(sel
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HexagonalLattice_length2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_length2" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -103964,11 +101817,12 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_latticeAngle(PyObject *SWIGUNUSEDPAR
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HexagonalLattice_latticeAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_latticeAngle" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -103986,11 +101840,12 @@ SWIGINTERN PyObject *_wrap_HexagonalLattice_unitCellArea(PyObject *SWIGUNUSEDPAR
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HexagonalLattice_unitCellArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HexagonalLattice_unitCellArea" "', argument " "1"" of type '" "HexagonalLattice const *""'"); 
   }
@@ -104008,10 +101863,11 @@ SWIGINTERN PyObject *_wrap_delete_HexagonalLattice(PyObject *SWIGUNUSEDPARM(self
   HexagonalLattice *arg1 = (HexagonalLattice *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_HexagonalLattice",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HexagonalLattice, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HexagonalLattice, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HexagonalLattice" "', argument " "1"" of type '" "HexagonalLattice *""'"); 
   }
@@ -104026,12 +101882,16 @@ fail:
 
 SWIGINTERN PyObject *HexagonalLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_HexagonalLattice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Layer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HexagonalLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Layer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > arg1 ;
   double arg2 ;
@@ -104039,13 +101899,11 @@ SWIGINTERN PyObject *_wrap_new_Layer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Layer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Layer",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Layer" "', argument " "1"" of type '" "Material""'"); 
     }  
@@ -104057,7 +101915,7 @@ SWIGINTERN PyObject *_wrap_new_Layer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       if (SWIG_IsNewObj(res1)) delete temp;
     }
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Layer" "', argument " "2"" of type '" "double""'");
   } 
@@ -104070,17 +101928,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Layer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Layer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Layer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Layer",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Layer" "', argument " "1"" of type '" "Material""'"); 
     }  
@@ -104105,24 +101962,20 @@ SWIGINTERN PyObject *_wrap_new_Layer(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Layer", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Layer__SWIG_1(self, args);
+      return _wrap_new_Layer__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -104130,13 +101983,13 @@ SWIGINTERN PyObject *_wrap_new_Layer(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_Layer__SWIG_0(self, args);
+        return _wrap_new_Layer__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Layer'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Layer'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Layer::Layer(Material,double)\n"
     "    Layer::Layer(Material)\n");
@@ -104149,10 +102002,11 @@ SWIGINTERN PyObject *_wrap_delete_Layer(PyObject *SWIGUNUSEDPARM(self), PyObject
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Layer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Layer" "', argument " "1"" of type '" "Layer *""'"); 
   }
@@ -104170,11 +102024,12 @@ SWIGINTERN PyObject *_wrap_Layer_clone(PyObject *SWIGUNUSEDPARM(self), PyObject
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Layer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_clone" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104195,16 +102050,15 @@ SWIGINTERN PyObject *_wrap_Layer_accept(PyObject *SWIGUNUSEDPARM(self), PyObject
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Layer_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_accept" "', argument " "1"" of type '" "Layer const *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Layer_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -104225,16 +102079,15 @@ SWIGINTERN PyObject *_wrap_Layer_setThickness(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_setThickness",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Layer_setThickness", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_setThickness" "', argument " "1"" of type '" "Layer *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Layer_setThickness" "', argument " "2"" of type '" "double""'");
   } 
@@ -104252,11 +102105,12 @@ SWIGINTERN PyObject *_wrap_Layer_thickness(PyObject *SWIGUNUSEDPARM(self), PyObj
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_thickness",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_thickness" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104274,11 +102128,12 @@ SWIGINTERN PyObject *_wrap_Layer_material(PyObject *SWIGUNUSEDPARM(self), PyObje
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Material *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_material" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104299,17 +102154,16 @@ SWIGINTERN PyObject *_wrap_Layer_setMaterial(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_setMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Layer_setMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_setMaterial" "', argument " "1"" of type '" "Layer *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Layer_setMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -104337,16 +102191,15 @@ SWIGINTERN PyObject *_wrap_Layer_addLayout(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_addLayout",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Layer_addLayout", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_addLayout" "', argument " "1"" of type '" "Layer *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ILayout,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ILayout,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Layer_addLayout" "', argument " "2"" of type '" "ILayout const &""'"); 
   }
@@ -104367,11 +102220,12 @@ SWIGINTERN PyObject *_wrap_Layer_numberOfLayouts(PyObject *SWIGUNUSEDPARM(self),
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_numberOfLayouts",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_numberOfLayouts" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104389,11 +102243,12 @@ SWIGINTERN PyObject *_wrap_Layer_layouts(PyObject *SWIGUNUSEDPARM(self), PyObjec
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< ILayout const *,std::allocator< ILayout const * > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_layouts",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_layouts" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104411,11 +102266,12 @@ SWIGINTERN PyObject *_wrap_Layer_getChildren(PyObject *SWIGUNUSEDPARM(self), PyO
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_getChildren" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104428,7 +102284,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Layer_registerThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Layer_registerThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Layer *arg1 = (Layer *) 0 ;
   bool arg2 ;
@@ -104436,16 +102292,14 @@ SWIGINTERN PyObject *_wrap_Layer_registerThickness__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_registerThickness",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_registerThickness" "', argument " "1"" of type '" "Layer *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Layer_registerThickness" "', argument " "2"" of type '" "bool""'");
   } 
@@ -104458,15 +102312,14 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Layer_registerThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Layer_registerThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_registerThickness",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_registerThickness" "', argument " "1"" of type '" "Layer *""'"); 
   }
@@ -104484,20 +102337,16 @@ SWIGINTERN PyObject *_wrap_Layer_registerThickness(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Layer_registerThickness", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Layer, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Layer_registerThickness__SWIG_1(self, args);
+      return _wrap_Layer_registerThickness__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -104511,13 +102360,13 @@ SWIGINTERN PyObject *_wrap_Layer_registerThickness(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_Layer_registerThickness__SWIG_0(self, args);
+        return _wrap_Layer_registerThickness__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Layer_registerThickness'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Layer_registerThickness'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Layer::registerThickness(bool)\n"
     "    Layer::registerThickness()\n");
@@ -104533,16 +102382,15 @@ SWIGINTERN PyObject *_wrap_Layer_setNumberOfSlices(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Layer_setNumberOfSlices",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Layer_setNumberOfSlices", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_setNumberOfSlices" "', argument " "1"" of type '" "Layer *""'"); 
   }
   arg1 = reinterpret_cast< Layer * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Layer_setNumberOfSlices" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -104560,11 +102408,12 @@ SWIGINTERN PyObject *_wrap_Layer_numberOfSlices(PyObject *SWIGUNUSEDPARM(self),
   Layer *arg1 = (Layer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Layer_numberOfSlices",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Layer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_numberOfSlices" "', argument " "1"" of type '" "Layer const *""'"); 
   }
@@ -104579,16 +102428,20 @@ fail:
 
 SWIGINTERN PyObject *Layer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Layer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_LayerRoughness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Layer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_LayerRoughness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   LayerRoughness *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_LayerRoughness")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (LayerRoughness *)new LayerRoughness();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_LayerRoughness, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -104597,7 +102450,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_LayerRoughness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_LayerRoughness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -104608,23 +102461,20 @@ SWIGINTERN PyObject *_wrap_new_LayerRoughness__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   LayerRoughness *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_LayerRoughness",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_LayerRoughness" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_LayerRoughness" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_LayerRoughness" "', argument " "3"" of type '" "double""'");
   } 
@@ -104642,15 +102492,11 @@ SWIGINTERN PyObject *_wrap_new_LayerRoughness(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_LayerRoughness", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_LayerRoughness__SWIG_0(self, args);
+    return _wrap_new_LayerRoughness__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
     int _v;
@@ -104669,14 +102515,14 @@ SWIGINTERN PyObject *_wrap_new_LayerRoughness(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_LayerRoughness__SWIG_1(self, args);
+          return _wrap_new_LayerRoughness__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_LayerRoughness'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_LayerRoughness'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    LayerRoughness::LayerRoughness()\n"
     "    LayerRoughness::LayerRoughness(double,double,double)\n");
@@ -104689,11 +102535,12 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_clone(PyObject *SWIGUNUSEDPARM(self),
   LayerRoughness *arg1 = (LayerRoughness *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   LayerRoughness *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LayerRoughness_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_clone" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
@@ -104714,16 +102561,15 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_accept" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LayerRoughness_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -104744,18 +102590,17 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_getSpectralFun(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_getSpectralFun",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_getSpectralFun", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_getSpectralFun" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LayerRoughness_getSpectralFun" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -104783,18 +102628,17 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_getCorrFun(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_getCorrFun",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_getCorrFun", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_getCorrFun" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LayerRoughness_getCorrFun" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -104822,16 +102666,15 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_setSigma(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_setSigma",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_setSigma", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_setSigma" "', argument " "1"" of type '" "LayerRoughness *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "LayerRoughness_setSigma" "', argument " "2"" of type '" "double""'");
   } 
@@ -104849,11 +102692,12 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_getSigma(PyObject *SWIGUNUSEDPARM(self
   LayerRoughness *arg1 = (LayerRoughness *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LayerRoughness_getSigma",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_getSigma" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
@@ -104874,16 +102718,15 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_setHurstParameter(PyObject *SWIGUNUSED
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_setHurstParameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_setHurstParameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_setHurstParameter" "', argument " "1"" of type '" "LayerRoughness *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "LayerRoughness_setHurstParameter" "', argument " "2"" of type '" "double""'");
   } 
@@ -104901,11 +102744,12 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_getHurstParameter(PyObject *SWIGUNUSED
   LayerRoughness *arg1 = (LayerRoughness *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LayerRoughness_getHurstParameter",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_getHurstParameter" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
@@ -104926,16 +102770,15 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_setLatteralCorrLength(PyObject *SWIGUN
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:LayerRoughness_setLatteralCorrLength",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "LayerRoughness_setLatteralCorrLength", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_setLatteralCorrLength" "', argument " "1"" of type '" "LayerRoughness *""'"); 
   }
   arg1 = reinterpret_cast< LayerRoughness * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "LayerRoughness_setLatteralCorrLength" "', argument " "2"" of type '" "double""'");
   } 
@@ -104953,11 +102796,12 @@ SWIGINTERN PyObject *_wrap_LayerRoughness_getLatteralCorrLength(PyObject *SWIGUN
   LayerRoughness *arg1 = (LayerRoughness *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:LayerRoughness_getLatteralCorrLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LayerRoughness_getLatteralCorrLength" "', argument " "1"" of type '" "LayerRoughness const *""'"); 
   }
@@ -104975,10 +102819,11 @@ SWIGINTERN PyObject *_wrap_delete_LayerRoughness(PyObject *SWIGUNUSEDPARM(self),
   LayerRoughness *arg1 = (LayerRoughness *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_LayerRoughness",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_LayerRoughness, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_LayerRoughness, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_LayerRoughness" "', argument " "1"" of type '" "LayerRoughness *""'"); 
   }
@@ -104993,11 +102838,15 @@ fail:
 
 SWIGINTERN PyObject *LayerRoughness_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_LayerRoughness, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *LayerRoughness_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_Line(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -105012,29 +102861,26 @@ SWIGINTERN PyObject *_wrap_new_Line(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   Line *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_Line",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_Line", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Line" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Line" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Line" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Line" "', argument " "4"" of type '" "double""'");
   } 
@@ -105052,11 +102898,12 @@ SWIGINTERN PyObject *_wrap_Line_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *
   Line *arg1 = (Line *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Line *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Line_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Line, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Line, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Line_clone" "', argument " "1"" of type '" "Line const *""'"); 
   }
@@ -105069,7 +102916,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Line_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Line_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Line *arg1 = (Line *) 0 ;
   double arg2 ;
@@ -105080,23 +102927,20 @@ SWIGINTERN PyObject *_wrap_Line_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Line_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Line, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Line, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Line_contains" "', argument " "1"" of type '" "Line const *""'"); 
   }
   arg1 = reinterpret_cast< Line * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Line_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Line_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -105109,7 +102953,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Line_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Line_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Line *arg1 = (Line *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -105120,18 +102964,15 @@ SWIGINTERN PyObject *_wrap_Line_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Line_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Line, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Line, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Line_contains" "', argument " "1"" of type '" "Line const *""'"); 
   }
   arg1 = reinterpret_cast< Line * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Line_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -105139,7 +102980,7 @@ SWIGINTERN PyObject *_wrap_Line_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Line_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Line_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -105160,26 +103001,22 @@ SWIGINTERN PyObject *_wrap_Line_contains(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Line_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Line, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Line_contains__SWIG_1(self, args);
+          return _wrap_Line_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -105200,14 +103037,14 @@ SWIGINTERN PyObject *_wrap_Line_contains(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Line_contains__SWIG_0(self, args);
+          return _wrap_Line_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Line_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Line_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Line::contains(double,double) const\n"
     "    Line::contains(Bin1D const &,Bin1D const &) const\n");
@@ -105220,10 +103057,11 @@ SWIGINTERN PyObject *_wrap_delete_Line(PyObject *SWIGUNUSEDPARM(self), PyObject
   Line *arg1 = (Line *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Line",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Line, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Line, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Line" "', argument " "1"" of type '" "Line *""'"); 
   }
@@ -105238,21 +103076,26 @@ fail:
 
 SWIGINTERN PyObject *Line_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Line, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Line_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_VerticalLine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VerticalLine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_VerticalLine",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_VerticalLine" "', argument " "1"" of type '" "double""'");
   } 
@@ -105270,11 +103113,12 @@ SWIGINTERN PyObject *_wrap_VerticalLine_clone(PyObject *SWIGUNUSEDPARM(self), Py
   VerticalLine *arg1 = (VerticalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   VerticalLine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VerticalLine_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VerticalLine_clone" "', argument " "1"" of type '" "VerticalLine const *""'"); 
   }
@@ -105287,7 +103131,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   VerticalLine *arg1 = (VerticalLine *) 0 ;
   double arg2 ;
@@ -105298,23 +103142,20 @@ SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_0(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VerticalLine_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VerticalLine_contains" "', argument " "1"" of type '" "VerticalLine const *""'"); 
   }
   arg1 = reinterpret_cast< VerticalLine * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VerticalLine_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "VerticalLine_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -105327,7 +103168,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   VerticalLine *arg1 = (VerticalLine *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -105338,18 +103179,15 @@ SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:VerticalLine_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VerticalLine_contains" "', argument " "1"" of type '" "VerticalLine const *""'"); 
   }
   arg1 = reinterpret_cast< VerticalLine * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VerticalLine_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -105357,7 +103195,7 @@ SWIGINTERN PyObject *_wrap_VerticalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "VerticalLine_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "VerticalLine_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -105378,26 +103216,22 @@ SWIGINTERN PyObject *_wrap_VerticalLine_contains(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "VerticalLine_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VerticalLine, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_VerticalLine_contains__SWIG_1(self, args);
+          return _wrap_VerticalLine_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -105418,14 +103252,14 @@ SWIGINTERN PyObject *_wrap_VerticalLine_contains(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_VerticalLine_contains__SWIG_0(self, args);
+          return _wrap_VerticalLine_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'VerticalLine_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VerticalLine_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    VerticalLine::contains(double,double) const\n"
     "    VerticalLine::contains(Bin1D const &,Bin1D const &) const\n");
@@ -105438,11 +103272,12 @@ SWIGINTERN PyObject *_wrap_VerticalLine_getXpos(PyObject *SWIGUNUSEDPARM(self),
   VerticalLine *arg1 = (VerticalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:VerticalLine_getXpos",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VerticalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VerticalLine_getXpos" "', argument " "1"" of type '" "VerticalLine const *""'"); 
   }
@@ -105460,10 +103295,11 @@ SWIGINTERN PyObject *_wrap_delete_VerticalLine(PyObject *SWIGUNUSEDPARM(self), P
   VerticalLine *arg1 = (VerticalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_VerticalLine",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VerticalLine, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_VerticalLine, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VerticalLine" "', argument " "1"" of type '" "VerticalLine *""'"); 
   }
@@ -105478,21 +103314,26 @@ fail:
 
 SWIGINTERN PyObject *VerticalLine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_VerticalLine, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *VerticalLine_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_HorizontalLine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   HorizontalLine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_HorizontalLine",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "new_HorizontalLine" "', argument " "1"" of type '" "double""'");
   } 
@@ -105510,11 +103351,12 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_clone(PyObject *SWIGUNUSEDPARM(self),
   HorizontalLine *arg1 = (HorizontalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   HorizontalLine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HorizontalLine_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HorizontalLine_clone" "', argument " "1"" of type '" "HorizontalLine const *""'"); 
   }
@@ -105527,7 +103369,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   HorizontalLine *arg1 = (HorizontalLine *) 0 ;
   double arg2 ;
@@ -105538,23 +103380,20 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_0(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:HorizontalLine_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HorizontalLine_contains" "', argument " "1"" of type '" "HorizontalLine const *""'"); 
   }
   arg1 = reinterpret_cast< HorizontalLine * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HorizontalLine_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HorizontalLine_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -105567,7 +103406,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   HorizontalLine *arg1 = (HorizontalLine *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -105578,18 +103417,15 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_1(PyObject *SWIGUNUSEDP
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:HorizontalLine_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HorizontalLine_contains" "', argument " "1"" of type '" "HorizontalLine const *""'"); 
   }
   arg1 = reinterpret_cast< HorizontalLine * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HorizontalLine_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -105597,7 +103433,7 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_contains__SWIG_1(PyObject *SWIGUNUSEDP
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HorizontalLine_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HorizontalLine_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -105618,26 +103454,22 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_contains(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "HorizontalLine_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_HorizontalLine, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_HorizontalLine_contains__SWIG_1(self, args);
+          return _wrap_HorizontalLine_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -105658,14 +103490,14 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_contains(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_HorizontalLine_contains__SWIG_0(self, args);
+          return _wrap_HorizontalLine_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'HorizontalLine_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'HorizontalLine_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    HorizontalLine::contains(double,double) const\n"
     "    HorizontalLine::contains(Bin1D const &,Bin1D const &) const\n");
@@ -105678,11 +103510,12 @@ SWIGINTERN PyObject *_wrap_HorizontalLine_getYpos(PyObject *SWIGUNUSEDPARM(self)
   HorizontalLine *arg1 = (HorizontalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:HorizontalLine_getYpos",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HorizontalLine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HorizontalLine_getYpos" "', argument " "1"" of type '" "HorizontalLine const *""'"); 
   }
@@ -105700,10 +103533,11 @@ SWIGINTERN PyObject *_wrap_delete_HorizontalLine(PyObject *SWIGUNUSEDPARM(self),
   HorizontalLine *arg1 = (HorizontalLine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_HorizontalLine",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HorizontalLine, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_HorizontalLine, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HorizontalLine" "', argument " "1"" of type '" "HorizontalLine *""'"); 
   }
@@ -105718,21 +103552,24 @@ fail:
 
 SWIGINTERN PyObject *HorizontalLine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_HorizontalLine, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Material__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *HorizontalLine_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Material__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Material *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Material *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Material" "', argument " "1"" of type '" "Material const &""'"); 
   }
@@ -105748,16 +103585,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Material__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Material__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Material *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Material *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Material" "', argument " "1"" of type '" "Material &&""'"); 
   }
@@ -105778,33 +103614,29 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Material", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Material__SWIG_0(self, args);
+      return _wrap_new_Material__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Material__SWIG_1(self, args);
+      return _wrap_new_Material__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Material'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Material'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Material::Material(Material const &)\n"
     "    Material::Material(Material &&)\n");
@@ -105817,11 +103649,12 @@ SWIGINTERN PyObject *_wrap_Material_inverted(PyObject *SWIGUNUSEDPARM(self), PyO
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_inverted",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_inverted" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -105842,17 +103675,16 @@ SWIGINTERN PyObject *_wrap_Material_refractiveIndex(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Material_refractiveIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Material_refractiveIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_refractiveIndex" "', argument " "1"" of type '" "Material const *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_refractiveIndex" "', argument " "2"" of type '" "double""'");
   } 
@@ -105873,17 +103705,16 @@ SWIGINTERN PyObject *_wrap_Material_refractiveIndex2(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Material_refractiveIndex2",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Material_refractiveIndex2", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_refractiveIndex2" "', argument " "1"" of type '" "Material const *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_refractiveIndex2" "', argument " "2"" of type '" "double""'");
   } 
@@ -105901,11 +103732,12 @@ SWIGINTERN PyObject *_wrap_Material_isScalarMaterial(PyObject *SWIGUNUSEDPARM(se
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_isScalarMaterial",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_isScalarMaterial" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -105923,11 +103755,12 @@ SWIGINTERN PyObject *_wrap_Material_isMagneticMaterial(PyObject *SWIGUNUSEDPARM(
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_isMagneticMaterial",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_isMagneticMaterial" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -105945,11 +103778,12 @@ SWIGINTERN PyObject *_wrap_Material_getName(PyObject *SWIGUNUSEDPARM(self), PyOb
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_getName" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -105967,11 +103801,12 @@ SWIGINTERN PyObject *_wrap_Material_magnetization(PyObject *SWIGUNUSEDPARM(self)
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_magnetization",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_magnetization" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -105989,11 +103824,12 @@ SWIGINTERN PyObject *_wrap_Material_materialData(PyObject *SWIGUNUSEDPARM(self),
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_materialData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_materialData" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -106011,11 +103847,12 @@ SWIGINTERN PyObject *_wrap_Material_isEmpty(PyObject *SWIGUNUSEDPARM(self), PyOb
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_isEmpty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_isEmpty" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -106033,11 +103870,12 @@ SWIGINTERN PyObject *_wrap_Material_isDefaultMaterial(PyObject *SWIGUNUSEDPARM(s
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Material_isDefaultMaterial",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_isDefaultMaterial" "', argument " "1"" of type '" "Material const *""'"); 
   }
@@ -106058,17 +103896,16 @@ SWIGINTERN PyObject *_wrap_Material_scalarSubtrSLD(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   complex_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Material_scalarSubtrSLD",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Material_scalarSubtrSLD", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_scalarSubtrSLD" "', argument " "1"" of type '" "Material const *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_WavevectorInfo,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Material_scalarSubtrSLD" "', argument " "2"" of type '" "WavevectorInfo const &""'"); 
   }
@@ -106092,17 +103929,16 @@ SWIGINTERN PyObject *_wrap_Material_transformedMaterial(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Material_transformedMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Material_transformedMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_transformedMaterial" "', argument " "1"" of type '" "Material const *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Transform3D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Material_transformedMaterial" "', argument " "2"" of type '" "Transform3D const &""'"); 
   }
@@ -106123,10 +103959,11 @@ SWIGINTERN PyObject *_wrap_delete_Material(PyObject *SWIGUNUSEDPARM(self), PyObj
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Material" "', argument " "1"" of type '" "Material *""'"); 
   }
@@ -106141,16 +103978,20 @@ fail:
 
 SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Material, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Material_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)":HomogeneousMaterial")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = HomogeneousMaterial();
   resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -106159,7 +104000,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -106172,16 +104013,12 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(
   int ecode3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:HomogeneousMaterial",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106190,18 +104027,18 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HomogeneousMaterial" "', argument " "4"" of type '" "kvector_t""'"); 
     }  
@@ -106223,7 +104060,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -106233,15 +104070,12 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106250,12 +104084,12 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
   } 
@@ -106270,7 +104104,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   complex_t arg2 ;
@@ -106280,15 +104114,12 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106297,13 +104128,13 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
   } 
   arg2 = static_cast< complex_t >(val2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "HomogeneousMaterial" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -106325,21 +104156,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   complex_t arg2 ;
   int res1 = SWIG_OLDOBJ ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106348,7 +104177,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_4(PyObject *SWIGUNUSEDPARM(
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
   } 
@@ -106368,15 +104197,11 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "HomogeneousMaterial", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_HomogeneousMaterial__SWIG_0(self, args);
+    return _wrap_HomogeneousMaterial__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -106388,7 +104213,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_HomogeneousMaterial__SWIG_4(self, args);
+        return _wrap_HomogeneousMaterial__SWIG_4(self, argc, argv);
       }
     }
   }
@@ -106407,7 +104232,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_HomogeneousMaterial__SWIG_2(self, args);
+          return _wrap_HomogeneousMaterial__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -106422,10 +104247,10 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_HomogeneousMaterial__SWIG_3(self, args);
+          return _wrap_HomogeneousMaterial__SWIG_3(self, argc, argv);
         }
       }
     }
@@ -106445,10 +104270,10 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_HomogeneousMaterial__SWIG_1(self, args);
+            return _wrap_HomogeneousMaterial__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -106456,7 +104281,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'HomogeneousMaterial'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'HomogeneousMaterial'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    HomogeneousMaterial()\n"
     "    HomogeneousMaterial(std::string const &,double,double,kvector_t)\n"
@@ -106467,11 +104292,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)":MaterialBySLD")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = MaterialBySLD();
   resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -106480,7 +104305,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -106493,16 +104318,12 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int ecode3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:MaterialBySLD",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialBySLD" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106511,18 +104332,18 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MaterialBySLD" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MaterialBySLD" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "MaterialBySLD" "', argument " "4"" of type '" "kvector_t""'"); 
     }  
@@ -106544,7 +104365,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -106554,15 +104375,12 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   SwigValueWrapper< Material > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:MaterialBySLD",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialBySLD" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -106571,12 +104389,12 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MaterialBySLD" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MaterialBySLD" "', argument " "3"" of type '" "double""'");
   } 
@@ -106596,15 +104414,11 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "MaterialBySLD", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_MaterialBySLD__SWIG_0(self, args);
+    return _wrap_MaterialBySLD__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
     int _v;
@@ -106621,7 +104435,7 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_MaterialBySLD__SWIG_2(self, args);
+          return _wrap_MaterialBySLD__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -106641,10 +104455,10 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_MaterialBySLD__SWIG_1(self, args);
+            return _wrap_MaterialBySLD__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -106652,7 +104466,7 @@ SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MaterialBySLD'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'MaterialBySLD'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MaterialBySLD()\n"
     "    MaterialBySLD(std::string const &,double,double,kvector_t)\n"
@@ -106669,12 +104483,11 @@ SWIGINTERN PyObject *_wrap_new_MesoCrystal(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   MesoCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_MesoCrystal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IClusteredParticles,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_MesoCrystal", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IClusteredParticles,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MesoCrystal" "', argument " "1"" of type '" "IClusteredParticles const &""'"); 
   }
@@ -106682,7 +104495,7 @@ SWIGINTERN PyObject *_wrap_new_MesoCrystal(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MesoCrystal" "', argument " "1"" of type '" "IClusteredParticles const &""'"); 
   }
   arg1 = reinterpret_cast< IClusteredParticles * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_MesoCrystal" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -106703,10 +104516,11 @@ SWIGINTERN PyObject *_wrap_delete_MesoCrystal(PyObject *SWIGUNUSEDPARM(self), Py
   MesoCrystal *arg1 = (MesoCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MesoCrystal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MesoCrystal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MesoCrystal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MesoCrystal" "', argument " "1"" of type '" "MesoCrystal *""'"); 
   }
@@ -106724,11 +104538,12 @@ SWIGINTERN PyObject *_wrap_MesoCrystal_clone(PyObject *SWIGUNUSEDPARM(self), PyO
   MesoCrystal *arg1 = (MesoCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   MesoCrystal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MesoCrystal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MesoCrystal_clone" "', argument " "1"" of type '" "MesoCrystal const *""'"); 
   }
@@ -106749,16 +104564,15 @@ SWIGINTERN PyObject *_wrap_MesoCrystal_accept(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MesoCrystal_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MesoCrystal_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MesoCrystal_accept" "', argument " "1"" of type '" "MesoCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< MesoCrystal * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MesoCrystal_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -106779,18 +104593,17 @@ SWIGINTERN PyObject *_wrap_MesoCrystal_createSlicedParticle(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SlicedParticle result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MesoCrystal_createSlicedParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MesoCrystal_createSlicedParticle", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MesoCrystal_createSlicedParticle" "', argument " "1"" of type '" "MesoCrystal const *""'"); 
   }
   arg1 = reinterpret_cast< MesoCrystal * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MesoCrystal_createSlicedParticle" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -106817,11 +104630,12 @@ SWIGINTERN PyObject *_wrap_MesoCrystal_getChildren(PyObject *SWIGUNUSEDPARM(self
   MesoCrystal *arg1 = (MesoCrystal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MesoCrystal_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MesoCrystal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MesoCrystal_getChildren" "', argument " "1"" of type '" "MesoCrystal const *""'"); 
   }
@@ -106836,16 +104650,20 @@ fail:
 
 SWIGINTERN PyObject *MesoCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MesoCrystal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *MesoCrystal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_MultiLayer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_MultiLayer")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_MultiLayer", 0, 0, 0)) SWIG_fail;
   result = (MultiLayer *)new MultiLayer();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MultiLayer, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -106859,10 +104677,11 @@ SWIGINTERN PyObject *_wrap_delete_MultiLayer(PyObject *SWIGUNUSEDPARM(self), PyO
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MultiLayer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MultiLayer" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
@@ -106880,11 +104699,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_clone(PyObject *SWIGUNUSEDPARM(self), PyOb
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_clone" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -106905,16 +104725,15 @@ SWIGINTERN PyObject *_wrap_MultiLayer_accept(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_accept" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MultiLayer_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -106932,11 +104751,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_numberOfLayers(PyObject *SWIGUNUSEDPARM(se
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_numberOfLayers",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_numberOfLayers" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -106957,16 +104777,15 @@ SWIGINTERN PyObject *_wrap_MultiLayer_addLayer(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_addLayer",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_addLayer", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_addLayer" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Layer,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Layer,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MultiLayer_addLayer" "', argument " "2"" of type '" "Layer const &""'"); 
   }
@@ -106993,17 +104812,15 @@ SWIGINTERN PyObject *_wrap_MultiLayer_addLayerWithTopRoughness(PyObject *SWIGUNU
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:MultiLayer_addLayerWithTopRoughness",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_addLayerWithTopRoughness", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_addLayerWithTopRoughness" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Layer,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Layer,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MultiLayer_addLayerWithTopRoughness" "', argument " "2"" of type '" "Layer const &""'"); 
   }
@@ -107011,7 +104828,7 @@ SWIGINTERN PyObject *_wrap_MultiLayer_addLayerWithTopRoughness(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MultiLayer_addLayerWithTopRoughness" "', argument " "2"" of type '" "Layer const &""'"); 
   }
   arg2 = reinterpret_cast< Layer * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_LayerRoughness,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_LayerRoughness,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "MultiLayer_addLayerWithTopRoughness" "', argument " "3"" of type '" "LayerRoughness const &""'"); 
   }
@@ -107035,17 +104852,16 @@ SWIGINTERN PyObject *_wrap_MultiLayer_layer(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Layer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_layer",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_layer", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_layer" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MultiLayer_layer" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -107066,17 +104882,16 @@ SWIGINTERN PyObject *_wrap_MultiLayer_layerInterface(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   LayerInterface *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_layerInterface",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_layerInterface", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_layerInterface" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MultiLayer_layerInterface" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -107097,16 +104912,15 @@ SWIGINTERN PyObject *_wrap_MultiLayer_setCrossCorrLength(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_setCrossCorrLength",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_setCrossCorrLength", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_setCrossCorrLength" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MultiLayer_setCrossCorrLength" "', argument " "2"" of type '" "double""'");
   } 
@@ -107124,11 +104938,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_crossCorrLength(PyObject *SWIGUNUSEDPARM(s
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_crossCorrLength",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_crossCorrLength" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -107149,17 +104964,16 @@ SWIGINTERN PyObject *_wrap_MultiLayer_setExternalField(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_setExternalField",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_setExternalField", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_setExternalField" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MultiLayer_setExternalField" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -107184,11 +104998,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_externalField(PyObject *SWIGUNUSEDPARM(sel
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_externalField",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_externalField" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -107206,11 +105021,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_getChildren(PyObject *SWIGUNUSEDPARM(self)
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_getChildren" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -107231,16 +105047,15 @@ SWIGINTERN PyObject *_wrap_MultiLayer_setRoughnessModel(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_setRoughnessModel",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MultiLayer_setRoughnessModel", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_setRoughnessModel" "', argument " "1"" of type '" "MultiLayer *""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MultiLayer_setRoughnessModel" "', argument " "2"" of type '" "RoughnessModel""'");
   } 
@@ -107258,11 +105073,12 @@ SWIGINTERN PyObject *_wrap_MultiLayer_roughnessModel(PyObject *SWIGUNUSEDPARM(se
   MultiLayer *arg1 = (MultiLayer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RoughnessModel result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MultiLayer_roughnessModel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MultiLayer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_roughnessModel" "', argument " "1"" of type '" "MultiLayer const *""'"); 
   }
@@ -107277,11 +105093,15 @@ fail:
 
 SWIGINTERN PyObject *MultiLayer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MultiLayer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *MultiLayer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_MaterialProfile_cpp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   MultiLayer *arg1 = 0 ;
@@ -107296,14 +105116,11 @@ SWIGINTERN PyObject *_wrap_MaterialProfile_cpp(PyObject *SWIGUNUSEDPARM(self), P
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   std::vector< complex_t,std::allocator< complex_t > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:MaterialProfile_cpp",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "MaterialProfile_cpp", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialProfile_cpp" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -107311,17 +105128,17 @@ SWIGINTERN PyObject *_wrap_MaterialProfile_cpp(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MaterialProfile_cpp" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
   arg1 = reinterpret_cast< MultiLayer * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MaterialProfile_cpp" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MaterialProfile_cpp" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "MaterialProfile_cpp" "', argument " "4"" of type '" "double""'");
   } 
@@ -107339,11 +105156,12 @@ SWIGINTERN PyObject *_wrap_DefaultMaterialProfileLimits(PyObject *SWIGUNUSEDPARM
   MultiLayer *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::pair< double,double > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DefaultMaterialProfileLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DefaultMaterialProfileLimits" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -107370,23 +105188,21 @@ SWIGINTERN PyObject *_wrap_GenerateZValues(PyObject *SWIGUNUSEDPARM(self), PyObj
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:GenerateZValues",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "GenerateZValues", 3, 3, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GenerateZValues" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GenerateZValues" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GenerateZValues" "', argument " "3"" of type '" "double""'");
   } 
@@ -107399,11 +105215,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   OffSpecSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_OffSpecSimulation")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (OffSpecSimulation *)new OffSpecSimulation();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -107412,16 +105228,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   MultiLayer *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   OffSpecSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_OffSpecSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -107437,20 +105252,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_OffSpecSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::shared_ptr< IMultiLayerBuilder > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   OffSpecSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_OffSpecSimulation",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_OffSpecSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'");
     }
     if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1));
     if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
@@ -107468,22 +105282,18 @@ SWIGINTERN PyObject *_wrap_new_OffSpecSimulation(PyObject *self, PyObject *args)
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_OffSpecSimulation", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_OffSpecSimulation__SWIG_0(self, args);
+    return _wrap_new_OffSpecSimulation__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_OffSpecSimulation__SWIG_1(self, args);
+      return _wrap_new_OffSpecSimulation__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -107491,12 +105301,12 @@ SWIGINTERN PyObject *_wrap_new_OffSpecSimulation(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_OffSpecSimulation__SWIG_2(self, args);
+      return _wrap_new_OffSpecSimulation__SWIG_2(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_OffSpecSimulation'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_OffSpecSimulation'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OffSpecSimulation::OffSpecSimulation()\n"
     "    OffSpecSimulation::OffSpecSimulation(MultiLayer const &)\n"
@@ -107510,10 +105320,11 @@ SWIGINTERN PyObject *_wrap_delete_OffSpecSimulation(PyObject *SWIGUNUSEDPARM(sel
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_OffSpecSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_OffSpecSimulation" "', argument " "1"" of type '" "OffSpecSimulation *""'"); 
   }
@@ -107531,11 +105342,12 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_clone(PyObject *SWIGUNUSEDPARM(self
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OffSpecSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:OffSpecSimulation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_clone" "', argument " "1"" of type '" "OffSpecSimulation const *""'"); 
   }
@@ -107556,16 +105368,15 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:OffSpecSimulation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "OffSpecSimulation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_accept" "', argument " "1"" of type '" "OffSpecSimulation const *""'"); 
   }
   arg1 = reinterpret_cast< OffSpecSimulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OffSpecSimulation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -107583,10 +105394,11 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_prepareSimulation(PyObject *SWIGUNU
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:OffSpecSimulation_prepareSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_prepareSimulation" "', argument " "1"" of type '" "OffSpecSimulation *""'"); 
   }
@@ -107604,11 +105416,12 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_result(PyObject *SWIGUNUSEDPARM(sel
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:OffSpecSimulation_result",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_result" "', argument " "1"" of type '" "OffSpecSimulation const *""'"); 
   }
@@ -107635,23 +105448,20 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_setBeamParameters(PyObject *SWIGUNU
   int res3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:OffSpecSimulation_setBeamParameters",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "OffSpecSimulation_setBeamParameters", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_setBeamParameters" "', argument " "1"" of type '" "OffSpecSimulation *""'"); 
   }
   arg1 = reinterpret_cast< OffSpecSimulation * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OffSpecSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IAxis,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "OffSpecSimulation_setBeamParameters" "', argument " "3"" of type '" "IAxis const &""'"); 
   }
@@ -107659,7 +105469,7 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_setBeamParameters(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OffSpecSimulation_setBeamParameters" "', argument " "3"" of type '" "IAxis const &""'"); 
   }
   arg3 = reinterpret_cast< IAxis * >(argp3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "OffSpecSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
   } 
@@ -107677,11 +105487,12 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_beamAxis(PyObject *SWIGUNUSEDPARM(s
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:OffSpecSimulation_beamAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_beamAxis" "', argument " "1"" of type '" "OffSpecSimulation const *""'"); 
   }
@@ -107699,11 +105510,12 @@ SWIGINTERN PyObject *_wrap_OffSpecSimulation_intensityMapSize(PyObject *SWIGUNUS
   OffSpecSimulation *arg1 = (OffSpecSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:OffSpecSimulation_intensityMapSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecSimulation_intensityMapSize" "', argument " "1"" of type '" "OffSpecSimulation const *""'"); 
   }
@@ -107718,16 +105530,20 @@ fail:
 
 SWIGINTERN PyObject *OffSpecSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_OffSpecSimulation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *OffSpecSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_IntensityData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IntensityData")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IntensityData", 0, 0, 0)) SWIG_fail;
   result = (OutputData< double > *)new OutputData< double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -107741,10 +105557,11 @@ SWIGINTERN PyObject *_wrap_delete_IntensityData(PyObject *SWIGUNUSEDPARM(self),
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IntensityData",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IntensityData" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
@@ -107762,11 +105579,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_clone(PyObject *SWIGUNUSEDPARM(self), P
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_clone" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -107787,16 +105605,15 @@ SWIGINTERN PyObject *_wrap_IntensityData_copyFrom(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_copyFrom",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_copyFrom", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_copyFrom" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_copyFrom" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -107817,11 +105634,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_meanValues(PyObject *SWIGUNUSEDPARM(sel
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_meanValues",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_meanValues" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -107834,7 +105652,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   IAxis *arg2 = 0 ;
@@ -107842,16 +105660,14 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_addAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_addAxis" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_addAxis" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -107867,7 +105683,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   std::string *arg2 = 0 ;
@@ -107883,21 +105699,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_1(PyObject *SWIGUNUSEDPAR
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:IntensityData_addAxis",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_addAxis" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_addAxis" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -107906,17 +105717,17 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis__SWIG_1(PyObject *SWIGUNUSEDPAR
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData_addAxis" "', argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "IntensityData_addAxis" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "IntensityData_addAxis" "', argument " "5"" of type '" "double""'");
   } 
@@ -107936,23 +105747,19 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis(PyObject *self, PyObject *args)
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_addAxis", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OutputDataT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IntensityData_addAxis__SWIG_0(self, args);
+        return _wrap_IntensityData_addAxis__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -107980,7 +105787,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis(PyObject *self, PyObject *args)
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_IntensityData_addAxis__SWIG_1(self, args);
+              return _wrap_IntensityData_addAxis__SWIG_1(self, argc, argv);
             }
           }
         }
@@ -107989,7 +105796,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_addAxis(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_addAxis'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_addAxis'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::addAxis(IAxis const &)\n"
     "    OutputData< double >::addAxis(std::string const &,size_t,double,double)\n");
@@ -107997,7 +105804,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108005,17 +105812,15 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxis__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_getAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxis" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxis" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -108028,26 +105833,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_getAxis",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxis" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_getAxis" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -108071,13 +105874,9 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxis(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_getAxis", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -108089,7 +105888,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxis(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IntensityData_getAxis__SWIG_0(self, args);
+        return _wrap_IntensityData_getAxis__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -108102,13 +105901,13 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxis(PyObject *self, PyObject *args)
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IntensityData_getAxis__SWIG_1(self, args);
+        return _wrap_IntensityData_getAxis__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_getAxis'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_getAxis'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::getAxis(size_t) const\n"
     "    OutputData< double >::getAxis(std::string const &) const\n");
@@ -108121,11 +105920,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_getRank(PyObject *SWIGUNUSEDPARM(self),
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_getRank",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getRank" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108143,11 +105943,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAllocatedSize(PyObject *SWIGUNUSEDPA
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_getAllocatedSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAllocatedSize" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108165,11 +105966,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAllSizes(PyObject *SWIGUNUSEDPARM(se
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< size_t,std::allocator< size_t > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_getAllSizes",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAllSizes" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108187,11 +105989,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_getRawDataVector(PyObject *SWIGUNUSEDPA
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_getRawDataVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getRawDataVector" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108209,11 +106012,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_totalSum(PyObject *SWIGUNUSEDPARM(self)
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_totalSum",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_totalSum" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108226,16 +106030,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< OutputDataIterator< double,OutputData< double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_begin" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
@@ -108248,16 +106051,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< OutputDataIterator< double const,OutputData< double > const > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_begin" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108275,20 +106077,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_begin(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_begin", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OutputDataT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IntensityData_begin__SWIG_0(self, args);
+      return _wrap_IntensityData_begin__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -108297,12 +106095,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_begin(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OutputDataT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IntensityData_begin__SWIG_1(self, args);
+      return _wrap_IntensityData_begin__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_begin'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_begin'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::begin()\n"
     "    OutputData< double >::begin() const\n");
@@ -108310,16 +106108,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< OutputDataIterator< double,OutputData< double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_end" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
@@ -108332,16 +106129,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< OutputDataIterator< double const,OutputData< double > const > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_end" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -108359,20 +106155,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_end(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_end", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OutputDataT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IntensityData_end__SWIG_0(self, args);
+      return _wrap_IntensityData_end__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -108381,12 +106173,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_end(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_OutputDataT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_IntensityData_end__SWIG_1(self, args);
+      return _wrap_IntensityData_end__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_end'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_end'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::end()\n"
     "    OutputData< double >::end() const\n");
@@ -108402,17 +106194,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxesBinIndices(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::vector< int,std::allocator< int > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_getAxesBinIndices",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_getAxesBinIndices", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxesBinIndices" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxesBinIndices" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -108425,7 +106216,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108436,23 +106227,20 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisBinIndex",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisBinIndex" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisBinIndex" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData_getAxisBinIndex" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -108465,7 +106253,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108475,25 +106263,22 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex__SWIG_1(PyObject *SWIGU
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisBinIndex",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisBinIndex" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisBinIndex" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IntensityData_getAxisBinIndex" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -108517,13 +106302,9 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex(PyObject *self, PyObjec
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_getAxisBinIndex", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -108540,7 +106321,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IntensityData_getAxisBinIndex__SWIG_0(self, args);
+          return _wrap_IntensityData_getAxisBinIndex__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -108559,14 +106340,14 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex(PyObject *self, PyObjec
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_IntensityData_getAxisBinIndex__SWIG_1(self, args);
+          return _wrap_IntensityData_getAxisBinIndex__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_getAxisBinIndex'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_getAxisBinIndex'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::getAxisBinIndex(size_t,size_t) const\n"
     "    OutputData< double >::getAxisBinIndex(size_t,std::string const &) const\n");
@@ -108582,17 +106363,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_toGlobalIndex(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_toGlobalIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_toGlobalIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_toGlobalIndex" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_toGlobalIndex" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > const &""'"); 
   }
@@ -108615,19 +106395,18 @@ SWIGINTERN PyObject *_wrap_IntensityData_findGlobalIndex(PyObject *SWIGUNUSEDPAR
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_findGlobalIndex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_findGlobalIndex", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_findGlobalIndex" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_findGlobalIndex" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -108646,7 +106425,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108657,23 +106436,20 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_0(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisValue" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisValue" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData_getAxisValue" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -108686,7 +106462,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108696,25 +106472,22 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue__SWIG_1(PyObject *SWIGUNUS
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisValue" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisValue" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IntensityData_getAxisValue" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -108738,13 +106511,9 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_getAxisValue", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -108761,7 +106530,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IntensityData_getAxisValue__SWIG_0(self, args);
+          return _wrap_IntensityData_getAxisValue__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -108780,14 +106549,14 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue(PyObject *self, PyObject *
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_IntensityData_getAxisValue__SWIG_1(self, args);
+          return _wrap_IntensityData_getAxisValue__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_getAxisValue'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_getAxisValue'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::getAxisValue(size_t,size_t) const\n"
     "    OutputData< double >::getAxisValue(size_t,std::string const &) const\n");
@@ -108803,17 +106572,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxesValues(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_getAxesValues",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_getAxesValues", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxesValues" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxesValues" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -108826,7 +106594,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108837,23 +106605,20 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisBin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisBin" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisBin" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData_getAxisBin" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -108866,7 +106631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   size_t arg2 ;
@@ -108876,25 +106641,22 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin__SWIG_1(PyObject *SWIGUNUSED
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Bin1D result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_getAxisBin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAxisBin" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getAxisBin" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IntensityData_getAxisBin" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -108918,13 +106680,9 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin(PyObject *self, PyObject *ar
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IntensityData_getAxisBin", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -108941,7 +106699,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IntensityData_getAxisBin__SWIG_0(self, args);
+          return _wrap_IntensityData_getAxisBin__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -108960,14 +106718,14 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin(PyObject *self, PyObject *ar
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_IntensityData_getAxisBin__SWIG_1(self, args);
+          return _wrap_IntensityData_getAxisBin__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IntensityData_getAxisBin'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IntensityData_getAxisBin'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    OutputData< double >::getAxisBin(size_t,size_t) const\n"
     "    OutputData< double >::getAxisBin(size_t,std::string const &) const\n");
@@ -108980,10 +106738,11 @@ SWIGINTERN PyObject *_wrap_IntensityData_clear(PyObject *SWIGUNUSEDPARM(self), P
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_clear" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
@@ -109005,16 +106764,15 @@ SWIGINTERN PyObject *_wrap_IntensityData_setAllTo(PyObject *SWIGUNUSEDPARM(self)
   double temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_setAllTo",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_setAllTo", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_setAllTo" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_setAllTo" "', argument " "2"" of type '" "double""'");
   } 
@@ -109037,16 +106795,15 @@ SWIGINTERN PyObject *_wrap_IntensityData_scaleAll(PyObject *SWIGUNUSEDPARM(self)
   double temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_scaleAll",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_scaleAll", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_scaleAll" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_scaleAll" "', argument " "2"" of type '" "double""'");
   } 
@@ -109071,22 +106828,20 @@ SWIGINTERN PyObject *_wrap_IntensityData_setAxisSizes(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData_setAxisSizes",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_setAxisSizes", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_setAxisSizes" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_setAxisSizes" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_int, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_int, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IntensityData_setAxisSizes" "', argument " "3"" of type '" "int *""'"); 
   }
@@ -109106,18 +106861,17 @@ SWIGINTERN PyObject *_wrap_IntensityData_setRawDataVector(PyObject *SWIGUNUSEDPA
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_setRawDataVector",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_setRawDataVector", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_setRawDataVector" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_setRawDataVector" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -109144,16 +106898,15 @@ SWIGINTERN PyObject *_wrap_IntensityData_setRawDataArray(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_setRawDataArray",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_setRawDataArray", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_setRawDataArray" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_setRawDataArray" "', argument " "2"" of type '" "double const *""'"); 
   }
@@ -109174,17 +106927,16 @@ SWIGINTERN PyObject *_wrap_IntensityData___iadd__(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___iadd__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___iadd__" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -109208,17 +106960,16 @@ SWIGINTERN PyObject *_wrap_IntensityData___isub__(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___isub__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___isub__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___isub__" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -109242,17 +106993,16 @@ SWIGINTERN PyObject *_wrap_IntensityData___itruediv__(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___itruediv__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___itruediv__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___itruediv__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___itruediv__" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -109276,17 +107026,16 @@ SWIGINTERN PyObject *_wrap_IntensityData___imul__(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___imul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___imul__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___imul__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_OutputDataT_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___imul__" "', argument " "2"" of type '" "OutputData< double > const &""'"); 
   }
@@ -109310,17 +107059,16 @@ SWIGINTERN PyObject *_wrap_IntensityData_getValue(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData_getValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData_getValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getValue" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData_getValue" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -109338,11 +107086,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_getArray(PyObject *SWIGUNUSEDPARM(self)
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_getArray",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getArray" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -109360,11 +107109,12 @@ SWIGINTERN PyObject *_wrap_IntensityData_isInitialized(PyObject *SWIGUNUSEDPARM(
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_isInitialized",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_isInitialized" "', argument " "1"" of type '" "OutputData< double > const *""'"); 
   }
@@ -109382,10 +107132,11 @@ SWIGINTERN PyObject *_wrap_IntensityData_allocate(PyObject *SWIGUNUSEDPARM(self)
   OutputData< double > *arg1 = (OutputData< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IntensityData_allocate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_allocate" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
@@ -109406,17 +107157,16 @@ SWIGINTERN PyObject *_wrap_IntensityData___getitem__(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___getitem__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData___getitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -109440,23 +107190,21 @@ SWIGINTERN PyObject *_wrap_IntensityData___setitem__(PyObject *SWIGUNUSEDPARM(se
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IntensityData___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IntensityData___setitem__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OutputDataT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___setitem__" "', argument " "1"" of type '" "OutputData< double > *""'"); 
   }
   arg1 = reinterpret_cast< OutputData< double > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData___setitem__" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData___setitem__" "', argument " "3"" of type '" "double""'");
   } 
@@ -109471,12 +107219,16 @@ fail:
 
 SWIGINTERN PyObject *IntensityData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_OutputDataT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IntensityData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   IDistribution1D *arg2 = 0 ;
@@ -109492,17 +107244,12 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_0(PyObject *SWIGUNUSE
   int ecode4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ParameterDistribution",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterDistribution" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -109511,7 +107258,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_0(PyObject *SWIGUNUSE
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
@@ -109519,17 +107266,17 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_0(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
   arg2 = reinterpret_cast< IDistribution1D * >(argp2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ParameterDistribution" "', argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ParameterDistribution" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
+  res5 = SWIG_ConvertPtr(swig_obj[4], &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_ParameterDistribution" "', argument " "5"" of type '" "RealLimits const &""'"); 
   }
@@ -109547,7 +107294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   IDistribution1D *arg2 = 0 ;
@@ -109560,16 +107307,12 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_1(PyObject *SWIGUNUSE
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ParameterDistribution",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterDistribution" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -109578,7 +107321,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_1(PyObject *SWIGUNUSE
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
@@ -109586,12 +107329,12 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_1(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
   arg2 = reinterpret_cast< IDistribution1D * >(argp2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ParameterDistribution" "', argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ParameterDistribution" "', argument " "4"" of type '" "double""'");
   } 
@@ -109606,7 +107349,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   IDistribution1D *arg2 = 0 ;
@@ -109616,15 +107359,12 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_2(PyObject *SWIGUNUSE
   int res2 = 0 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ParameterDistribution",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterDistribution" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -109633,7 +107373,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_2(PyObject *SWIGUNUSE
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
@@ -109641,7 +107381,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_2(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
   arg2 = reinterpret_cast< IDistribution1D * >(argp2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ParameterDistribution" "', argument " "3"" of type '" "size_t""'");
   } 
@@ -109656,7 +107396,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   IDistribution1D *arg2 = 0 ;
@@ -109672,17 +107412,12 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_3(PyObject *SWIGUNUSE
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ParameterDistribution",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterDistribution" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -109691,7 +107426,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_3(PyObject *SWIGUNUSE
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDistribution1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
@@ -109699,17 +107434,17 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_3(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParameterDistribution" "', argument " "2"" of type '" "IDistribution1D const &""'"); 
   }
   arg2 = reinterpret_cast< IDistribution1D * >(argp2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ParameterDistribution" "', argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ParameterDistribution" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ParameterDistribution" "', argument " "5"" of type '" "double""'");
   } 
@@ -109724,16 +107459,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterDistribution__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParameterDistribution *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ParameterDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ParameterDistribution,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_ParameterDistribution,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterDistribution" "', argument " "1"" of type '" "ParameterDistribution const &""'"); 
   }
@@ -109754,19 +107488,15 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParameterDistribution", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ParameterDistribution, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ParameterDistribution, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_ParameterDistribution__SWIG_4(self, args);
+      return _wrap_new_ParameterDistribution__SWIG_4(self, argc, argv);
     }
   }
   if (argc == 3) {
@@ -109774,7 +107504,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -109782,7 +107512,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_ParameterDistribution__SWIG_2(self, args);
+          return _wrap_new_ParameterDistribution__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -109792,7 +107522,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -109805,7 +107535,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_ParameterDistribution__SWIG_1(self, args);
+            return _wrap_new_ParameterDistribution__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -109816,7 +107546,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -109829,10 +107559,10 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, 0);
+            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_new_ParameterDistribution__SWIG_0(self, args);
+              return _wrap_new_ParameterDistribution__SWIG_0(self, argc, argv);
             }
           }
         }
@@ -109844,7 +107574,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDistribution1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -109862,7 +107592,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_new_ParameterDistribution__SWIG_3(self, args);
+              return _wrap_new_ParameterDistribution__SWIG_3(self, argc, argv);
             }
           }
         }
@@ -109871,7 +107601,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParameterDistribution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParameterDistribution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParameterDistribution::ParameterDistribution(std::string const &,IDistribution1D const &,size_t,double,RealLimits const &)\n"
     "    ParameterDistribution::ParameterDistribution(std::string const &,IDistribution1D const &,size_t,double)\n"
@@ -109887,10 +107617,11 @@ SWIGINTERN PyObject *_wrap_delete_ParameterDistribution(PyObject *SWIGUNUSEDPARM
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParameterDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParameterDistribution" "', argument " "1"" of type '" "ParameterDistribution *""'"); 
   }
@@ -109909,19 +107640,18 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_linkParameter(PyObject *SWIGUNU
   std::string arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   ParameterDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterDistribution_linkParameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterDistribution_linkParameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_linkParameter" "', argument " "1"" of type '" "ParameterDistribution *""'"); 
   }
   arg1 = reinterpret_cast< ParameterDistribution * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    int res = SWIG_AsPtr_std_string(obj1, &ptr);
+    int res = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "ParameterDistribution_linkParameter" "', argument " "2"" of type '" "std::string""'"); 
     }
@@ -109941,11 +107671,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getMainParameterName(PyObject *
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getMainParameterName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getMainParameterName" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -109963,11 +107694,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getNbrSamples(PyObject *SWIGUNU
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getNbrSamples",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getNbrSamples" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -109985,11 +107717,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getSigmaFactor(PyObject *SWIGUN
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getSigmaFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getSigmaFactor" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110002,16 +107735,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IDistribution1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getDistribution" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110024,16 +107756,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   IDistribution1D *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getDistribution" "', argument " "1"" of type '" "ParameterDistribution *""'"); 
   }
@@ -110051,20 +107782,16 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution(PyObject *self,
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterDistribution_getDistribution", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParameterDistribution, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_ParameterDistribution_getDistribution__SWIG_1(self, args);
+      return _wrap_ParameterDistribution_getDistribution__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -110073,12 +107800,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getDistribution(PyObject *self,
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParameterDistribution, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_ParameterDistribution_getDistribution__SWIG_0(self, args);
+      return _wrap_ParameterDistribution_getDistribution__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterDistribution_getDistribution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterDistribution_getDistribution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParameterDistribution::getDistribution() const\n"
     "    ParameterDistribution::getDistribution()\n");
@@ -110091,11 +107818,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_generateSamples(PyObject *SWIGU
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_generateSamples",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_generateSamples" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110113,11 +107841,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getLinkedParameterNames(PyObjec
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string,std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getLinkedParameterNames",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getLinkedParameterNames" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110135,11 +107864,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getLimits(PyObject *SWIGUNUSEDP
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getLimits" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110157,11 +107887,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getMinValue(PyObject *SWIGUNUSE
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getMinValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getMinValue" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110179,11 +107910,12 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getMaxValue(PyObject *SWIGUNUSE
   ParameterDistribution *arg1 = (ParameterDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterDistribution_getMaxValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterDistribution_getMaxValue" "', argument " "1"" of type '" "ParameterDistribution const *""'"); 
   }
@@ -110198,16 +107930,20 @@ fail:
 
 SWIGINTERN PyObject *ParameterDistribution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParameterDistribution, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ParameterDistribution_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_ParameterPool(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParameterPool")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_ParameterPool", 0, 0, 0)) SWIG_fail;
   result = (ParameterPool *)new ParameterPool();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterPool, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -110221,10 +107957,11 @@ SWIGINTERN PyObject *_wrap_delete_ParameterPool(PyObject *SWIGUNUSEDPARM(self),
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParameterPool",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParameterPool" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
@@ -110242,11 +107979,12 @@ SWIGINTERN PyObject *_wrap_ParameterPool_clone(PyObject *SWIGUNUSEDPARM(self), P
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParameterPool *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterPool_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_clone" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
@@ -110269,19 +108007,17 @@ SWIGINTERN PyObject *_wrap_ParameterPool_copyToExternalPool(PyObject *SWIGUNUSED
   int res2 = SWIG_OLDOBJ ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterPool_copyToExternalPool",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_copyToExternalPool", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_copyToExternalPool" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_copyToExternalPool" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110290,7 +108026,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_copyToExternalPool(PyObject *SWIGUNUSED
     }
     arg2 = ptr;
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterPool_copyToExternalPool" "', argument " "3"" of type '" "ParameterPool *""'"); 
   }
@@ -110310,10 +108046,11 @@ SWIGINTERN PyObject *_wrap_ParameterPool_clear(PyObject *SWIGUNUSEDPARM(self), P
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterPool_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_clear" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
@@ -110331,11 +108068,12 @@ SWIGINTERN PyObject *_wrap_ParameterPool_size(PyObject *SWIGUNUSEDPARM(self), Py
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterPool_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_size" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
@@ -110356,17 +108094,16 @@ SWIGINTERN PyObject *_wrap_ParameterPool_addParameter(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_addParameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_addParameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_addParameter" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_RealParameter, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_addParameter" "', argument " "2"" of type '" "RealParameter *""'"); 
   }
@@ -110379,26 +108116,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterPool_parameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterPool_parameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_parameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_parameter" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_parameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110417,26 +108152,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterPool_parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterPool_parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_parameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_parameter" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_parameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110460,13 +108193,9 @@ SWIGINTERN PyObject *_wrap_ParameterPool_parameter(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterPool_parameter", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -110476,7 +108205,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_parameter(PyObject *self, PyObject *arg
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ParameterPool_parameter__SWIG_0(self, args);
+        return _wrap_ParameterPool_parameter__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -110489,13 +108218,13 @@ SWIGINTERN PyObject *_wrap_ParameterPool_parameter(PyObject *self, PyObject *arg
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ParameterPool_parameter__SWIG_1(self, args);
+        return _wrap_ParameterPool_parameter__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterPool_parameter'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterPool_parameter'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParameterPool::parameter(std::string const &)\n"
     "    ParameterPool::parameter(std::string const &) const\n");
@@ -110508,11 +108237,12 @@ SWIGINTERN PyObject *_wrap_ParameterPool_parameters(PyObject *SWIGUNUSEDPARM(sel
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< RealParameter *,std::allocator< RealParameter * > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterPool_parameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_parameters" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
@@ -110532,19 +108262,18 @@ SWIGINTERN PyObject *_wrap_ParameterPool_getMatchedParameters(PyObject *SWIGUNUS
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SwigValueWrapper< std::vector< RealParameter *,std::allocator< RealParameter * > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_getMatchedParameters",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_getMatchedParameters", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_getMatchedParameters" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_getMatchedParameters" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110570,19 +108299,18 @@ SWIGINTERN PyObject *_wrap_ParameterPool_getUniqueMatch(PyObject *SWIGUNUSEDPARM
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_getUniqueMatch",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_getUniqueMatch", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_getUniqueMatch" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_getUniqueMatch" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110611,19 +108339,17 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setParameterValue(PyObject *SWIGUNUSEDP
   int res2 = SWIG_OLDOBJ ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterPool_setParameterValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_setParameterValue", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_setParameterValue" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_setParameterValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110632,7 +108358,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setParameterValue(PyObject *SWIGUNUSEDP
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterPool_setParameterValue" "', argument " "3"" of type '" "double""'");
   } 
@@ -110657,20 +108383,18 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setMatchedParametersValue(PyObject *SWI
   int res2 = SWIG_OLDOBJ ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterPool_setMatchedParametersValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_setMatchedParametersValue", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_setMatchedParametersValue" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_setMatchedParametersValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110679,7 +108403,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setMatchedParametersValue(PyObject *SWI
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterPool_setMatchedParametersValue" "', argument " "3"" of type '" "double""'");
   } 
@@ -110704,19 +108428,17 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setUniqueMatchValue(PyObject *SWIGUNUSE
   int res2 = SWIG_OLDOBJ ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterPool_setUniqueMatchValue",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_setUniqueMatchValue", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_setUniqueMatchValue" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_setUniqueMatchValue" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110725,7 +108447,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_setUniqueMatchValue(PyObject *SWIGUNUSE
     }
     arg2 = ptr;
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterPool_setUniqueMatchValue" "', argument " "3"" of type '" "double""'");
   } 
@@ -110745,11 +108467,12 @@ SWIGINTERN PyObject *_wrap_ParameterPool_parameterNames(PyObject *SWIGUNUSEDPARM
   ParameterPool *arg1 = (ParameterPool *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string,std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterPool_parameterNames",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_parameterNames" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
@@ -110769,18 +108492,17 @@ SWIGINTERN PyObject *_wrap_ParameterPool_removeParameter(PyObject *SWIGUNUSEDPAR
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool_removeParameter",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool_removeParameter", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool_removeParameter" "', argument " "1"" of type '" "ParameterPool *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterPool_removeParameter" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -110807,17 +108529,16 @@ SWIGINTERN PyObject *_wrap_ParameterPool___getitem__(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterPool___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterPool___getitem__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterPool, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterPool___getitem__" "', argument " "1"" of type '" "ParameterPool const *""'"); 
   }
   arg1 = reinterpret_cast< ParameterPool * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterPool___getitem__" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -110832,12 +108553,16 @@ fail:
 
 SWIGINTERN PyObject *ParameterPool_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParameterPool, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *ParameterPool_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -110845,17 +108570,15 @@ SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ParameterSample *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParameterSample",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ParameterSample" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ParameterSample" "', argument " "2"" of type '" "double""'");
   } 
@@ -110868,16 +108591,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   ParameterSample *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ParameterSample",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ParameterSample" "', argument " "1"" of type '" "double""'");
   } 
@@ -110890,11 +108612,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSample__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   ParameterSample *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParameterSample")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (ParameterSample *)new ParameterSample();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterSample, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -110908,15 +108630,11 @@ SWIGINTERN PyObject *_wrap_new_ParameterSample(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParameterSample", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_ParameterSample__SWIG_2(self, args);
+    return _wrap_new_ParameterSample__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -110925,7 +108643,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterSample(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_ParameterSample__SWIG_1(self, args);
+      return _wrap_new_ParameterSample__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -110940,13 +108658,13 @@ SWIGINTERN PyObject *_wrap_new_ParameterSample(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_ParameterSample__SWIG_0(self, args);
+        return _wrap_new_ParameterSample__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParameterSample'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParameterSample'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParameterSample::ParameterSample(double,double)\n"
     "    ParameterSample::ParameterSample(double)\n"
@@ -110963,16 +108681,15 @@ SWIGINTERN PyObject *_wrap_ParameterSample_value_set(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSample_value_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSample_value_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSample_value_set" "', argument " "1"" of type '" "ParameterSample *""'"); 
   }
   arg1 = reinterpret_cast< ParameterSample * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSample_value_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -110990,11 +108707,12 @@ SWIGINTERN PyObject *_wrap_ParameterSample_value_get(PyObject *SWIGUNUSEDPARM(se
   ParameterSample *arg1 = (ParameterSample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSample_value_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSample_value_get" "', argument " "1"" of type '" "ParameterSample *""'"); 
   }
@@ -111015,16 +108733,15 @@ SWIGINTERN PyObject *_wrap_ParameterSample_weight_set(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSample_weight_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSample_weight_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSample_weight_set" "', argument " "1"" of type '" "ParameterSample *""'"); 
   }
   arg1 = reinterpret_cast< ParameterSample * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSample_weight_set" "', argument " "2"" of type '" "double""'");
   } 
@@ -111042,11 +108759,12 @@ SWIGINTERN PyObject *_wrap_ParameterSample_weight_get(PyObject *SWIGUNUSEDPARM(s
   ParameterSample *arg1 = (ParameterSample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSample_weight_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterSample, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSample_weight_get" "', argument " "1"" of type '" "ParameterSample *""'"); 
   }
@@ -111064,10 +108782,11 @@ SWIGINTERN PyObject *_wrap_delete_ParameterSample(PyObject *SWIGUNUSEDPARM(self)
   ParameterSample *arg1 = (ParameterSample *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParameterSample",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParameterSample, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParameterSample, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParameterSample" "', argument " "1"" of type '" "ParameterSample *""'"); 
   }
@@ -111082,23 +108801,28 @@ fail:
 
 SWIGINTERN PyObject *ParameterSample_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParameterSample, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ParameterSample_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_ParameterSampleVector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_iterator" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -111116,11 +108840,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___nonzero__(PyObject *SWIGUNUSE
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___nonzero__" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -111138,11 +108863,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___bool__(PyObject *SWIGUNUSEDPA
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___bool__" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -111160,11 +108886,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___len__(PyObject *SWIGUNUSEDPAR
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___len__" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -111188,37 +108915,32 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___getslice__(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___getslice__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___getslice__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterSampleVector___getslice__" "', argument " "3"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< ParameterSample >::difference_type >(val3);
   try {
     result = (std::vector< ParameterSample,std::allocator< ParameterSample > > *)std_vector_Sl_ParameterSample_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -111226,7 +108948,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::difference_type arg2 ;
@@ -111237,36 +108959,30 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_0(PyObject *
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___setslice__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___setslice__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterSampleVector___setslice__" "', argument " "3"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< ParameterSample >::difference_type >(val3);
   try {
     std_vector_Sl_ParameterSample_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111274,7 +108990,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::difference_type arg2 ;
@@ -111287,30 +109003,26 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_1(PyObject *
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:ParameterSampleVector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___setslice__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___setslice__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterSampleVector___setslice__" "', argument " "3"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< ParameterSample >::difference_type >(val3);
   {
     std::vector< ParameterSample,std::allocator< ParameterSample > > *ptr = (std::vector< ParameterSample,std::allocator< ParameterSample > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ParameterSampleVector___setslice__" "', argument " "4"" of type '" "std::vector< ParameterSample,std::allocator< ParameterSample > > const &""'"); 
     }
@@ -111321,14 +109033,11 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice____SWIG_1(PyObject *
   }
   try {
     std_vector_Sl_ParameterSample_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< ParameterSample,std::allocator< ParameterSample > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -111343,13 +109052,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice__(PyObject *self, Py
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -111365,7 +109070,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice__(PyObject *self, Py
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_ParameterSampleVector___setslice____SWIG_0(self, args);
+          return _wrap_ParameterSampleVector___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -111388,7 +109093,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice__(PyObject *self, Py
           int res = swig::asptr(argv[3], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_ParameterSampleVector___setslice____SWIG_1(self, args);
+            return _wrap_ParameterSampleVector___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -111396,7 +109101,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setslice__(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::__setslice__(std::vector< ParameterSample >::difference_type,std::vector< ParameterSample >::difference_type)\n"
     "    std::vector< ParameterSample >::__setslice__(std::vector< ParameterSample >::difference_type,std::vector< ParameterSample >::difference_type,std::vector< ParameterSample,std::allocator< ParameterSample > > const &)\n");
@@ -111415,36 +109120,31 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___delslice__(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___delslice__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___delslice__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterSampleVector___delslice__" "', argument " "3"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< ParameterSample >::difference_type >(val3);
   try {
     std_vector_Sl_ParameterSample_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111452,7 +109152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::difference_type arg2 ;
@@ -111460,30 +109160,25 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem____SWIG_0(PyObject *S
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___delitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___delitem__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
   try {
     std_vector_Sl_ParameterSample_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111491,38 +109186,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< ParameterSample,std::allocator< ParameterSample > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___getitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< ParameterSample,std::allocator< ParameterSample > > *)std_vector_Sl_ParameterSample_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -111530,7 +109220,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -111538,25 +109228,22 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_0(PyObject *S
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___setitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< ParameterSample,std::allocator< ParameterSample > > *ptr = (std::vector< ParameterSample,std::allocator< ParameterSample > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterSampleVector___setitem__" "', argument " "3"" of type '" "std::vector< ParameterSample,std::allocator< ParameterSample > > const &""'"); 
     }
@@ -111567,14 +109254,11 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_0(PyObject *S
   }
   try {
     std_vector_Sl_ParameterSample_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< ParameterSample,std::allocator< ParameterSample > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -111584,37 +109268,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___setitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_ParameterSample_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111622,37 +109301,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___delitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_ParameterSample_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111665,13 +109339,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem__(PyObject *self, PyO
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -111681,7 +109351,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem__(PyObject *self, PyO
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector___delitem____SWIG_1(self, args);
+        return _wrap_ParameterSampleVector___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -111695,13 +109365,13 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___delitem__(PyObject *self, PyO
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector___delitem____SWIG_0(self, args);
+        return _wrap_ParameterSampleVector___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::__delitem__(std::vector< ParameterSample >::difference_type)\n"
     "    std::vector< ParameterSample >::__delitem__(PySliceObject *)\n");
@@ -111709,7 +109379,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::difference_type arg2 ;
@@ -111717,29 +109387,26 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem____SWIG_1(PyObject *S
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< ParameterSample >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___getitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___getitem__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
   try {
     result = (std::vector< ParameterSample >::value_type *) &std_vector_Sl_ParameterSample_Sg____getitem____SWIG_1((std::vector< ParameterSample > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterSample, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< ParameterSample >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -111751,13 +109418,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem__(PyObject *self, PyO
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -111767,7 +109430,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem__(PyObject *self, PyO
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector___getitem____SWIG_0(self, args);
+        return _wrap_ParameterSampleVector___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -111781,13 +109444,13 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___getitem__(PyObject *self, PyO
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector___getitem____SWIG_1(self, args);
+        return _wrap_ParameterSampleVector___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::__getitem__(PySliceObject *)\n"
     "    std::vector< ParameterSample >::__getitem__(std::vector< ParameterSample >::difference_type) const\n");
@@ -111795,7 +109458,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::difference_type arg2 ;
@@ -111806,22 +109469,19 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_2(PyObject *S
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector___setitem__" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector___setitem__" "', argument " "2"" of type '" "std::vector< ParameterSample >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterSampleVector___setitem__" "', argument " "3"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -111831,11 +109491,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem____SWIG_2(PyObject *S
   arg3 = reinterpret_cast< std::vector< ParameterSample >::value_type * >(argp3);
   try {
     std_vector_Sl_ParameterSample_Sg____setitem____SWIG_2(arg1,arg2,(ParameterSample const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -111848,13 +109506,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem__(PyObject *self, PyO
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -111864,7 +109518,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem__(PyObject *self, PyO
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector___setitem____SWIG_1(self, args);
+        return _wrap_ParameterSampleVector___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -111880,7 +109534,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem__(PyObject *self, PyO
         int res = swig::asptr(argv[2], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_ParameterSampleVector___setitem____SWIG_0(self, args);
+          return _wrap_ParameterSampleVector___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -111895,17 +109549,17 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector___setitem__(PyObject *self, PyO
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_ParameterSampleVector___setitem____SWIG_2(self, args);
+          return _wrap_ParameterSampleVector___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::__setitem__(PySliceObject *,std::vector< ParameterSample,std::allocator< ParameterSample > > const &)\n"
     "    std::vector< ParameterSample >::__setitem__(PySliceObject *)\n"
@@ -111919,22 +109573,21 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_pop(PyObject *SWIGUNUSEDPARM(se
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_pop" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   try {
     result = std_vector_Sl_ParameterSample_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj((new std::vector< ParameterSample >::value_type(static_cast< const std::vector< ParameterSample >::value_type& >(result))), SWIGTYPE_p_ParameterSample, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -111950,16 +109603,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_append(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_append" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterSampleVector_append" "', argument " "2"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -111975,11 +109627,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParameterSampleVector")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< ParameterSample > *)new std::vector< ParameterSample >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -111988,17 +109640,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< ParameterSample > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ParameterSampleVector",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< ParameterSample,std::allocator< ParameterSample > > *ptr = (std::vector< ParameterSample,std::allocator< ParameterSample > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParameterSampleVector" "', argument " "1"" of type '" "std::vector< ParameterSample > const &""'"); 
     }
@@ -112022,11 +109673,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_empty(PyObject *SWIGUNUSEDPARM(
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_empty" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -112044,11 +109696,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_size(PyObject *SWIGUNUSEDPARM(s
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_size" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -112069,16 +109722,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_swap(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_swap" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterSampleVector_swap" "', argument " "2"" of type '" "std::vector< ParameterSample > &""'"); 
   }
@@ -112099,11 +109751,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_begin(PyObject *SWIGUNUSEDPARM(
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_begin" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112122,11 +109775,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_end(PyObject *SWIGUNUSEDPARM(se
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_end" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112145,11 +109799,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_rbegin(PyObject *SWIGUNUSEDPARM
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_rbegin" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112168,11 +109823,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_rend(PyObject *SWIGUNUSEDPARM(s
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_rend" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112191,10 +109847,11 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_clear(PyObject *SWIGUNUSEDPARM(
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_clear" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112212,11 +109869,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_get_allocator(PyObject *SWIGUNU
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< ParameterSample > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_get_allocator" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -112229,16 +109887,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< ParameterSample > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ParameterSampleVector",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ParameterSampleVector" "', argument " "1"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
@@ -112256,10 +109913,11 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_pop_back(PyObject *SWIGUNUSEDPA
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_pop_back" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112272,7 +109930,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::size_type arg2 ;
@@ -112280,16 +109938,14 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_resize" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector_resize" "', argument " "2"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
@@ -112302,7 +109958,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::iterator arg2 ;
@@ -112310,17 +109966,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< ParameterSample >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_erase" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_erase" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
   } else {
@@ -112340,7 +109994,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::iterator arg2 ;
@@ -112351,18 +110005,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_1(PyObject *SWIGUNU
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< ParameterSample >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_erase" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_erase" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
   } else {
@@ -112373,7 +110024,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase__SWIG_1(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_erase" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_erase" "', argument " "3"" of type '" "std::vector< ParameterSample >::iterator""'");
   } else {
@@ -112398,13 +110049,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -112414,7 +110061,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase(PyObject *self, PyObject
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< ParameterSample >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_ParameterSampleVector_erase__SWIG_0(self, args);
+        return _wrap_ParameterSampleVector_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -112431,14 +110078,14 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_erase(PyObject *self, PyObject
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< ParameterSample >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_ParameterSampleVector_erase__SWIG_1(self, args);
+          return _wrap_ParameterSampleVector_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::erase(std::vector< ParameterSample >::iterator)\n"
     "    std::vector< ParameterSample >::erase(std::vector< ParameterSample >::iterator,std::vector< ParameterSample >::iterator)\n");
@@ -112446,7 +110093,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample >::size_type arg1 ;
   std::vector< ParameterSample >::value_type *arg2 = 0 ;
@@ -112454,17 +110101,15 @@ SWIGINTERN PyObject *_wrap_new_ParameterSampleVector__SWIG_3(PyObject *SWIGUNUSE
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< ParameterSample > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParameterSampleVector",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ParameterSampleVector" "', argument " "1"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
   arg1 = static_cast< std::vector< ParameterSample >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParameterSampleVector" "', argument " "2"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112485,15 +110130,11 @@ SWIGINTERN PyObject *_wrap_new_ParameterSampleVector(PyObject *self, PyObject *a
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParameterSampleVector", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_ParameterSampleVector__SWIG_0(self, args);
+    return _wrap_new_ParameterSampleVector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -112502,7 +110143,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterSampleVector(PyObject *self, PyObject *a
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_ParameterSampleVector__SWIG_2(self, args);
+      return _wrap_new_ParameterSampleVector__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -112510,7 +110151,7 @@ SWIGINTERN PyObject *_wrap_new_ParameterSampleVector(PyObject *self, PyObject *a
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_ParameterSampleVector__SWIG_1(self, args);
+      return _wrap_new_ParameterSampleVector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -112520,16 +110161,16 @@ SWIGINTERN PyObject *_wrap_new_ParameterSampleVector(PyObject *self, PyObject *a
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ParameterSample, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ParameterSample, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_ParameterSampleVector__SWIG_3(self, args);
+        return _wrap_new_ParameterSampleVector__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParameterSampleVector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParameterSampleVector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::vector()\n"
     "    std::vector< ParameterSample >::vector(std::vector< ParameterSample > const &)\n"
@@ -112547,16 +110188,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_push_back(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_push_back" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParameterSampleVector_push_back" "', argument " "2"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112577,17 +110217,19 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_front(PyObject *SWIGUNUSEDPARM(
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_front" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   result = (std::vector< ParameterSample >::value_type *) &((std::vector< ParameterSample > const *)arg1)->front();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterSample, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< ParameterSample >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -112599,17 +110241,19 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_back(PyObject *SWIGUNUSEDPARM(s
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_back" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
   result = (std::vector< ParameterSample >::value_type *) &((std::vector< ParameterSample > const *)arg1)->back();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterSample, 0 |  0 );
+  (void)swig::container_owner<swig::traits<std::vector< ParameterSample >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -112627,22 +110271,20 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_assign(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_assign" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector_assign" "', argument " "2"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterSampleVector_assign" "', argument " "3"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112658,7 +110300,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::size_type arg2 ;
@@ -112669,22 +110311,19 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize__SWIG_1(PyObject *SWIGUN
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_resize" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector_resize" "', argument " "2"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
   arg2 = static_cast< std::vector< ParameterSample >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterSampleVector_resize" "', argument " "3"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112705,13 +110344,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -112722,7 +110357,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_ParameterSampleVector_resize__SWIG_0(self, args);
+        return _wrap_ParameterSampleVector_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -112736,17 +110371,17 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_resize(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_ParameterSampleVector_resize__SWIG_1(self, args);
+          return _wrap_ParameterSampleVector_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::resize(std::vector< ParameterSample >::size_type)\n"
     "    std::vector< ParameterSample >::resize(std::vector< ParameterSample >::size_type,std::vector< ParameterSample >::value_type const &)\n");
@@ -112754,7 +110389,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::iterator arg2 ;
@@ -112765,18 +110400,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_0(PyObject *SWIGUN
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< ParameterSample >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParameterSampleVector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_insert" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_insert" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
   } else {
@@ -112787,7 +110419,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_0(PyObject *SWIGUN
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_insert" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ParameterSampleVector_insert" "', argument " "3"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112804,7 +110436,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   std::vector< ParameterSample >::iterator arg2 ;
@@ -112818,18 +110450,14 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_1(PyObject *SWIGUN
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:ParameterSampleVector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_insert" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_insert" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
   } else {
@@ -112840,12 +110468,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert__SWIG_1(PyObject *SWIGUN
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ParameterSampleVector_insert" "', argument " "2"" of type '" "std::vector< ParameterSample >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParameterSampleVector_insert" "', argument " "3"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
   arg3 = static_cast< std::vector< ParameterSample >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_ParameterSample,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_ParameterSample,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ParameterSampleVector_insert" "', argument " "4"" of type '" "std::vector< ParameterSample >::value_type const &""'"); 
   }
@@ -112866,13 +110494,9 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParameterSampleVector_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< ParameterSample,std::allocator< ParameterSample > >**)(0));
@@ -112882,10 +110506,10 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert(PyObject *self, PyObject
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< ParameterSample >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ParameterSample, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_ParameterSampleVector_insert__SWIG_0(self, args);
+          return _wrap_ParameterSampleVector_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -112904,10 +110528,10 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_ParameterSample, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_ParameterSample, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_ParameterSampleVector_insert__SWIG_1(self, args);
+            return _wrap_ParameterSampleVector_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -112915,7 +110539,7 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParameterSampleVector_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParameterSampleVector_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< ParameterSample >::insert(std::vector< ParameterSample >::iterator,std::vector< ParameterSample >::value_type const &)\n"
     "    std::vector< ParameterSample >::insert(std::vector< ParameterSample >::iterator,std::vector< ParameterSample >::size_type,std::vector< ParameterSample >::value_type const &)\n");
@@ -112931,16 +110555,15 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_reserve(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParameterSampleVector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParameterSampleVector_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_reserve" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< ParameterSample > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParameterSampleVector_reserve" "', argument " "2"" of type '" "std::vector< ParameterSample >::size_type""'");
   } 
@@ -112958,11 +110581,12 @@ SWIGINTERN PyObject *_wrap_ParameterSampleVector_capacity(PyObject *SWIGUNUSEDPA
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< ParameterSample >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParameterSampleVector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParameterSampleVector_capacity" "', argument " "1"" of type '" "std::vector< ParameterSample > const *""'"); 
   }
@@ -112980,10 +110604,11 @@ SWIGINTERN PyObject *_wrap_delete_ParameterSampleVector(PyObject *SWIGUNUSEDPARM
   std::vector< ParameterSample > *arg1 = (std::vector< ParameterSample > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParameterSampleVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParameterSampleVector" "', argument " "1"" of type '" "std::vector< ParameterSample > *""'"); 
   }
@@ -112998,16 +110623,20 @@ fail:
 
 SWIGINTERN PyObject *ParameterSampleVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Particle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *ParameterSampleVector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Particle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Particle")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Particle *)new Particle();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Particle, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -113016,17 +110645,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Particle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Particle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Particle",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Particle" "', argument " "1"" of type '" "Material""'"); 
     }  
@@ -113046,7 +110674,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Particle__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Particle__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > arg1 ;
   IFormFactor *arg2 = 0 ;
@@ -113054,13 +110682,11 @@ SWIGINTERN PyObject *_wrap_new_Particle__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Particle",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Particle" "', argument " "1"" of type '" "Material""'"); 
     }  
@@ -113072,7 +110698,7 @@ SWIGINTERN PyObject *_wrap_new_Particle__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
       if (SWIG_IsNewObj(res1)) delete temp;
     }
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Particle" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -113088,7 +110714,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Particle__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Particle__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   SwigValueWrapper< Material > arg1 ;
   IFormFactor *arg2 = 0 ;
@@ -113099,14 +110725,11 @@ SWIGINTERN PyObject *_wrap_new_Particle__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Particle",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Particle" "', argument " "1"" of type '" "Material""'"); 
     }  
@@ -113118,7 +110741,7 @@ SWIGINTERN PyObject *_wrap_new_Particle__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
       if (SWIG_IsNewObj(res1)) delete temp;
     }
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Particle" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -113126,7 +110749,7 @@ SWIGINTERN PyObject *_wrap_new_Particle__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Particle" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
   arg2 = reinterpret_cast< IFormFactor * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_IRotation,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Particle" "', argument " "3"" of type '" "IRotation const &""'"); 
   }
@@ -113147,55 +110770,51 @@ SWIGINTERN PyObject *_wrap_new_Particle(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Particle", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Particle__SWIG_0(self, args);
+    return _wrap_new_Particle__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Particle__SWIG_1(self, args);
+      return _wrap_new_Particle__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Particle__SWIG_2(self, args);
+        return _wrap_new_Particle__SWIG_2(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IFormFactor, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IRotation, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_IRotation, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_Particle__SWIG_3(self, args);
+          return _wrap_new_Particle__SWIG_3(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Particle'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Particle'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Particle::Particle()\n"
     "    Particle::Particle(Material)\n"
@@ -113210,11 +110829,12 @@ SWIGINTERN PyObject *_wrap_Particle_clone(PyObject *SWIGUNUSEDPARM(self), PyObje
   Particle *arg1 = (Particle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Particle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_clone" "', argument " "1"" of type '" "Particle const *""'"); 
   }
@@ -113235,16 +110855,15 @@ SWIGINTERN PyObject *_wrap_Particle_accept(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Particle_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Particle_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_accept" "', argument " "1"" of type '" "Particle const *""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Particle_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -113265,18 +110884,17 @@ SWIGINTERN PyObject *_wrap_Particle_createSlicedParticle(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SlicedParticle result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Particle_createSlicedParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Particle_createSlicedParticle", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_createSlicedParticle" "', argument " "1"" of type '" "Particle const *""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Particle_createSlicedParticle" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -113306,17 +110924,16 @@ SWIGINTERN PyObject *_wrap_Particle_setMaterial(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Particle_setMaterial",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Particle_setMaterial", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_setMaterial" "', argument " "1"" of type '" "Particle *""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Material,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Particle_setMaterial" "', argument " "2"" of type '" "Material""'"); 
     }  
@@ -113341,11 +110958,12 @@ SWIGINTERN PyObject *_wrap_Particle_material(PyObject *SWIGUNUSEDPARM(self), PyO
   Particle *arg1 = (Particle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Material *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Particle_material",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_material" "', argument " "1"" of type '" "Particle const *""'"); 
   }
@@ -113366,16 +110984,15 @@ SWIGINTERN PyObject *_wrap_Particle_setFormFactor(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Particle_setFormFactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Particle_setFormFactor", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_setFormFactor" "', argument " "1"" of type '" "Particle *""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IFormFactor,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Particle_setFormFactor" "', argument " "2"" of type '" "IFormFactor const &""'"); 
   }
@@ -113396,11 +111013,12 @@ SWIGINTERN PyObject *_wrap_Particle_getChildren(PyObject *SWIGUNUSEDPARM(self),
   Particle *arg1 = (Particle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Particle_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_getChildren" "', argument " "1"" of type '" "Particle const *""'"); 
   }
@@ -113418,10 +111036,11 @@ SWIGINTERN PyObject *_wrap_delete_Particle(PyObject *SWIGUNUSEDPARM(self), PyObj
   Particle *arg1 = (Particle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Particle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Particle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Particle" "', argument " "1"" of type '" "Particle *""'"); 
   }
@@ -113436,16 +111055,20 @@ fail:
 
 SWIGINTERN PyObject *Particle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Particle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Particle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   ParticleComposition *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParticleComposition")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (ParticleComposition *)new ParticleComposition();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParticleComposition, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -113454,18 +111077,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IParticle *arg1 = 0 ;
   std::vector< kvector_t,std::allocator< kvector_t > > arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ParticleComposition *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParticleComposition",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IParticle,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleComposition" "', argument " "1"" of type '" "IParticle const &""'"); 
   }
@@ -113475,7 +111096,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_1(PyObject *SWIGUNUSEDP
   arg1 = reinterpret_cast< IParticle * >(argp1);
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    int res = swig::asptr(obj1, &ptr);
+    int res = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ParticleComposition" "', argument " "2"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > >""'"); 
     }
@@ -113495,31 +111116,27 @@ SWIGINTERN PyObject *_wrap_new_ParticleComposition(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParticleComposition", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_ParticleComposition__SWIG_0(self, args);
+    return _wrap_new_ParticleComposition__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IParticle, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IParticle, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = swig::asptr(argv[1], (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_ParticleComposition__SWIG_1(self, args);
+        return _wrap_new_ParticleComposition__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParticleComposition'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParticleComposition'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParticleComposition::ParticleComposition()\n"
     "    ParticleComposition::ParticleComposition(IParticle const &,std::vector< kvector_t,std::allocator< kvector_t > >)\n");
@@ -113532,10 +111149,11 @@ SWIGINTERN PyObject *_wrap_delete_ParticleComposition(PyObject *SWIGUNUSEDPARM(s
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParticleComposition",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParticleComposition" "', argument " "1"" of type '" "ParticleComposition *""'"); 
   }
@@ -113553,11 +111171,12 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_clone(PyObject *SWIGUNUSEDPARM(se
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleComposition *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_clone" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113578,16 +111197,15 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_accept(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleComposition_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleComposition_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_accept" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
   arg1 = reinterpret_cast< ParticleComposition * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleComposition_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -113605,12 +111223,13 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_createFormFactor(PyObject *SWIGUN
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IFormFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_createFormFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_createFormFactor" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113629,7 +111248,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   IParticle *arg2 = 0 ;
@@ -113637,16 +111256,14 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_0(PyObject *SWI
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleComposition_addParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_addParticle" "', argument " "1"" of type '" "ParticleComposition *""'"); 
   }
   arg1 = reinterpret_cast< ParticleComposition * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleComposition_addParticle" "', argument " "2"" of type '" "IParticle const &""'"); 
   }
@@ -113662,7 +111279,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   IParticle *arg2 = 0 ;
@@ -113673,17 +111290,14 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_1(PyObject *SWI
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParticleComposition_addParticle",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_addParticle" "', argument " "1"" of type '" "ParticleComposition *""'"); 
   }
   arg1 = reinterpret_cast< ParticleComposition * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleComposition_addParticle" "', argument " "2"" of type '" "IParticle const &""'"); 
   }
@@ -113692,7 +111306,7 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle__SWIG_1(PyObject *SWI
   }
   arg2 = reinterpret_cast< IParticle * >(argp2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "ParticleComposition_addParticle" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -113717,23 +111331,19 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle(PyObject *self, PyObj
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParticleComposition_addParticle", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleComposition, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ParticleComposition_addParticle__SWIG_0(self, args);
+        return _wrap_ParticleComposition_addParticle__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -113743,20 +111353,20 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle(PyObject *self, PyObj
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleComposition, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_ParticleComposition_addParticle__SWIG_1(self, args);
+          return _wrap_ParticleComposition_addParticle__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParticleComposition_addParticle'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParticleComposition_addParticle'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParticleComposition::addParticle(IParticle const &)\n"
     "    ParticleComposition::addParticle(IParticle const &,kvector_t)\n");
@@ -113773,17 +111383,15 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticles(PyObject *SWIGUNUSED
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParticleComposition_addParticles",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleComposition_addParticles", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_addParticles" "', argument " "1"" of type '" "ParticleComposition *""'"); 
   }
   arg1 = reinterpret_cast< ParticleComposition * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleComposition_addParticles" "', argument " "2"" of type '" "IParticle const &""'"); 
   }
@@ -113793,7 +111401,7 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticles(PyObject *SWIGUNUSED
   arg2 = reinterpret_cast< IParticle * >(argp2);
   {
     std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *ptr = (std::vector< BasicVector3D< double >,std::allocator< BasicVector3D< double > > > *)0;
-    int res = swig::asptr(obj2, &ptr);
+    int res = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "ParticleComposition_addParticles" "', argument " "3"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > >""'"); 
     }
@@ -113813,11 +111421,12 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_nbrParticles(PyObject *SWIGUNUSED
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_nbrParticles",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_nbrParticles" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113835,11 +111444,12 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_getChildren(PyObject *SWIGUNUSEDP
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_getChildren" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113857,11 +111467,12 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_decompose(PyObject *SWIGUNUSEDPAR
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< SafePointerVector< IParticle > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_decompose",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_decompose" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113879,11 +111490,12 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_bottomTopZ(PyObject *SWIGUNUSEDPA
   ParticleComposition *arg1 = (ParticleComposition *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleComposition_bottomTopZ",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleComposition, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleComposition_bottomTopZ" "', argument " "1"" of type '" "ParticleComposition const *""'"); 
   }
@@ -113898,12 +111510,16 @@ fail:
 
 SWIGINTERN PyObject *ParticleComposition_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParticleComposition, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *ParticleComposition_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Particle *arg1 = 0 ;
   Particle *arg2 = 0 ;
@@ -113914,13 +111530,10 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   ParticleCoreShell *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ParticleCoreShell",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Particle,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Particle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleCoreShell" "', argument " "1"" of type '" "Particle const &""'"); 
   }
@@ -113928,7 +111541,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_0(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParticleCoreShell" "', argument " "1"" of type '" "Particle const &""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Particle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Particle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParticleCoreShell" "', argument " "2"" of type '" "Particle const &""'"); 
   }
@@ -113937,7 +111550,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_0(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< Particle * >(argp2);
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "new_ParticleCoreShell" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -113957,7 +111570,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Particle *arg1 = 0 ;
   Particle *arg2 = 0 ;
@@ -113965,12 +111578,10 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ParticleCoreShell *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParticleCoreShell",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Particle,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Particle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleCoreShell" "', argument " "1"" of type '" "Particle const &""'"); 
   }
@@ -113978,7 +111589,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParticleCoreShell" "', argument " "1"" of type '" "Particle const &""'"); 
   }
   arg1 = reinterpret_cast< Particle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Particle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Particle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParticleCoreShell" "', argument " "2"" of type '" "Particle const &""'"); 
   }
@@ -113999,44 +111610,40 @@ SWIGINTERN PyObject *_wrap_new_ParticleCoreShell(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParticleCoreShell", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Particle, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Particle, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Particle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Particle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_ParticleCoreShell__SWIG_1(self, args);
+        return _wrap_new_ParticleCoreShell__SWIG_1(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Particle, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Particle, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Particle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Particle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_ParticleCoreShell__SWIG_0(self, args);
+          return _wrap_new_ParticleCoreShell__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParticleCoreShell'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParticleCoreShell'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParticleCoreShell::ParticleCoreShell(Particle const &,Particle const &,kvector_t)\n"
     "    ParticleCoreShell::ParticleCoreShell(Particle const &,Particle const &)\n");
@@ -114049,10 +111656,11 @@ SWIGINTERN PyObject *_wrap_delete_ParticleCoreShell(PyObject *SWIGUNUSEDPARM(sel
   ParticleCoreShell *arg1 = (ParticleCoreShell *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParticleCoreShell",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParticleCoreShell" "', argument " "1"" of type '" "ParticleCoreShell *""'"); 
   }
@@ -114070,11 +111678,12 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_clone(PyObject *SWIGUNUSEDPARM(self
   ParticleCoreShell *arg1 = (ParticleCoreShell *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleCoreShell *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleCoreShell_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_clone" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
@@ -114095,16 +111704,15 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_accept(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleCoreShell_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleCoreShell_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_accept" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
   arg1 = reinterpret_cast< ParticleCoreShell * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleCoreShell_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -114125,18 +111733,17 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_createSlicedParticle(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   SlicedParticle result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleCoreShell_createSlicedParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleCoreShell_createSlicedParticle", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_createSlicedParticle" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
   arg1 = reinterpret_cast< ParticleCoreShell * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ZLimits,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleCoreShell_createSlicedParticle" "', argument " "2"" of type '" "ZLimits""'"); 
     }  
@@ -114163,11 +111770,12 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_coreParticle(PyObject *SWIGUNUSEDPA
   ParticleCoreShell *arg1 = (ParticleCoreShell *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleCoreShell_coreParticle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_coreParticle" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
@@ -114185,11 +111793,12 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_shellParticle(PyObject *SWIGUNUSEDP
   ParticleCoreShell *arg1 = (ParticleCoreShell *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Particle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleCoreShell_shellParticle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_shellParticle" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
@@ -114207,11 +111816,12 @@ SWIGINTERN PyObject *_wrap_ParticleCoreShell_getChildren(PyObject *SWIGUNUSEDPAR
   ParticleCoreShell *arg1 = (ParticleCoreShell *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleCoreShell_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleCoreShell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleCoreShell_getChildren" "', argument " "1"" of type '" "ParticleCoreShell const *""'"); 
   }
@@ -114226,11 +111836,15 @@ fail:
 
 SWIGINTERN PyObject *ParticleCoreShell_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParticleCoreShell, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ParticleCoreShell_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_ParticleDistribution(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IParticle *arg1 = 0 ;
@@ -114239,12 +111853,11 @@ SWIGINTERN PyObject *_wrap_new_ParticleDistribution(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   ParticleDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParticleDistribution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IParticle,  0  | 0);
+  if (!SWIG_Python_UnpackTuple(args, "new_ParticleDistribution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IParticle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleDistribution" "', argument " "1"" of type '" "IParticle const &""'"); 
   }
@@ -114252,7 +111865,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleDistribution(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParticleDistribution" "', argument " "1"" of type '" "IParticle const &""'"); 
   }
   arg1 = reinterpret_cast< IParticle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ParameterDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ParameterDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ParticleDistribution" "', argument " "2"" of type '" "ParameterDistribution const &""'"); 
   }
@@ -114273,11 +111886,12 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_clone(PyObject *SWIGUNUSEDPARM(s
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleDistribution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleDistribution_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_clone" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -114298,16 +111912,15 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleDistribution_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleDistribution_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_accept" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
   arg1 = reinterpret_cast< ParticleDistribution * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleDistribution_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -114328,17 +111941,16 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_translate(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleDistribution_translate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleDistribution_translate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_translate" "', argument " "1"" of type '" "ParticleDistribution *""'"); 
   }
   arg1 = reinterpret_cast< ParticleDistribution * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleDistribution_translate" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -114366,16 +111978,15 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_rotate(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleDistribution_rotate",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleDistribution_rotate", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_rotate" "', argument " "1"" of type '" "ParticleDistribution *""'"); 
   }
   arg1 = reinterpret_cast< ParticleDistribution * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleDistribution_rotate" "', argument " "2"" of type '" "IRotation const &""'"); 
   }
@@ -114396,11 +112007,12 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_generateParticles(PyObject *SWIG
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< SafePointerVector< IParticle > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleDistribution_generateParticles",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_generateParticles" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -114418,11 +112030,12 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_prototype(PyObject *SWIGUNUSEDPA
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IParticle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleDistribution_prototype",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_prototype" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -114440,11 +112053,12 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_parameterDistribution(PyObject *
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< ParameterDistribution > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleDistribution_parameterDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_parameterDistribution" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -114462,11 +112076,12 @@ SWIGINTERN PyObject *_wrap_ParticleDistribution_getChildren(PyObject *SWIGUNUSED
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleDistribution_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleDistribution_getChildren" "', argument " "1"" of type '" "ParticleDistribution const *""'"); 
   }
@@ -114484,10 +112099,11 @@ SWIGINTERN PyObject *_wrap_delete_ParticleDistribution(PyObject *SWIGUNUSEDPARM(
   ParticleDistribution *arg1 = (ParticleDistribution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParticleDistribution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleDistribution, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleDistribution, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParticleDistribution" "', argument " "1"" of type '" "ParticleDistribution *""'"); 
   }
@@ -114502,16 +112118,20 @@ fail:
 
 SWIGINTERN PyObject *ParticleDistribution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParticleDistribution, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *ParticleDistribution_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   ParticleLayout *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ParticleLayout")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (ParticleLayout *)new ParticleLayout();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParticleLayout, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -114520,7 +112140,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IAbstractParticle *arg1 = 0 ;
   double arg2 ;
@@ -114528,12 +112148,10 @@ SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ParticleLayout *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ParticleLayout",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleLayout" "', argument " "1"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114541,7 +112159,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_1(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ParticleLayout" "', argument " "1"" of type '" "IAbstractParticle const &""'"); 
   }
   arg1 = reinterpret_cast< IAbstractParticle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ParticleLayout" "', argument " "2"" of type '" "double""'");
   } 
@@ -114554,16 +112172,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ParticleLayout__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IAbstractParticle *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   ParticleLayout *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_ParticleLayout",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ParticleLayout" "', argument " "1"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114584,27 +112201,23 @@ SWIGINTERN PyObject *_wrap_new_ParticleLayout(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_ParticleLayout", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_ParticleLayout__SWIG_0(self, args);
+    return _wrap_new_ParticleLayout__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAbstractParticle, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_ParticleLayout__SWIG_2(self, args);
+      return _wrap_new_ParticleLayout__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAbstractParticle, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -114612,13 +112225,13 @@ SWIGINTERN PyObject *_wrap_new_ParticleLayout(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_ParticleLayout__SWIG_1(self, args);
+        return _wrap_new_ParticleLayout__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_ParticleLayout'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ParticleLayout'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParticleLayout::ParticleLayout()\n"
     "    ParticleLayout::ParticleLayout(IAbstractParticle const &,double)\n"
@@ -114632,10 +112245,11 @@ SWIGINTERN PyObject *_wrap_delete_ParticleLayout(PyObject *SWIGUNUSEDPARM(self),
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ParticleLayout",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ParticleLayout" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
@@ -114653,11 +112267,12 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_clone(PyObject *SWIGUNUSEDPARM(self),
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ParticleLayout *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_clone" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -114678,16 +112293,15 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_accept(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLayout_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleLayout_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_accept" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -114700,7 +112314,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   IAbstractParticle *arg2 = 0 ;
@@ -114717,19 +112331,14 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_0(PyObject *SWIGUNUS
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:ParticleLayout_addParticle",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_addParticle" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114737,13 +112346,13 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_0(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
   arg2 = reinterpret_cast< IAbstractParticle * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParticleLayout_addParticle" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ParticleLayout_addParticle" "', argument " "4"" of type '" "kvector_t const""'"); 
     }  
@@ -114755,7 +112364,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_0(PyObject *SWIGUNUS
       if (SWIG_IsNewObj(res4)) delete temp;
     }
   }
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_IRotation,  0  | 0);
+  res5 = SWIG_ConvertPtr(swig_obj[4], &argp5, SWIGTYPE_p_IRotation,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ParticleLayout_addParticle" "', argument " "5"" of type '" "IRotation const &""'"); 
   }
@@ -114771,7 +112380,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   IAbstractParticle *arg2 = 0 ;
@@ -114785,18 +112394,14 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_1(PyObject *SWIGUNUS
   int ecode3 = 0 ;
   void *argp4 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:ParticleLayout_addParticle",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_addParticle" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114804,13 +112409,13 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_1(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
   arg2 = reinterpret_cast< IAbstractParticle * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParticleLayout_addParticle" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
   {
-    res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ParticleLayout_addParticle" "', argument " "4"" of type '" "kvector_t const""'"); 
     }  
@@ -114830,7 +112435,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   IAbstractParticle *arg2 = 0 ;
@@ -114841,17 +112446,14 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_2(PyObject *SWIGUNUS
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ParticleLayout_addParticle",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_addParticle" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114859,7 +112461,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_2(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
   arg2 = reinterpret_cast< IAbstractParticle * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ParticleLayout_addParticle" "', argument " "3"" of type '" "double""'");
   } 
@@ -114872,7 +112474,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   IAbstractParticle *arg2 = 0 ;
@@ -114880,16 +112482,14 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle__SWIG_3(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLayout_addParticle",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_addParticle" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAbstractParticle,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_addParticle" "', argument " "2"" of type '" "IAbstractParticle const &""'"); 
   }
@@ -114910,23 +112510,19 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ParticleLayout_addParticle", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleLayout, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ParticleLayout_addParticle__SWIG_3(self, args);
+        return _wrap_ParticleLayout_addParticle__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -114936,7 +112532,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleLayout, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -114944,7 +112540,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_ParticleLayout_addParticle__SWIG_2(self, args);
+          return _wrap_ParticleLayout_addParticle__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -114955,7 +112551,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleLayout, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -114963,10 +112559,10 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_ParticleLayout_addParticle__SWIG_1(self, args);
+            return _wrap_ParticleLayout_addParticle__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -114978,7 +112574,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ParticleLayout, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAbstractParticle, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -114986,13 +112582,13 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_IRotation, 0);
+            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_IRotation, SWIG_POINTER_NO_NULL | 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_ParticleLayout_addParticle__SWIG_0(self, args);
+              return _wrap_ParticleLayout_addParticle__SWIG_0(self, argc, argv);
             }
           }
         }
@@ -115001,7 +112597,7 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ParticleLayout_addParticle'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ParticleLayout_addParticle'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ParticleLayout::addParticle(IAbstractParticle const &,double,kvector_t const,IRotation const &)\n"
     "    ParticleLayout::addParticle(IAbstractParticle const &,double,kvector_t const)\n"
@@ -115016,11 +112612,12 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_particles(PyObject *SWIGUNUSEDPARM(sel
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< SafePointerVector< IParticle > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_particles",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_particles" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -115038,12 +112635,13 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_interferenceFunction(PyObject *SWIGUNU
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Swig::Director *director = 0;
   IInterferenceFunction *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_interferenceFunction",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_interferenceFunction" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -115067,11 +112665,12 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_getTotalAbundance(PyObject *SWIGUNUSED
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_getTotalAbundance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_getTotalAbundance" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -115092,16 +112691,15 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_setInterferenceFunction(PyObject *SWIG
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLayout_setInterferenceFunction",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleLayout_setInterferenceFunction", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_setInterferenceFunction" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IInterferenceFunction,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ParticleLayout_setInterferenceFunction" "', argument " "2"" of type '" "IInterferenceFunction const &""'"); 
   }
@@ -115122,11 +112720,12 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_totalParticleSurfaceDensity(PyObject *
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_totalParticleSurfaceDensity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_totalParticleSurfaceDensity" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -115147,16 +112746,15 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_setTotalParticleSurfaceDensity(PyObjec
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ParticleLayout_setTotalParticleSurfaceDensity",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ParticleLayout_setTotalParticleSurfaceDensity", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_setTotalParticleSurfaceDensity" "', argument " "1"" of type '" "ParticleLayout *""'"); 
   }
   arg1 = reinterpret_cast< ParticleLayout * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ParticleLayout_setTotalParticleSurfaceDensity" "', argument " "2"" of type '" "double""'");
   } 
@@ -115174,11 +112772,12 @@ SWIGINTERN PyObject *_wrap_ParticleLayout_getChildren(PyObject *SWIGUNUSEDPARM(s
   ParticleLayout *arg1 = (ParticleLayout *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< INode const *,std::allocator< INode const * > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ParticleLayout_getChildren",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ParticleLayout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ParticleLayout_getChildren" "', argument " "1"" of type '" "ParticleLayout const *""'"); 
   }
@@ -115193,22 +112792,25 @@ fail:
 
 SWIGINTERN PyObject *ParticleLayout_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ParticleLayout, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_importArrayToOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *ParticleLayout_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_importArrayToOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double,std::allocator< double > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:importArrayToOutputData",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "importArrayToOutputData" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -115227,17 +112829,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_importArrayToOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_importArrayToOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   OutputData< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:importArrayToOutputData",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "importArrayToOutputData" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -115261,19 +112862,15 @@ SWIGINTERN PyObject *_wrap_importArrayToOutputData(PyObject *self, PyObject *arg
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "importArrayToOutputData", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_importArrayToOutputData__SWIG_0(self, args);
+      return _wrap_importArrayToOutputData__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -115281,12 +112878,12 @@ SWIGINTERN PyObject *_wrap_importArrayToOutputData(PyObject *self, PyObject *arg
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_importArrayToOutputData__SWIG_1(self, args);
+      return _wrap_importArrayToOutputData__SWIG_1(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'importArrayToOutputData'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'importArrayToOutputData'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    PyArrayImport::importArrayToOutputData(std::vector< double,std::allocator< double > > const &)\n"
     "    PyArrayImport::importArrayToOutputData(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n");
@@ -115298,7 +112895,7 @@ SWIGINTERN PyObject *_wrap_new_PoissonNoiseBackground(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   PoissonNoiseBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_PoissonNoiseBackground")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_PoissonNoiseBackground", 0, 0, 0)) SWIG_fail;
   result = (PoissonNoiseBackground *)new PoissonNoiseBackground();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PoissonNoiseBackground, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -115312,10 +112909,11 @@ SWIGINTERN PyObject *_wrap_delete_PoissonNoiseBackground(PyObject *SWIGUNUSEDPAR
   PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PoissonNoiseBackground",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PoissonNoiseBackground, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PoissonNoiseBackground" "', argument " "1"" of type '" "PoissonNoiseBackground *""'"); 
   }
@@ -115333,11 +112931,12 @@ SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_clone(PyObject *SWIGUNUSEDPARM
   PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PoissonNoiseBackground *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PoissonNoiseBackground_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_clone" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'"); 
   }
@@ -115358,16 +112957,15 @@ SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_accept(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PoissonNoiseBackground_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_accept" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'"); 
   }
   arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PoissonNoiseBackground_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -115388,17 +112986,16 @@ SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_addBackGround(PyObject *SWIGUN
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PoissonNoiseBackground_addBackGround",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_addBackGround", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'"); 
   }
   arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "2"" of type '" "double""'");
   } 
@@ -115413,23 +113010,25 @@ fail:
 
 SWIGINTERN PyObject *PoissonNoiseBackground_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PoissonNoiseBackground, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PoissonNoiseBackground_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double,std::allocator< double > > arg1 ;
   std::vector< double,std::allocator< double > > arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Polygon *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Polygon",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    int res = swig::asptr(obj0, &ptr);
+    int res = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'"); 
     }
@@ -115438,7 +113037,7 @@ SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    int res = swig::asptr(obj1, &ptr);
+    int res = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const""'"); 
     }
@@ -115453,16 +113052,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > arg1 ;
-  PyObject * obj0 = 0 ;
   Polygon *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Polygon",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    int res = swig::asptr(obj0, &ptr);
+    int res = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const""'"); 
     }
@@ -115477,16 +113075,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PolygonPrivate *arg1 = (PolygonPrivate *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   Polygon *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_Polygon",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PolygonPrivate, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolygonPrivate, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Polygon" "', argument " "1"" of type '" "PolygonPrivate const *""'"); 
   }
@@ -115504,20 +113101,16 @@ SWIGINTERN PyObject *_wrap_new_Polygon(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Polygon", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_PolygonPrivate, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Polygon__SWIG_2(self, args);
+      return _wrap_new_Polygon__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -115525,7 +113118,7 @@ SWIGINTERN PyObject *_wrap_new_Polygon(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_Polygon__SWIG_1(self, args);
+      return _wrap_new_Polygon__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -115536,13 +113129,13 @@ SWIGINTERN PyObject *_wrap_new_Polygon(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_Polygon__SWIG_0(self, args);
+        return _wrap_new_Polygon__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Polygon'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Polygon'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Polygon::Polygon(std::vector< double,std::allocator< double > > const,std::vector< double,std::allocator< double > > const)\n"
     "    Polygon::Polygon(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const)\n"
@@ -115556,10 +113149,11 @@ SWIGINTERN PyObject *_wrap_delete_Polygon(PyObject *SWIGUNUSEDPARM(self), PyObje
   Polygon *arg1 = (Polygon *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Polygon",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Polygon" "', argument " "1"" of type '" "Polygon *""'"); 
   }
@@ -115577,11 +113171,12 @@ SWIGINTERN PyObject *_wrap_Polygon_clone(PyObject *SWIGUNUSEDPARM(self), PyObjec
   Polygon *arg1 = (Polygon *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Polygon *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Polygon_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Polygon_clone" "', argument " "1"" of type '" "Polygon const *""'"); 
   }
@@ -115594,7 +113189,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Polygon *arg1 = (Polygon *) 0 ;
   double arg2 ;
@@ -115605,23 +113200,20 @@ SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Polygon_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Polygon_contains" "', argument " "1"" of type '" "Polygon const *""'"); 
   }
   arg1 = reinterpret_cast< Polygon * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Polygon_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Polygon_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -115634,7 +113226,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Polygon *arg1 = (Polygon *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -115645,18 +113237,15 @@ SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Polygon_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Polygon_contains" "', argument " "1"" of type '" "Polygon const *""'"); 
   }
   arg1 = reinterpret_cast< Polygon * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Polygon_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -115664,7 +113253,7 @@ SWIGINTERN PyObject *_wrap_Polygon_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Polygon_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Polygon_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -115685,26 +113274,22 @@ SWIGINTERN PyObject *_wrap_Polygon_contains(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Polygon_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Polygon, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Polygon_contains__SWIG_1(self, args);
+          return _wrap_Polygon_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -115725,14 +113310,14 @@ SWIGINTERN PyObject *_wrap_Polygon_contains(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Polygon_contains__SWIG_0(self, args);
+          return _wrap_Polygon_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Polygon_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Polygon_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Polygon::contains(double,double) const\n"
     "    Polygon::contains(Bin1D const &,Bin1D const &) const\n");
@@ -115745,11 +113330,12 @@ SWIGINTERN PyObject *_wrap_Polygon_getArea(PyObject *SWIGUNUSEDPARM(self), PyObj
   Polygon *arg1 = (Polygon *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Polygon_getArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Polygon_getArea" "', argument " "1"" of type '" "Polygon const *""'"); 
   }
@@ -115773,17 +113359,15 @@ SWIGINTERN PyObject *_wrap_Polygon_getPoints(PyObject *SWIGUNUSEDPARM(self), PyO
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Polygon_getPoints",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Polygon_getPoints", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Polygon, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Polygon_getPoints" "', argument " "1"" of type '" "Polygon const *""'"); 
   }
   arg1 = reinterpret_cast< Polygon * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Polygon_getPoints" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > &""'"); 
   }
@@ -115791,7 +113375,7 @@ SWIGINTERN PyObject *_wrap_Polygon_getPoints(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Polygon_getPoints" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > &""'"); 
   }
   arg2 = reinterpret_cast< std::vector< double,std::allocator< double > > * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Polygon_getPoints" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > &""'"); 
   }
@@ -115809,16 +113393,20 @@ fail:
 
 SWIGINTERN PyObject *Polygon_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Polygon, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Polygon_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   RangedDistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RangedDistributionGate")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (RangedDistributionGate *)new RangedDistributionGate();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionGate, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -115827,7 +113415,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -115838,23 +113426,20 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_1(PyObject *SWIGUNUS
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   RangedDistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RangedDistributionGate",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGate" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionGate" "', argument " "3"" of type '" "RealLimits const &""'"); 
   }
@@ -115870,7 +113455,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -115878,17 +113463,15 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_2(PyObject *SWIGUNUS
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RangedDistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RangedDistributionGate",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGate" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGate" "', argument " "2"" of type '" "double""'");
   } 
@@ -115901,7 +113484,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -115915,29 +113498,25 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate__SWIG_3(PyObject *SWIGUNUS
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RangedDistributionGate *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RangedDistributionGate",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGate" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGate" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionGate" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionGate" "', argument " "4"" of type '" "double""'");
   } 
@@ -115955,15 +113534,281 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate(PyObject *self, PyObject *
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RangedDistributionGate", 0, 4, argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_RangedDistributionGate__SWIG_0(self, argc, argv);
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_RangedDistributionGate__SWIG_2(self, argc, argv);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_RangedDistributionGate__SWIG_1(self, argc, argv);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_RangedDistributionGate__SWIG_3(self, argc, argv);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RangedDistributionGate'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    RangedDistributionGate::RangedDistributionGate()\n"
+    "    RangedDistributionGate::RangedDistributionGate(size_t,double,RealLimits const &)\n"
+    "    RangedDistributionGate::RangedDistributionGate(size_t,double)\n"
+    "    RangedDistributionGate::RangedDistributionGate(size_t,double,double,double)\n");
+  return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_RangedDistributionGate_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  RangedDistributionGate *arg1 = (RangedDistributionGate *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  RangedDistributionGate *result = 0 ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionGate, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionGate_clone" "', argument " "1"" of type '" "RangedDistributionGate const *""'"); 
+  }
+  arg1 = reinterpret_cast< RangedDistributionGate * >(argp1);
+  result = (RangedDistributionGate *)((RangedDistributionGate const *)arg1)->clone();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionGate, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_RangedDistributionGate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  RangedDistributionGate *arg1 = (RangedDistributionGate *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionGate, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionGate" "', argument " "1"" of type '" "RangedDistributionGate *""'"); 
+  }
+  arg1 = reinterpret_cast< RangedDistributionGate * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *RangedDistributionGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionGate, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *RangedDistributionGate_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+  PyObject *resultobj = 0;
+  RangedDistributionLorentz *result = 0 ;
+  
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  result = (RangedDistributionLorentz *)new RangedDistributionLorentz();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  size_t arg1 ;
+  double arg2 ;
+  RealLimits *arg3 = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  RangedDistributionLorentz *result = 0 ;
+  
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
+  } 
+  arg1 = static_cast< size_t >(val1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "RealLimits const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "RealLimits const &""'"); 
   }
+  arg3 = reinterpret_cast< RealLimits * >(argp3);
+  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2,(RealLimits const &)*arg3);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  size_t arg1 ;
+  double arg2 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  RangedDistributionLorentz *result = 0 ;
+  
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
+  } 
+  arg1 = static_cast< size_t >(val1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  size_t arg1 ;
+  double arg2 ;
+  double arg3 ;
+  double arg4 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  RangedDistributionLorentz *result = 0 ;
+  
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
+  } 
+  arg1 = static_cast< size_t >(val1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = static_cast< double >(val3);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionLorentz" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = static_cast< double >(val4);
+  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2,arg3,arg4);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz(PyObject *self, PyObject *args) {
+  Py_ssize_t argc;
+  PyObject *argv[5] = {
+    0
+  };
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RangedDistributionLorentz", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_RangedDistributionGate__SWIG_0(self, args);
+    return _wrap_new_RangedDistributionLorentz__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -115977,7 +113822,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate(PyObject *self, PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_RangedDistributionGate__SWIG_2(self, args);
+        return _wrap_new_RangedDistributionLorentz__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -115993,10 +113838,10 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate(PyObject *self, PyObject *
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_RangedDistributionGate__SWIG_1(self, args);
+          return _wrap_new_RangedDistributionLorentz__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -116023,7 +113868,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate(PyObject *self, PyObject *
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_RangedDistributionGate__SWIG_3(self, args);
+            return _wrap_new_RangedDistributionLorentz__SWIG_3(self, argc, argv);
           }
         }
       }
@@ -116031,284 +113876,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGate(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RangedDistributionGate'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    RangedDistributionGate::RangedDistributionGate()\n"
-    "    RangedDistributionGate::RangedDistributionGate(size_t,double,RealLimits const &)\n"
-    "    RangedDistributionGate::RangedDistributionGate(size_t,double)\n"
-    "    RangedDistributionGate::RangedDistributionGate(size_t,double,double,double)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_RangedDistributionGate_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  RangedDistributionGate *arg1 = (RangedDistributionGate *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  RangedDistributionGate *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:RangedDistributionGate_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionGate, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionGate_clone" "', argument " "1"" of type '" "RangedDistributionGate const *""'"); 
-  }
-  arg1 = reinterpret_cast< RangedDistributionGate * >(argp1);
-  result = (RangedDistributionGate *)((RangedDistributionGate const *)arg1)->clone();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionGate, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_RangedDistributionGate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  RangedDistributionGate *arg1 = (RangedDistributionGate *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RangedDistributionGate",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionGate, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionGate" "', argument " "1"" of type '" "RangedDistributionGate *""'"); 
-  }
-  arg1 = reinterpret_cast< RangedDistributionGate * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *RangedDistributionGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionGate, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  RangedDistributionLorentz *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_RangedDistributionLorentz")) SWIG_fail;
-  result = (RangedDistributionLorentz *)new RangedDistributionLorentz();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  size_t arg1 ;
-  double arg2 ;
-  RealLimits *arg3 = 0 ;
-  size_t val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  RangedDistributionLorentz *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RangedDistributionLorentz",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
-  } 
-  arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "RealLimits const &""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "RealLimits const &""'"); 
-  }
-  arg3 = reinterpret_cast< RealLimits * >(argp3);
-  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2,(RealLimits const &)*arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  size_t arg1 ;
-  double arg2 ;
-  size_t val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  RangedDistributionLorentz *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RangedDistributionLorentz",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
-  } 
-  arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  size_t arg1 ;
-  double arg2 ;
-  double arg3 ;
-  double arg4 ;
-  size_t val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  RangedDistributionLorentz *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RangedDistributionLorentz",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLorentz" "', argument " "1"" of type '" "size_t""'");
-  } 
-  arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLorentz" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionLorentz" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionLorentz" "', argument " "4"" of type '" "double""'");
-  } 
-  arg4 = static_cast< double >(val4);
-  result = (RangedDistributionLorentz *)new RangedDistributionLorentz(arg1,arg2,arg3,arg4);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLorentz(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[5] = {
-    0
-  };
-  Py_ssize_t ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 0) {
-    return _wrap_new_RangedDistributionLorentz__SWIG_0(self, args);
-  }
-  if (argc == 2) {
-    int _v;
-    {
-      int res = SWIG_AsVal_size_t(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_new_RangedDistributionLorentz__SWIG_2(self, args);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    {
-      int res = SWIG_AsVal_size_t(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_new_RangedDistributionLorentz__SWIG_1(self, args);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    {
-      int res = SWIG_AsVal_size_t(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_new_RangedDistributionLorentz__SWIG_3(self, args);
-          }
-        }
-      }
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RangedDistributionLorentz'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RangedDistributionLorentz'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RangedDistributionLorentz::RangedDistributionLorentz()\n"
     "    RangedDistributionLorentz::RangedDistributionLorentz(size_t,double,RealLimits const &)\n"
@@ -116323,11 +113891,12 @@ SWIGINTERN PyObject *_wrap_RangedDistributionLorentz_clone(PyObject *SWIGUNUSEDP
   RangedDistributionLorentz *arg1 = (RangedDistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RangedDistributionLorentz *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RangedDistributionLorentz_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionLorentz, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionLorentz, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionLorentz_clone" "', argument " "1"" of type '" "RangedDistributionLorentz const *""'"); 
   }
@@ -116345,10 +113914,11 @@ SWIGINTERN PyObject *_wrap_delete_RangedDistributionLorentz(PyObject *SWIGUNUSED
   RangedDistributionLorentz *arg1 = (RangedDistributionLorentz *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RangedDistributionLorentz",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionLorentz, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionLorentz" "', argument " "1"" of type '" "RangedDistributionLorentz *""'"); 
   }
@@ -116363,16 +113933,20 @@ fail:
 
 SWIGINTERN PyObject *RangedDistributionLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionLorentz, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RangedDistributionLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   RangedDistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RangedDistributionGaussian")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (RangedDistributionGaussian *)new RangedDistributionGaussian();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionGaussian, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -116381,7 +113955,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116392,23 +113966,20 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_1(PyObject *SWIG
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   RangedDistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RangedDistributionGaussian",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGaussian" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGaussian" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionGaussian" "', argument " "3"" of type '" "RealLimits const &""'"); 
   }
@@ -116424,7 +113995,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116432,17 +114003,15 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_2(PyObject *SWIG
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RangedDistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RangedDistributionGaussian",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGaussian" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGaussian" "', argument " "2"" of type '" "double""'");
   } 
@@ -116455,7 +114024,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116469,29 +114038,25 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian__SWIG_3(PyObject *SWIG
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RangedDistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RangedDistributionGaussian",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionGaussian" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionGaussian" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionGaussian" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionGaussian" "', argument " "4"" of type '" "double""'");
   } 
@@ -116509,15 +114074,11 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian(PyObject *self, PyObje
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RangedDistributionGaussian", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_RangedDistributionGaussian__SWIG_0(self, args);
+    return _wrap_new_RangedDistributionGaussian__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -116531,7 +114092,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian(PyObject *self, PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_RangedDistributionGaussian__SWIG_2(self, args);
+        return _wrap_new_RangedDistributionGaussian__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -116547,10 +114108,10 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian(PyObject *self, PyObje
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_RangedDistributionGaussian__SWIG_1(self, args);
+          return _wrap_new_RangedDistributionGaussian__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -116577,7 +114138,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian(PyObject *self, PyObje
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_RangedDistributionGaussian__SWIG_3(self, args);
+            return _wrap_new_RangedDistributionGaussian__SWIG_3(self, argc, argv);
           }
         }
       }
@@ -116585,7 +114146,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionGaussian(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RangedDistributionGaussian'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RangedDistributionGaussian'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RangedDistributionGaussian::RangedDistributionGaussian()\n"
     "    RangedDistributionGaussian::RangedDistributionGaussian(size_t,double,RealLimits const &)\n"
@@ -116600,11 +114161,12 @@ SWIGINTERN PyObject *_wrap_RangedDistributionGaussian_clone(PyObject *SWIGUNUSED
   RangedDistributionGaussian *arg1 = (RangedDistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RangedDistributionGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RangedDistributionGaussian_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionGaussian_clone" "', argument " "1"" of type '" "RangedDistributionGaussian const *""'"); 
   }
@@ -116622,10 +114184,11 @@ SWIGINTERN PyObject *_wrap_delete_RangedDistributionGaussian(PyObject *SWIGUNUSE
   RangedDistributionGaussian *arg1 = (RangedDistributionGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RangedDistributionGaussian",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionGaussian, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionGaussian, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionGaussian" "', argument " "1"" of type '" "RangedDistributionGaussian *""'"); 
   }
@@ -116640,16 +114203,20 @@ fail:
 
 SWIGINTERN PyObject *RangedDistributionGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionGaussian, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RangedDistributionGaussian_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   RangedDistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RangedDistributionLogNormal")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (RangedDistributionLogNormal *)new RangedDistributionLogNormal();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionLogNormal, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -116658,7 +114225,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116669,23 +114236,20 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_1(PyObject *SWI
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   RangedDistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RangedDistributionLogNormal",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLogNormal" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLogNormal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionLogNormal" "', argument " "3"" of type '" "RealLimits const &""'"); 
   }
@@ -116701,7 +114265,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116709,17 +114273,15 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_2(PyObject *SWI
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RangedDistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RangedDistributionLogNormal",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLogNormal" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLogNormal" "', argument " "2"" of type '" "double""'");
   } 
@@ -116732,7 +114294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116746,29 +114308,25 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal__SWIG_3(PyObject *SWI
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RangedDistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RangedDistributionLogNormal",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionLogNormal" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionLogNormal" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionLogNormal" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionLogNormal" "', argument " "4"" of type '" "double""'");
   } 
@@ -116786,15 +114344,11 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal(PyObject *self, PyObj
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RangedDistributionLogNormal", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_RangedDistributionLogNormal__SWIG_0(self, args);
+    return _wrap_new_RangedDistributionLogNormal__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -116808,7 +114362,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal(PyObject *self, PyObj
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_RangedDistributionLogNormal__SWIG_2(self, args);
+        return _wrap_new_RangedDistributionLogNormal__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -116824,10 +114378,10 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal(PyObject *self, PyObj
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_RangedDistributionLogNormal__SWIG_1(self, args);
+          return _wrap_new_RangedDistributionLogNormal__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -116854,7 +114408,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal(PyObject *self, PyObj
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_RangedDistributionLogNormal__SWIG_3(self, args);
+            return _wrap_new_RangedDistributionLogNormal__SWIG_3(self, argc, argv);
           }
         }
       }
@@ -116862,7 +114416,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionLogNormal(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RangedDistributionLogNormal'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RangedDistributionLogNormal'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RangedDistributionLogNormal::RangedDistributionLogNormal()\n"
     "    RangedDistributionLogNormal::RangedDistributionLogNormal(size_t,double,RealLimits const &)\n"
@@ -116877,11 +114431,12 @@ SWIGINTERN PyObject *_wrap_RangedDistributionLogNormal_clone(PyObject *SWIGUNUSE
   RangedDistributionLogNormal *arg1 = (RangedDistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RangedDistributionLogNormal *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RangedDistributionLogNormal_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionLogNormal, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionLogNormal, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionLogNormal_clone" "', argument " "1"" of type '" "RangedDistributionLogNormal const *""'"); 
   }
@@ -116899,10 +114454,11 @@ SWIGINTERN PyObject *_wrap_delete_RangedDistributionLogNormal(PyObject *SWIGUNUS
   RangedDistributionLogNormal *arg1 = (RangedDistributionLogNormal *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RangedDistributionLogNormal",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionLogNormal, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionLogNormal, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionLogNormal" "', argument " "1"" of type '" "RangedDistributionLogNormal *""'"); 
   }
@@ -116917,16 +114473,20 @@ fail:
 
 SWIGINTERN PyObject *RangedDistributionLogNormal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionLogNormal, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RangedDistributionLogNormal_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   RangedDistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RangedDistributionCosine")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (RangedDistributionCosine *)new RangedDistributionCosine();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RangedDistributionCosine, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -116935,7 +114495,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116946,23 +114506,20 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_1(PyObject *SWIGUN
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   RangedDistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RangedDistributionCosine",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionCosine" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionCosine" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RangedDistributionCosine" "', argument " "3"" of type '" "RealLimits const &""'"); 
   }
@@ -116978,7 +114535,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -116986,17 +114543,15 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_2(PyObject *SWIGUN
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RangedDistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RangedDistributionCosine",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionCosine" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionCosine" "', argument " "2"" of type '" "double""'");
   } 
@@ -117009,7 +114564,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -117023,29 +114578,25 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine__SWIG_3(PyObject *SWIGUN
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RangedDistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RangedDistributionCosine",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RangedDistributionCosine" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RangedDistributionCosine" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RangedDistributionCosine" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RangedDistributionCosine" "', argument " "4"" of type '" "double""'");
   } 
@@ -117063,15 +114614,11 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RangedDistributionCosine", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_RangedDistributionCosine__SWIG_0(self, args);
+    return _wrap_new_RangedDistributionCosine__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -117085,7 +114632,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_RangedDistributionCosine__SWIG_2(self, args);
+        return _wrap_new_RangedDistributionCosine__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -117101,10 +114648,10 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_RangedDistributionCosine__SWIG_1(self, args);
+          return _wrap_new_RangedDistributionCosine__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -117131,7 +114678,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine(PyObject *self, PyObject
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_RangedDistributionCosine__SWIG_3(self, args);
+            return _wrap_new_RangedDistributionCosine__SWIG_3(self, argc, argv);
           }
         }
       }
@@ -117139,7 +114686,7 @@ SWIGINTERN PyObject *_wrap_new_RangedDistributionCosine(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RangedDistributionCosine'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RangedDistributionCosine'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RangedDistributionCosine::RangedDistributionCosine()\n"
     "    RangedDistributionCosine::RangedDistributionCosine(size_t,double,RealLimits const &)\n"
@@ -117154,11 +114701,12 @@ SWIGINTERN PyObject *_wrap_RangedDistributionCosine_clone(PyObject *SWIGUNUSEDPA
   RangedDistributionCosine *arg1 = (RangedDistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RangedDistributionCosine *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RangedDistributionCosine_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionCosine, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionCosine, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RangedDistributionCosine_clone" "', argument " "1"" of type '" "RangedDistributionCosine const *""'"); 
   }
@@ -117176,10 +114724,11 @@ SWIGINTERN PyObject *_wrap_delete_RangedDistributionCosine(PyObject *SWIGUNUSEDP
   RangedDistributionCosine *arg1 = (RangedDistributionCosine *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RangedDistributionCosine",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RangedDistributionCosine, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RangedDistributionCosine, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RangedDistributionCosine" "', argument " "1"" of type '" "RangedDistributionCosine *""'"); 
   }
@@ -117194,12 +114743,16 @@ fail:
 
 SWIGINTERN PyObject *RangedDistributionCosine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RangedDistributionCosine, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RangedDistributionCosine_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double *arg2 = (double *) 0 ;
@@ -117217,18 +114770,12 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_RealParameter",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RealParameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -117237,14 +114784,14 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RealParameter" "', argument " "2"" of type '" "double *""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RealParameter" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -117253,7 +114800,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     }
     arg3 = ptr;
   }
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_RealParameter" "', argument " "4"" of type '" "std::function< void () > const &""'"); 
   }
@@ -117261,7 +114808,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RealParameter" "', argument " "4"" of type '" "std::function< void () > const &""'"); 
   }
   arg4 = reinterpret_cast< std::function< void () > * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
+  res5 = SWIG_ConvertPtr(swig_obj[4], &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_RealParameter" "', argument " "5"" of type '" "RealLimits const &""'"); 
   }
@@ -117269,7 +114816,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RealParameter" "', argument " "5"" of type '" "RealLimits const &""'"); 
   }
   arg5 = reinterpret_cast< RealLimits * >(argp5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_Attributes,  0  | 0);
+  res6 = SWIG_ConvertPtr(swig_obj[5], &argp6, SWIGTYPE_p_Attributes,  0  | 0);
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_RealParameter" "', argument " "6"" of type '" "Attributes const &""'"); 
   }
@@ -117289,7 +114836,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double *arg2 = (double *) 0 ;
@@ -117304,17 +114851,12 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_RealParameter",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RealParameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -117323,14 +114865,14 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RealParameter" "', argument " "2"" of type '" "double *""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RealParameter" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -117339,7 +114881,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     }
     arg3 = ptr;
   }
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_RealParameter" "', argument " "4"" of type '" "std::function< void () > const &""'"); 
   }
@@ -117347,7 +114889,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RealParameter" "', argument " "4"" of type '" "std::function< void () > const &""'"); 
   }
   arg4 = reinterpret_cast< std::function< void () > * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
+  res5 = SWIG_ConvertPtr(swig_obj[4], &argp5, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_RealParameter" "', argument " "5"" of type '" "RealLimits const &""'"); 
   }
@@ -117367,7 +114909,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double *arg2 = (double *) 0 ;
@@ -117379,16 +114921,12 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_2(PyObject *SWIGUNUSEDPARM(se
   int res3 = SWIG_OLDOBJ ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RealParameter",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RealParameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -117397,14 +114935,14 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_2(PyObject *SWIGUNUSEDPARM(se
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RealParameter" "', argument " "2"" of type '" "double *""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RealParameter" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -117413,7 +114951,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_2(PyObject *SWIGUNUSEDPARM(se
     }
     arg3 = ptr;
   }
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_std__functionT_void_fF_t,  0  | 0);
   if (!SWIG_IsOK(res4)) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_RealParameter" "', argument " "4"" of type '" "std::function< void () > const &""'"); 
   }
@@ -117433,7 +114971,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double *arg2 = (double *) 0 ;
@@ -117442,15 +114980,12 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_3(PyObject *SWIGUNUSEDPARM(se
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RealParameter",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RealParameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -117459,14 +114994,14 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_3(PyObject *SWIGUNUSEDPARM(se
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RealParameter" "', argument " "2"" of type '" "double *""'"); 
   }
   arg2 = reinterpret_cast< double * >(argp2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RealParameter" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -117487,21 +115022,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double *arg2 = (double *) 0 ;
   int res1 = SWIG_OLDOBJ ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_RealParameter",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RealParameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -117510,7 +115043,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter__SWIG_4(PyObject *SWIGUNUSEDPARM(se
     }
     arg1 = ptr;
   }
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RealParameter" "', argument " "2"" of type '" "double *""'"); 
   }
@@ -117530,13 +115063,9 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RealParameter", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
@@ -117546,7 +115075,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_RealParameter__SWIG_4(self, args);
+        return _wrap_new_RealParameter__SWIG_4(self, argc, argv);
       }
     }
   }
@@ -117562,7 +115091,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_RealParameter__SWIG_3(self, args);
+          return _wrap_new_RealParameter__SWIG_3(self, argc, argv);
         }
       }
     }
@@ -117579,10 +115108,10 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_new_RealParameter__SWIG_2(self, args);
+            return _wrap_new_RealParameter__SWIG_2(self, argc, argv);
           }
         }
       }
@@ -117600,13 +115129,13 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, 0);
+            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_new_RealParameter__SWIG_1(self, args);
+              return _wrap_new_RealParameter__SWIG_1(self, argc, argv);
             }
           }
         }
@@ -117625,16 +115154,16 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__functionT_void_fF_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, 0);
+            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_RealLimits, SWIG_POINTER_NO_NULL | 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_Attributes, 0);
+              int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_Attributes, SWIG_POINTER_NO_NULL | 0);
               _v = SWIG_CheckState(res);
               if (_v) {
-                return _wrap_new_RealParameter__SWIG_0(self, args);
+                return _wrap_new_RealParameter__SWIG_0(self, argc, argv);
               }
             }
           }
@@ -117644,7 +115173,7 @@ SWIGINTERN PyObject *_wrap_new_RealParameter(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RealParameter'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RealParameter'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RealParameter::RealParameter(std::string const &,double *,std::string const &,std::function< void () > const &,RealLimits const &,Attributes const &)\n"
     "    RealParameter::RealParameter(std::string const &,double *,std::string const &,std::function< void () > const &,RealLimits const &)\n"
@@ -117655,26 +115184,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RealParameter_clone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RealParameter_clone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RealParameter *arg1 = (RealParameter *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealParameter_clone",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_clone" "', argument " "1"" of type '" "RealParameter const *""'"); 
   }
   arg1 = reinterpret_cast< RealParameter * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RealParameter_clone" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -117693,16 +115220,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RealParameter_clone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RealParameter_clone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_clone" "', argument " "1"" of type '" "RealParameter const *""'"); 
   }
@@ -117720,20 +115246,16 @@ SWIGINTERN PyObject *_wrap_RealParameter_clone(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "RealParameter_clone", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_RealParameter, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_RealParameter_clone__SWIG_1(self, args);
+      return _wrap_RealParameter_clone__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -117745,13 +115267,13 @@ SWIGINTERN PyObject *_wrap_RealParameter_clone(PyObject *self, PyObject *args) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_RealParameter_clone__SWIG_0(self, args);
+        return _wrap_RealParameter_clone__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RealParameter_clone'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'RealParameter_clone'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RealParameter::clone(std::string const &) const\n"
     "    RealParameter::clone() const\n");
@@ -117767,16 +115289,15 @@ SWIGINTERN PyObject *_wrap_RealParameter_setValue(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealParameter_setValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealParameter_setValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setValue" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
   arg1 = reinterpret_cast< RealParameter * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealParameter_setValue" "', argument " "2"" of type '" "double""'");
   } 
@@ -117794,11 +115315,12 @@ SWIGINTERN PyObject *_wrap_RealParameter_value(PyObject *SWIGUNUSEDPARM(self), P
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_value",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_value" "', argument " "1"" of type '" "RealParameter const *""'"); 
   }
@@ -117819,17 +115341,16 @@ SWIGINTERN PyObject *_wrap_RealParameter_setLimits(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealParameter_setLimits",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealParameter_setLimits", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setLimits" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
   arg1 = reinterpret_cast< RealParameter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RealParameter_setLimits" "', argument " "2"" of type '" "RealLimits const &""'"); 
   }
@@ -117850,11 +115371,12 @@ SWIGINTERN PyObject *_wrap_RealParameter_limits(PyObject *SWIGUNUSEDPARM(self),
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_limits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_limits" "', argument " "1"" of type '" "RealParameter const *""'"); 
   }
@@ -117878,23 +115400,21 @@ SWIGINTERN PyObject *_wrap_RealParameter_setLimited(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RealParameter_setLimited",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealParameter_setLimited", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setLimited" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
   arg1 = reinterpret_cast< RealParameter * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealParameter_setLimited" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RealParameter_setLimited" "', argument " "3"" of type '" "double""'");
   } 
@@ -117912,11 +115432,12 @@ SWIGINTERN PyObject *_wrap_RealParameter_setPositive(PyObject *SWIGUNUSEDPARM(se
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_setPositive",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setPositive" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
@@ -117934,11 +115455,12 @@ SWIGINTERN PyObject *_wrap_RealParameter_setNonnegative(PyObject *SWIGUNUSEDPARM
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_setNonnegative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setNonnegative" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
@@ -117958,19 +115480,18 @@ SWIGINTERN PyObject *_wrap_RealParameter_setUnit(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealParameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealParameter_setUnit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealParameter_setUnit", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_setUnit" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
   arg1 = reinterpret_cast< RealParameter * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RealParameter_setUnit" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -117994,11 +115515,12 @@ SWIGINTERN PyObject *_wrap_RealParameter_unit(PyObject *SWIGUNUSEDPARM(self), Py
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealParameter_unit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealParameter_unit" "', argument " "1"" of type '" "RealParameter const *""'"); 
   }
@@ -118016,10 +115538,11 @@ SWIGINTERN PyObject *_wrap_delete_RealParameter(PyObject *SWIGUNUSEDPARM(self),
   RealParameter *arg1 = (RealParameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RealParameter",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealParameter, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealParameter, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RealParameter" "', argument " "1"" of type '" "RealParameter *""'"); 
   }
@@ -118034,11 +115557,15 @@ fail:
 
 SWIGINTERN PyObject *RealParameter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RealParameter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RealParameter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_Rectangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -118053,29 +115580,26 @@ SWIGINTERN PyObject *_wrap_new_Rectangle(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   Rectangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_Rectangle",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_Rectangle", 4, 4, swig_obj)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Rectangle" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Rectangle" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Rectangle" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Rectangle" "', argument " "4"" of type '" "double""'");
   } 
@@ -118093,11 +115617,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Rectangle *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_clone" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118110,7 +115635,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Rectangle *arg1 = (Rectangle *) 0 ;
   double arg2 ;
@@ -118121,23 +115646,20 @@ SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Rectangle_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_contains" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
   arg1 = reinterpret_cast< Rectangle * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Rectangle_contains" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Rectangle_contains" "', argument " "3"" of type '" "double""'");
   } 
@@ -118150,7 +115672,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Rectangle *arg1 = (Rectangle *) 0 ;
   Bin1D *arg2 = 0 ;
@@ -118161,18 +115683,15 @@ SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Rectangle_contains",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_contains" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
   arg1 = reinterpret_cast< Rectangle * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Rectangle_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
@@ -118180,7 +115699,7 @@ SWIGINTERN PyObject *_wrap_Rectangle_contains__SWIG_1(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Rectangle_contains" "', argument " "2"" of type '" "Bin1D const &""'"); 
   }
   arg2 = reinterpret_cast< Bin1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Bin1D,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Rectangle_contains" "', argument " "3"" of type '" "Bin1D const &""'"); 
   }
@@ -118201,26 +115720,22 @@ SWIGINTERN PyObject *_wrap_Rectangle_contains(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Rectangle_contains", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Rectangle, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Bin1D, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Rectangle_contains__SWIG_1(self, args);
+          return _wrap_Rectangle_contains__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -118241,14 +115756,14 @@ SWIGINTERN PyObject *_wrap_Rectangle_contains(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Rectangle_contains__SWIG_0(self, args);
+          return _wrap_Rectangle_contains__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Rectangle_contains'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Rectangle_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Rectangle::contains(double,double) const\n"
     "    Rectangle::contains(Bin1D const &,Bin1D const &) const\n");
@@ -118261,11 +115776,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_getArea(PyObject *SWIGUNUSEDPARM(self), PyO
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_getArea",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_getArea" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118283,11 +115799,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_getXlow(PyObject *SWIGUNUSEDPARM(self), PyO
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_getXlow",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_getXlow" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118305,11 +115822,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_getYlow(PyObject *SWIGUNUSEDPARM(self), PyO
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_getYlow",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_getYlow" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118327,11 +115845,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_getXup(PyObject *SWIGUNUSEDPARM(self), PyOb
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_getXup",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_getXup" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118349,11 +115868,12 @@ SWIGINTERN PyObject *_wrap_Rectangle_getYup(PyObject *SWIGUNUSEDPARM(self), PyOb
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Rectangle_getYup",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rectangle_getYup" "', argument " "1"" of type '" "Rectangle const *""'"); 
   }
@@ -118371,10 +115891,11 @@ SWIGINTERN PyObject *_wrap_delete_Rectangle(PyObject *SWIGUNUSEDPARM(self), PyOb
   Rectangle *arg1 = (Rectangle *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Rectangle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Rectangle, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Rectangle, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Rectangle" "', argument " "1"" of type '" "Rectangle *""'"); 
   }
@@ -118389,12 +115910,16 @@ fail:
 
 SWIGINTERN PyObject *Rectangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Rectangle, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Rectangle_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   size_t arg1 ;
   double arg2 ;
@@ -118408,29 +115933,25 @@ SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_0(PyObject *SWIGUNUSEDP
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   RectangularDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_RectangularDetector",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RectangularDetector" "', argument " "1"" of type '" "size_t""'");
   } 
   arg1 = static_cast< size_t >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RectangularDetector" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_RectangularDetector" "', argument " "3"" of type '" "size_t""'");
   } 
   arg3 = static_cast< size_t >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_RectangularDetector" "', argument " "4"" of type '" "double""'");
   } 
@@ -118443,16 +115964,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   RectangularDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_RectangularDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_RectangularDetector,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_RectangularDetector,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RectangularDetector" "', argument " "1"" of type '" "RectangularDetector const &""'"); 
   }
@@ -118473,19 +115993,15 @@ SWIGINTERN PyObject *_wrap_new_RectangularDetector(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RectangularDetector", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RectangularDetector, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RectangularDetector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_RectangularDetector__SWIG_1(self, args);
+      return _wrap_new_RectangularDetector__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 4) {
@@ -118510,7 +116026,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularDetector(PyObject *self, PyObject *arg
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_RectangularDetector__SWIG_0(self, args);
+            return _wrap_new_RectangularDetector__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -118518,7 +116034,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularDetector(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_RectangularDetector'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RectangularDetector'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RectangularDetector::RectangularDetector(size_t,double,size_t,double)\n"
     "    RectangularDetector::RectangularDetector(RectangularDetector const &)\n");
@@ -118531,11 +116047,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_clone(PyObject *SWIGUNUSEDPARM(se
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RectangularDetector *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_clone" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -118556,16 +116073,15 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_accept(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RectangularDetector_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularDetector_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_accept" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RectangularDetector_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -118583,10 +116099,11 @@ SWIGINTERN PyObject *_wrap_delete_RectangularDetector(PyObject *SWIGUNUSEDPARM(s
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RectangularDetector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RectangularDetector" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
@@ -118607,16 +116124,15 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_init(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RectangularDetector_init",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularDetector_init", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_init" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Beam,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Beam,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RectangularDetector_init" "', argument " "2"" of type '" "Beam const &""'"); 
   }
@@ -118632,7 +116148,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   kvector_t arg2 ;
@@ -118649,20 +116165,15 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_0(PyObject *SWI
   int ecode4 = 0 ;
   void *argp5 ;
   int res5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:RectangularDetector_setPosition",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPosition" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RectangularDetector_setPosition" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -118674,18 +116185,18 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_0(PyObject *SWI
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPosition" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularDetector_setPosition" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
   {
-    res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res5 = SWIG_ConvertPtr(swig_obj[4], &argp5, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res5)) {
       SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "RectangularDetector_setPosition" "', argument " "5"" of type '" "kvector_t const""'"); 
     }  
@@ -118705,7 +116216,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   kvector_t arg2 ;
@@ -118719,19 +116230,15 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_1(PyObject *SWI
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:RectangularDetector_setPosition",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPosition" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RectangularDetector_setPosition" "', argument " "2"" of type '" "kvector_t const""'"); 
     }  
@@ -118743,12 +116250,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition__SWIG_1(PyObject *SWI
       if (SWIG_IsNewObj(res2)) delete temp;
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPosition" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularDetector_setPosition" "', argument " "4"" of type '" "double""'");
   } 
@@ -118766,20 +116273,16 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObj
   PyObject *argv[6] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "RectangularDetector_setPosition", 0, 5, argv))) SWIG_fail;
+  --argc;
   if (argc == 4) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_RectangularDetector, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -118792,7 +116295,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObj
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_RectangularDetector_setPosition__SWIG_1(self, args);
+            return _wrap_RectangularDetector_setPosition__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -118804,7 +116307,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObj
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_RectangularDetector, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -118817,10 +116320,10 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObj
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+            int res = SWIG_ConvertPtr(argv[4], 0, SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_NO_NULL | 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_RectangularDetector_setPosition__SWIG_0(self, args);
+              return _wrap_RectangularDetector_setPosition__SWIG_0(self, argc, argv);
             }
           }
         }
@@ -118829,7 +116332,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RectangularDetector_setPosition'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'RectangularDetector_setPosition'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RectangularDetector::setPosition(kvector_t const,double,double,kvector_t const)\n"
     "    RectangularDetector::setPosition(kvector_t const,double,double)\n");
@@ -118851,28 +116354,25 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToSampleX(PyObjec
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:RectangularDetector_setPerpendicularToSampleX",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularDetector_setPerpendicularToSampleX", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPerpendicularToSampleX" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setPerpendicularToSampleX" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPerpendicularToSampleX" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularDetector_setPerpendicularToSampleX" "', argument " "4"" of type '" "double""'");
   } 
@@ -118899,28 +116399,25 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToDirectBeam(PyOb
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:RectangularDetector_setPerpendicularToDirectBeam",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularDetector_setPerpendicularToDirectBeam", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPerpendicularToDirectBeam" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setPerpendicularToDirectBeam" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPerpendicularToDirectBeam" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularDetector_setPerpendicularToDirectBeam" "', argument " "4"" of type '" "double""'");
   } 
@@ -118933,7 +116430,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   double arg2 ;
@@ -118947,28 +116444,24 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:RectangularDetector_setPerpendicularToReflectedBeam",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "4"" of type '" "double""'");
   } 
@@ -118981,7 +116474,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   double arg2 ;
@@ -118992,22 +116485,19 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RectangularDetector_setPerpendicularToReflectedBeam",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "3"" of type '" "double""'");
   } 
@@ -119020,7 +116510,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   double arg2 ;
@@ -119028,16 +116518,14 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam__
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RectangularDetector_setPerpendicularToReflectedBeam",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setPerpendicularToReflectedBeam" "', argument " "2"" of type '" "double""'");
   } 
@@ -119055,13 +116543,9 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(P
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "RectangularDetector_setPerpendicularToReflectedBeam", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -119073,7 +116557,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(P
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_2(self, args);
+        return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -119093,7 +116577,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(P
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_1(self, args);
+          return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -119119,7 +116603,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(P
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_0(self, args);
+            return _wrap_RectangularDetector_setPerpendicularToReflectedBeam__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -119127,7 +116611,7 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RectangularDetector_setPerpendicularToReflectedBeam'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'RectangularDetector_setPerpendicularToReflectedBeam'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    RectangularDetector::setPerpendicularToReflectedBeam(double,double,double)\n"
     "    RectangularDetector::setPerpendicularToReflectedBeam(double,double)\n"
@@ -119147,22 +116631,20 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_setDirectBeamPosition(PyObject *S
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RectangularDetector_setDirectBeamPosition",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularDetector_setDirectBeamPosition", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_setDirectBeamPosition" "', argument " "1"" of type '" "RectangularDetector *""'"); 
   }
   arg1 = reinterpret_cast< RectangularDetector * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularDetector_setDirectBeamPosition" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularDetector_setDirectBeamPosition" "', argument " "3"" of type '" "double""'");
   } 
@@ -119180,11 +116662,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getWidth(PyObject *SWIGUNUSEDPARM
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getWidth",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getWidth" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119202,11 +116685,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getHeight(PyObject *SWIGUNUSEDPAR
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getHeight",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getHeight" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119224,11 +116708,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getNbinsX(PyObject *SWIGUNUSEDPAR
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getNbinsX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getNbinsX" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119246,11 +116731,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getNbinsY(PyObject *SWIGUNUSEDPAR
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getNbinsY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getNbinsY" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119268,11 +116754,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getNormalVector(PyObject *SWIGUNU
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getNormalVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getNormalVector" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119290,11 +116777,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getU0(PyObject *SWIGUNUSEDPARM(se
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getU0",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getU0" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119312,11 +116800,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getV0(PyObject *SWIGUNUSEDPARM(se
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getV0",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getV0" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119334,11 +116823,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getDirectionVector(PyObject *SWIG
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getDirectionVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getDirectionVector" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119356,11 +116846,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getDistance(PyObject *SWIGUNUSEDP
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getDistance",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getDistance" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119378,11 +116869,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getDirectBeamU0(PyObject *SWIGUNU
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getDirectBeamU0",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getDirectBeamU0" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119400,11 +116892,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getDirectBeamV0(PyObject *SWIGUNU
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getDirectBeamV0",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getDirectBeamV0" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119422,11 +116915,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_getDetectorArrangment(PyObject *S
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RectangularDetector::EDetectorArrangement result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_getDetectorArrangment",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_getDetectorArrangment" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119444,11 +116938,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_defaultAxesUnits(PyObject *SWIGUN
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AxesUnits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_defaultAxesUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_defaultAxesUnits" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119466,11 +116961,12 @@ SWIGINTERN PyObject *_wrap_RectangularDetector_regionOfInterestPixel(PyObject *S
   RectangularDetector *arg1 = (RectangularDetector *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RectangularPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularDetector_regionOfInterestPixel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularDetector, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularDetector_regionOfInterestPixel" "', argument " "1"" of type '" "RectangularDetector const *""'"); 
   }
@@ -119485,11 +116981,15 @@ fail:
 
 SWIGINTERN PyObject *RectangularDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RectangularDetector, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RectangularDetector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_RectangularPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   kvector_t arg1 ;
@@ -119501,14 +117001,12 @@ SWIGINTERN PyObject *_wrap_new_RectangularPixel(PyObject *SWIGUNUSEDPARM(self),
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RectangularPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_RectangularPixel",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_RectangularPixel", 3, 3, swig_obj)) SWIG_fail;
   {
-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RectangularPixel" "', argument " "1"" of type '" "kvector_t""'"); 
     }  
@@ -119521,7 +117019,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularPixel(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RectangularPixel" "', argument " "2"" of type '" "kvector_t""'"); 
     }  
@@ -119534,7 +117032,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularPixel(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t,  0  | 0);
+    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 '" "new_RectangularPixel" "', argument " "3"" of type '" "kvector_t""'"); 
     }  
@@ -119559,11 +117057,12 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_clone(PyObject *SWIGUNUSEDPARM(self)
   RectangularPixel *arg1 = (RectangularPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RectangularPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularPixel_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_clone" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
@@ -119587,23 +117086,21 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_createZeroSizePixel(PyObject *SWIGUN
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   RectangularPixel *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RectangularPixel_createZeroSizePixel",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_createZeroSizePixel", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
   arg1 = reinterpret_cast< RectangularPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "3"" of type '" "double""'");
   } 
@@ -119630,29 +117127,26 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_getK(PyObject *SWIGUNUSEDPARM(self),
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:RectangularPixel_getK",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getK", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getK" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
   arg1 = reinterpret_cast< RectangularPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getK" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getK" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularPixel_getK" "', argument " "4"" of type '" "double""'");
   } 
@@ -119676,23 +117170,21 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_getPosition(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   kvector_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RectangularPixel_getPosition",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getPosition", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getPosition" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
   arg1 = reinterpret_cast< RectangularPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getPosition" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getPosition" "', argument " "3"" of type '" "double""'");
   } 
@@ -119716,23 +117208,21 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_getIntegrationFactor(PyObject *SWIGU
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RectangularPixel_getIntegrationFactor",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getIntegrationFactor", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
   arg1 = reinterpret_cast< RectangularPixel * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "3"" of type '" "double""'");
   } 
@@ -119750,11 +117240,12 @@ SWIGINTERN PyObject *_wrap_RectangularPixel_getSolidAngle(PyObject *SWIGUNUSEDPA
   RectangularPixel *arg1 = (RectangularPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RectangularPixel_getSolidAngle",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getSolidAngle" "', argument " "1"" of type '" "RectangularPixel const *""'"); 
   }
@@ -119772,10 +117263,11 @@ SWIGINTERN PyObject *_wrap_delete_RectangularPixel(PyObject *SWIGUNUSEDPARM(self
   RectangularPixel *arg1 = (RectangularPixel *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RectangularPixel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RectangularPixel, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RectangularPixel" "', argument " "1"" of type '" "RectangularPixel *""'"); 
   }
@@ -119790,11 +117282,15 @@ fail:
 
 SWIGINTERN PyObject *RectangularPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RectangularPixel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RectangularPixel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_ResolutionFunction2DGaussian(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
@@ -119803,17 +117299,16 @@ SWIGINTERN PyObject *_wrap_new_ResolutionFunction2DGaussian(PyObject *SWIGUNUSED
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   ResolutionFunction2DGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_ResolutionFunction2DGaussian",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "new_ResolutionFunction2DGaussian", 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 '" "new_ResolutionFunction2DGaussian" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ResolutionFunction2DGaussian" "', argument " "2"" of type '" "double""'");
   } 
@@ -119837,23 +117332,21 @@ SWIGINTERN PyObject *_wrap_ResolutionFunction2DGaussian_evaluateCDF(PyObject *SW
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ResolutionFunction2DGaussian_evaluateCDF",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ResolutionFunction2DGaussian_evaluateCDF", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ResolutionFunction2DGaussian_evaluateCDF" "', argument " "1"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< ResolutionFunction2DGaussian * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ResolutionFunction2DGaussian_evaluateCDF" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ResolutionFunction2DGaussian_evaluateCDF" "', argument " "3"" of type '" "double""'");
   } 
@@ -119871,11 +117364,12 @@ SWIGINTERN PyObject *_wrap_ResolutionFunction2DGaussian_clone(PyObject *SWIGUNUS
   ResolutionFunction2DGaussian *arg1 = (ResolutionFunction2DGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   ResolutionFunction2DGaussian *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ResolutionFunction2DGaussian_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ResolutionFunction2DGaussian_clone" "', argument " "1"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
@@ -119896,16 +117390,15 @@ SWIGINTERN PyObject *_wrap_ResolutionFunction2DGaussian_accept(PyObject *SWIGUNU
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ResolutionFunction2DGaussian_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ResolutionFunction2DGaussian_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ResolutionFunction2DGaussian_accept" "', argument " "1"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
   arg1 = reinterpret_cast< ResolutionFunction2DGaussian * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ResolutionFunction2DGaussian_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -119923,11 +117416,12 @@ SWIGINTERN PyObject *_wrap_ResolutionFunction2DGaussian_getSigmaX(PyObject *SWIG
   ResolutionFunction2DGaussian *arg1 = (ResolutionFunction2DGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ResolutionFunction2DGaussian_getSigmaX",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ResolutionFunction2DGaussian_getSigmaX" "', argument " "1"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
@@ -119945,11 +117439,12 @@ SWIGINTERN PyObject *_wrap_ResolutionFunction2DGaussian_getSigmaY(PyObject *SWIG
   ResolutionFunction2DGaussian *arg1 = (ResolutionFunction2DGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ResolutionFunction2DGaussian_getSigmaY",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ResolutionFunction2DGaussian_getSigmaY" "', argument " "1"" of type '" "ResolutionFunction2DGaussian const *""'"); 
   }
@@ -119967,10 +117462,11 @@ SWIGINTERN PyObject *_wrap_delete_ResolutionFunction2DGaussian(PyObject *SWIGUNU
   ResolutionFunction2DGaussian *arg1 = (ResolutionFunction2DGaussian *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ResolutionFunction2DGaussian",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ResolutionFunction2DGaussian, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ResolutionFunction2DGaussian" "', argument " "1"" of type '" "ResolutionFunction2DGaussian *""'"); 
   }
@@ -119985,20 +117481,25 @@ fail:
 
 SWIGINTERN PyObject *ResolutionFunction2DGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ResolutionFunction2DGaussian, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ResolutionFunction2DGaussian_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_RoughnessModel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   RoughnessModelWrap *arg1 = (RoughnessModelWrap *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RoughnessModel",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RoughnessModelWrap, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  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_RoughnessModel" "', argument " "1"" of type '" "RoughnessModelWrap *""'"); 
   }
@@ -120013,16 +117514,16 @@ fail:
 
 SWIGINTERN PyObject *RoughnessModel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RoughnessModelWrap, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   DepthProbeSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_DepthProbeSimulation")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (DepthProbeSimulation *)new DepthProbeSimulation();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -120031,16 +117532,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   MultiLayer *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   DepthProbeSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_DepthProbeSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -120056,20 +117556,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::shared_ptr< IMultiLayerBuilder > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   DepthProbeSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_DepthProbeSimulation",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_DepthProbeSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'");
     }
     if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1));
     if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
@@ -120087,22 +117586,18 @@ SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation(PyObject *self, PyObject *ar
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_DepthProbeSimulation", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_DepthProbeSimulation__SWIG_0(self, args);
+    return _wrap_new_DepthProbeSimulation__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_DepthProbeSimulation__SWIG_1(self, args);
+      return _wrap_new_DepthProbeSimulation__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -120110,12 +117605,12 @@ SWIGINTERN PyObject *_wrap_new_DepthProbeSimulation(PyObject *self, PyObject *ar
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_DepthProbeSimulation__SWIG_2(self, args);
+      return _wrap_new_DepthProbeSimulation__SWIG_2(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_DepthProbeSimulation'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DepthProbeSimulation'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DepthProbeSimulation::DepthProbeSimulation()\n"
     "    DepthProbeSimulation::DepthProbeSimulation(MultiLayer const &)\n"
@@ -120129,10 +117624,11 @@ SWIGINTERN PyObject *_wrap_delete_DepthProbeSimulation(PyObject *SWIGUNUSEDPARM(
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_DepthProbeSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DepthProbeSimulation" "', argument " "1"" of type '" "DepthProbeSimulation *""'"); 
   }
@@ -120150,11 +117646,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_clone(PyObject *SWIGUNUSEDPARM(s
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   DepthProbeSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DepthProbeSimulation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_clone" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
@@ -120175,16 +117672,15 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_accept(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:DepthProbeSimulation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DepthProbeSimulation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_accept" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
   arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DepthProbeSimulation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -120202,11 +117698,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_result(PyObject *SWIGUNUSEDPARM(
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DepthProbeSimulation_result",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_result" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
@@ -120219,7 +117716,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   double arg2 ;
@@ -120239,40 +117736,34 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(PyObje
   int ecode5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:DepthProbeSimulation_setBeamParameters",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if ((nobjs < 6) || (nobjs > 6)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthProbeSimulation *""'"); 
   }
   arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  res6 = SWIG_ConvertPtr(swig_obj[5], &argp6,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "6"" of type '" "IFootprintFactor const *""'"); 
   }
@@ -120285,7 +117776,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   double arg2 ;
@@ -120302,34 +117793,29 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(PyObje
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:DepthProbeSimulation_setBeamParameters",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "1"" of type '" "DepthProbeSimulation *""'"); 
   }
   arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DepthProbeSimulation_setBeamParameters" "', argument " "5"" of type '" "double""'");
   } 
@@ -120347,13 +117833,9 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
   PyObject *argv[7] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 6) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "DepthProbeSimulation_setBeamParameters", 0, 6, argv))) SWIG_fail;
+  --argc;
   if (argc == 5) {
     int _v;
     void *vptr = 0;
@@ -120380,7 +117862,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(self, args);
+              return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_1(self, argc, argv);
             }
           }
         }
@@ -120417,7 +117899,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
               int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_IFootprintFactor, 0);
               _v = SWIG_CheckState(res);
               if (_v) {
-                return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(self, args);
+                return _wrap_DepthProbeSimulation_setBeamParameters__SWIG_0(self, argc, argv);
               }
             }
           }
@@ -120427,7 +117909,7 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setBeamParameters(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'DepthProbeSimulation_setBeamParameters'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'DepthProbeSimulation_setBeamParameters'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    DepthProbeSimulation::setBeamParameters(double,int,double,double,IFootprintFactor const *)\n"
     "    DepthProbeSimulation::setBeamParameters(double,int,double,double)\n");
@@ -120449,28 +117931,25 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_setZSpan(PyObject *SWIGUNUSEDPAR
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
+  PyObject *swig_obj[4] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:DepthProbeSimulation_setZSpan",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "DepthProbeSimulation_setZSpan", 4, 4, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_setZSpan" "', argument " "1"" of type '" "DepthProbeSimulation *""'"); 
   }
   arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DepthProbeSimulation_setZSpan" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DepthProbeSimulation_setZSpan" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DepthProbeSimulation_setZSpan" "', argument " "4"" of type '" "double""'");
   } 
@@ -120488,11 +117967,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_getAlphaAxis(PyObject *SWIGUNUSE
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DepthProbeSimulation_getAlphaAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_getAlphaAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
@@ -120510,11 +117990,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_getZAxis(PyObject *SWIGUNUSEDPAR
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DepthProbeSimulation_getZAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_getZAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
@@ -120532,11 +118013,12 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_intensityMapSize(PyObject *SWIGU
   DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:DepthProbeSimulation_intensityMapSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_intensityMapSize" "', argument " "1"" of type '" "DepthProbeSimulation const *""'"); 
   }
@@ -120551,16 +118033,20 @@ fail:
 
 SWIGINTERN PyObject *DepthProbeSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_DepthProbeSimulation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *DepthProbeSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   SpecularSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SpecularSimulation")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (SpecularSimulation *)new SpecularSimulation();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -120569,16 +118055,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   MultiLayer *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SpecularSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SpecularSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MultiLayer,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "MultiLayer const &""'"); 
   }
@@ -120594,20 +118079,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SpecularSimulation__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::shared_ptr< IMultiLayerBuilder > arg1 ;
   void *argp1 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SpecularSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_SpecularSimulation",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     int newmem = 0;
-    res1 = SWIG_ConvertPtrAndOwn(obj0, &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
+    res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t,  0 , &newmem);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SpecularSimulation" "', argument " "1"" of type '" "std::shared_ptr< IMultiLayerBuilder > const""'");
     }
     if (argp1) arg1 = *(reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1));
     if (newmem & SWIG_CAST_NEW_MEMORY) delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
@@ -120625,22 +118109,18 @@ SWIGINTERN PyObject *_wrap_new_SpecularSimulation(PyObject *self, PyObject *args
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_SpecularSimulation", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_SpecularSimulation__SWIG_0(self, args);
+    return _wrap_new_SpecularSimulation__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_MultiLayer, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_SpecularSimulation__SWIG_1(self, args);
+      return _wrap_new_SpecularSimulation__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -120648,12 +118128,12 @@ SWIGINTERN PyObject *_wrap_new_SpecularSimulation(PyObject *self, PyObject *args
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_SpecularSimulation__SWIG_2(self, args);
+      return _wrap_new_SpecularSimulation__SWIG_2(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_SpecularSimulation'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_SpecularSimulation'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SpecularSimulation::SpecularSimulation()\n"
     "    SpecularSimulation::SpecularSimulation(MultiLayer const &)\n"
@@ -120667,10 +118147,11 @@ SWIGINTERN PyObject *_wrap_delete_SpecularSimulation(PyObject *SWIGUNUSEDPARM(se
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SpecularSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SpecularSimulation" "', argument " "1"" of type '" "SpecularSimulation *""'"); 
   }
@@ -120688,11 +118169,12 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_clone(PyObject *SWIGUNUSEDPARM(sel
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SpecularSimulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_clone" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -120710,10 +118192,11 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_prepareSimulation(PyObject *SWIGUN
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_prepareSimulation",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_prepareSimulation" "', argument " "1"" of type '" "SpecularSimulation *""'"); 
   }
@@ -120734,16 +118217,15 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_accept(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SpecularSimulation_accept",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SpecularSimulation_accept", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_accept" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
   arg1 = reinterpret_cast< SpecularSimulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SpecularSimulation_accept" "', argument " "2"" of type '" "INodeVisitor *""'"); 
   }
@@ -120761,11 +118243,12 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_result(PyObject *SWIGUNUSEDPARM(se
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SimulationResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_result",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_result" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -120786,16 +118269,15 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_setScan(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SpecularSimulation_setScan",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SpecularSimulation_setScan", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_setScan" "', argument " "1"" of type '" "SpecularSimulation *""'"); 
   }
   arg1 = reinterpret_cast< SpecularSimulation * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ISpecularScan,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ISpecularScan,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SpecularSimulation_setScan" "', argument " "2"" of type '" "ISpecularScan const &""'"); 
   }
@@ -120816,11 +118298,12 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_coordinateAxis(PyObject *SWIGUNUSE
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IAxis *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_coordinateAxis",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_coordinateAxis" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -120838,11 +118321,12 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_footprintFactor(PyObject *SWIGUNUS
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IFootprintFactor *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_footprintFactor",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_footprintFactor" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -120860,11 +118344,12 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_intensityMapSize(PyObject *SWIGUNU
   SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_intensityMapSize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_intensityMapSize" "', argument " "1"" of type '" "SpecularSimulation const *""'"); 
   }
@@ -120879,16 +118364,20 @@ fail:
 
 SWIGINTERN PyObject *SpecularSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SpecularSimulation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SpecularSimulation_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_ThreadInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ThreadInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_ThreadInfo")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_ThreadInfo", 0, 0, 0)) SWIG_fail;
   result = (ThreadInfo *)new ThreadInfo();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ThreadInfo, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -120905,16 +118394,15 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_n_threads_set(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ThreadInfo_n_threads_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ThreadInfo_n_threads_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_n_threads_set" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
   arg1 = reinterpret_cast< ThreadInfo * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ThreadInfo_n_threads_set" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -120932,11 +118420,12 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_n_threads_get(PyObject *SWIGUNUSEDPARM(sel
   ThreadInfo *arg1 = (ThreadInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ThreadInfo_n_threads_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_n_threads_get" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
@@ -120957,16 +118446,15 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_n_batches_set(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ThreadInfo_n_batches_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ThreadInfo_n_batches_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_n_batches_set" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
   arg1 = reinterpret_cast< ThreadInfo * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ThreadInfo_n_batches_set" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -120984,11 +118472,12 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_n_batches_get(PyObject *SWIGUNUSEDPARM(sel
   ThreadInfo *arg1 = (ThreadInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ThreadInfo_n_batches_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_n_batches_get" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
@@ -121009,16 +118498,15 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_current_batch_set(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ThreadInfo_current_batch_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "ThreadInfo_current_batch_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_current_batch_set" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
   arg1 = reinterpret_cast< ThreadInfo * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ThreadInfo_current_batch_set" "', argument " "2"" of type '" "unsigned int""'");
   } 
@@ -121036,11 +118524,12 @@ SWIGINTERN PyObject *_wrap_ThreadInfo_current_batch_get(PyObject *SWIGUNUSEDPARM
   ThreadInfo *arg1 = (ThreadInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ThreadInfo_current_batch_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThreadInfo_current_batch_get" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
@@ -121058,10 +118547,11 @@ SWIGINTERN PyObject *_wrap_delete_ThreadInfo(PyObject *SWIGUNUSEDPARM(self), PyO
   ThreadInfo *arg1 = (ThreadInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ThreadInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ThreadInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ThreadInfo, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ThreadInfo" "', argument " "1"" of type '" "ThreadInfo *""'"); 
   }
@@ -121076,16 +118566,20 @@ fail:
 
 SWIGINTERN PyObject *ThreadInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ThreadInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *ThreadInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SampleBuilderFactoryTemp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFactory< std::string,IMultiLayerBuilder > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SampleBuilderFactoryTemp")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SampleBuilderFactoryTemp", 0, 0, 0)) SWIG_fail;
   result = (IFactory< std::string,IMultiLayerBuilder > *)new IFactory< std::string,IMultiLayerBuilder >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -121101,20 +118595,19 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_createItem(PyObject *SWIGUNU
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   IMultiLayerBuilder *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SampleBuilderFactoryTemp_createItem",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SampleBuilderFactoryTemp_createItem", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_createItem" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,IMultiLayerBuilder > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SampleBuilderFactoryTemp_createItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121142,7 +118635,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   std::string *arg2 = 0 ;
@@ -121154,21 +118647,17 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(PyObjec
   void *argp3 ;
   int res3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:SampleBuilderFactoryTemp_registerItem",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,IMultiLayerBuilder > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121178,7 +118667,7 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(PyObjec
     arg2 = ptr;
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "3"" of type '" "IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback""'"); 
     }  
@@ -121192,7 +118681,7 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(PyObjec
   }
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "4"" of type '" "std::string const &""'"); 
     }
@@ -121213,7 +118702,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   std::string *arg2 = 0 ;
@@ -121223,20 +118712,17 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(PyObjec
   int res2 = SWIG_OLDOBJ ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SampleBuilderFactoryTemp_registerItem",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,IMultiLayerBuilder > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121246,7 +118732,7 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(PyObjec
     arg2 = ptr;
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SampleBuilderFactoryTemp_registerItem" "', argument " "3"" of type '" "IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback""'"); 
     }  
@@ -121273,13 +118759,9 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem(PyObject *self,
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SampleBuilderFactoryTemp_registerItem", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -121289,10 +118771,10 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem(PyObject *self,
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(self, args);
+          return _wrap_SampleBuilderFactoryTemp_registerItem__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -121306,13 +118788,13 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem(PyObject *self,
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_IMultiLayerBuilder_pfF_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(self, args);
+            return _wrap_SampleBuilderFactoryTemp_registerItem__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -121320,7 +118802,7 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_registerItem(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SampleBuilderFactoryTemp_registerItem'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SampleBuilderFactoryTemp_registerItem'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IFactory< std::string,IMultiLayerBuilder >::registerItem(std::string const &,IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback,std::string const &)\n"
     "    IFactory< std::string,IMultiLayerBuilder >::registerItem(std::string const &,IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback)\n");
@@ -121335,19 +118817,18 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_contains(PyObject *SWIGUNUSE
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SampleBuilderFactoryTemp_contains",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SampleBuilderFactoryTemp_contains", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_contains" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > const *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,IMultiLayerBuilder > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SampleBuilderFactoryTemp_contains" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121371,10 +118852,11 @@ SWIGINTERN PyObject *_wrap_delete_SampleBuilderFactoryTemp(PyObject *SWIGUNUSEDP
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SampleBuilderFactoryTemp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SampleBuilderFactoryTemp" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > *""'"); 
   }
@@ -121392,11 +118874,12 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_size(PyObject *SWIGUNUSEDPAR
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SampleBuilderFactoryTemp_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_size" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > const *""'"); 
   }
@@ -121414,11 +118897,12 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_begin(PyObject *SWIGUNUSEDPA
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::map< std::string,std::string,std::less< std::string >,std::allocator< std::pair< std::string const,std::string > > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SampleBuilderFactoryTemp_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_begin" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > const *""'"); 
   }
@@ -121436,11 +118920,12 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactoryTemp_end(PyObject *SWIGUNUSEDPARM
   IFactory< std::string,IMultiLayerBuilder > *arg1 = (IFactory< std::string,IMultiLayerBuilder > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::map< std::string,std::string,std::less< std::string >,std::allocator< std::pair< std::string const,std::string > > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SampleBuilderFactoryTemp_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactoryTemp_end" "', argument " "1"" of type '" "IFactory< std::string,IMultiLayerBuilder > const *""'"); 
   }
@@ -121455,16 +118940,20 @@ fail:
 
 SWIGINTERN PyObject *SampleBuilderFactoryTemp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SampleBuilderFactoryTemp_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SampleBuilderFactory(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SampleBuilderFactory *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SampleBuilderFactory")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SampleBuilderFactory", 0, 0, 0)) SWIG_fail;
   result = (SampleBuilderFactory *)new SampleBuilderFactory();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SampleBuilderFactory, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -121480,19 +118969,18 @@ SWIGINTERN PyObject *_wrap_SampleBuilderFactory_createSample(PyObject *SWIGUNUSE
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   MultiLayer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SampleBuilderFactory_createSample",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SampleBuilderFactory, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SampleBuilderFactory_createSample", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SampleBuilderFactory, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SampleBuilderFactory_createSample" "', argument " "1"" of type '" "SampleBuilderFactory *""'"); 
   }
   arg1 = reinterpret_cast< SampleBuilderFactory * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SampleBuilderFactory_createSample" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121516,10 +119004,11 @@ SWIGINTERN PyObject *_wrap_delete_SampleBuilderFactory(PyObject *SWIGUNUSEDPARM(
   SampleBuilderFactory *arg1 = (SampleBuilderFactory *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SampleBuilderFactory",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SampleBuilderFactory, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SampleBuilderFactory, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SampleBuilderFactory" "', argument " "1"" of type '" "SampleBuilderFactory *""'"); 
   }
@@ -121534,16 +119023,20 @@ fail:
 
 SWIGINTERN PyObject *SampleBuilderFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SampleBuilderFactory, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SampleBuilderFactory_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SimulationFactoryTemp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IFactory< std::string,Simulation > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SimulationFactoryTemp")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SimulationFactoryTemp", 0, 0, 0)) SWIG_fail;
   result = (IFactory< std::string,Simulation > *)new IFactory< std::string,Simulation >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFactoryT_std__string_Simulation_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -121559,19 +119052,18 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_createItem(PyObject *SWIGUNUSED
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Simulation *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationFactoryTemp_createItem",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationFactoryTemp_createItem", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_createItem" "', argument " "1"" of type '" "IFactory< std::string,Simulation > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,Simulation > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimulationFactoryTemp_createItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121590,7 +119082,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   std::string *arg2 = 0 ;
@@ -121602,21 +119094,17 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_0(PyObject *
   void *argp3 ;
   int res3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:SimulationFactoryTemp_registerItem",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "1"" of type '" "IFactory< std::string,Simulation > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,Simulation > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121626,7 +119114,7 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_0(PyObject *
     arg2 = ptr;
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__functionT_Simulation_pfF_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__functionT_Simulation_pfF_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "3"" of type '" "IFactory< std::string,Simulation >::CreateItemCallback""'"); 
     }  
@@ -121640,7 +119128,7 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_0(PyObject *
   }
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "4"" of type '" "std::string const &""'"); 
     }
@@ -121661,7 +119149,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   std::string *arg2 = 0 ;
@@ -121671,20 +119159,17 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_1(PyObject *
   int res2 = SWIG_OLDOBJ ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:SimulationFactoryTemp_registerItem",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "1"" of type '" "IFactory< std::string,Simulation > *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,Simulation > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121694,7 +119179,7 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem__SWIG_1(PyObject *
     arg2 = ptr;
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__functionT_Simulation_pfF_t,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__functionT_Simulation_pfF_t,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SimulationFactoryTemp_registerItem" "', argument " "3"" of type '" "IFactory< std::string,Simulation >::CreateItemCallback""'"); 
     }  
@@ -121721,13 +119206,9 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem(PyObject *self, Py
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationFactoryTemp_registerItem", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
@@ -121737,10 +119218,10 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem(PyObject *self, Py
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_Simulation_pfF_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_Simulation_pfF_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_SimulationFactoryTemp_registerItem__SWIG_1(self, args);
+          return _wrap_SimulationFactoryTemp_registerItem__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -121754,13 +119235,13 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem(PyObject *self, Py
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_Simulation_pfF_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__functionT_Simulation_pfF_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_SimulationFactoryTemp_registerItem__SWIG_0(self, args);
+            return _wrap_SimulationFactoryTemp_registerItem__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -121768,7 +119249,7 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_registerItem(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SimulationFactoryTemp_registerItem'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationFactoryTemp_registerItem'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IFactory< std::string,Simulation >::registerItem(std::string const &,IFactory< std::string,Simulation >::CreateItemCallback,std::string const &)\n"
     "    IFactory< std::string,Simulation >::registerItem(std::string const &,IFactory< std::string,Simulation >::CreateItemCallback)\n");
@@ -121783,19 +119264,18 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_contains(PyObject *SWIGUNUSEDPA
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SimulationFactoryTemp_contains",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SimulationFactoryTemp_contains", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_contains" "', argument " "1"" of type '" "IFactory< std::string,Simulation > const *""'"); 
   }
   arg1 = reinterpret_cast< IFactory< std::string,Simulation > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimulationFactoryTemp_contains" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -121819,10 +119299,11 @@ SWIGINTERN PyObject *_wrap_delete_SimulationFactoryTemp(PyObject *SWIGUNUSEDPARM
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SimulationFactoryTemp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SimulationFactoryTemp" "', argument " "1"" of type '" "IFactory< std::string,Simulation > *""'"); 
   }
@@ -121840,11 +119321,12 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_size(PyObject *SWIGUNUSEDPARM(s
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationFactoryTemp_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_size" "', argument " "1"" of type '" "IFactory< std::string,Simulation > const *""'"); 
   }
@@ -121862,11 +119344,12 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_begin(PyObject *SWIGUNUSEDPARM(
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::map< std::string,std::string,std::less< std::string >,std::allocator< std::pair< std::string const,std::string > > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationFactoryTemp_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_begin" "', argument " "1"" of type '" "IFactory< std::string,Simulation > const *""'"); 
   }
@@ -121884,11 +119367,12 @@ SWIGINTERN PyObject *_wrap_SimulationFactoryTemp_end(PyObject *SWIGUNUSEDPARM(se
   IFactory< std::string,Simulation > *arg1 = (IFactory< std::string,Simulation > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::map< std::string,std::string,std::less< std::string >,std::allocator< std::pair< std::string const,std::string > > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SimulationFactoryTemp_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFactoryT_std__string_Simulation_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationFactoryTemp_end" "', argument " "1"" of type '" "IFactory< std::string,Simulation > const *""'"); 
   }
@@ -121903,16 +119387,20 @@ fail:
 
 SWIGINTERN PyObject *SimulationFactoryTemp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IFactoryT_std__string_Simulation_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SimulationFactoryTemp_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SimulationFactory(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SimulationFactory *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_SimulationFactory")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_SimulationFactory", 0, 0, 0)) SWIG_fail;
   result = (SimulationFactory *)new SimulationFactory();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SimulationFactory, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -121926,10 +119414,11 @@ SWIGINTERN PyObject *_wrap_delete_SimulationFactory(PyObject *SWIGUNUSEDPARM(sel
   SimulationFactory *arg1 = (SimulationFactory *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SimulationFactory",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SimulationFactory, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationFactory, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SimulationFactory" "', argument " "1"" of type '" "SimulationFactory *""'"); 
   }
@@ -121944,20 +119433,25 @@ fail:
 
 SWIGINTERN PyObject *SimulationFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SimulationFactory, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *SimulationFactory_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_AxesUnits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AxesUnitsWrap *arg1 = (AxesUnitsWrap *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_AxesUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AxesUnitsWrap, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AxesUnitsWrap, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AxesUnits" "', argument " "1"" of type '" "AxesUnitsWrap *""'"); 
   }
@@ -121972,7 +119466,7 @@ fail:
 
 SWIGINTERN PyObject *AxesUnits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AxesUnitsWrap, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -121982,10 +119476,11 @@ SWIGINTERN PyObject *_wrap_delete_IUnitConverter(PyObject *SWIGUNUSEDPARM(self),
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IUnitConverter",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IUnitConverter" "', argument " "1"" of type '" "IUnitConverter *""'"); 
   }
@@ -122003,11 +119498,12 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_clone(PyObject *SWIGUNUSEDPARM(self),
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   IUnitConverter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IUnitConverter_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_clone" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
@@ -122025,11 +119521,12 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_dimension(PyObject *SWIGUNUSEDPARM(sel
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IUnitConverter_dimension",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_dimension" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
@@ -122053,23 +119550,21 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_calculateMin(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IUnitConverter_calculateMin",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IUnitConverter_calculateMin", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_calculateMin" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
   arg1 = reinterpret_cast< IUnitConverter * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IUnitConverter_calculateMin" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IUnitConverter_calculateMin" "', argument " "3"" of type '" "AxesUnits""'");
   } 
@@ -122093,23 +119588,21 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_calculateMax(PyObject *SWIGUNUSEDPARM(
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IUnitConverter_calculateMax",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IUnitConverter_calculateMax", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_calculateMax" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
   arg1 = reinterpret_cast< IUnitConverter * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IUnitConverter_calculateMax" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IUnitConverter_calculateMax" "', argument " "3"" of type '" "AxesUnits""'");
   } 
@@ -122130,17 +119623,16 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisSize(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IUnitConverter_axisSize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IUnitConverter_axisSize", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_axisSize" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
   arg1 = reinterpret_cast< IUnitConverter * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IUnitConverter_axisSize" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -122153,7 +119645,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   size_t arg2 ;
@@ -122164,23 +119656,20 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_0(PyObject *SWIGUNUSEDP
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IUnitConverter_axisName",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_axisName" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
   arg1 = reinterpret_cast< IUnitConverter * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IUnitConverter_axisName" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IUnitConverter_axisName" "', argument " "3"" of type '" "AxesUnits""'");
   } 
@@ -122193,7 +119682,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   size_t arg2 ;
@@ -122201,17 +119690,15 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisName__SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IUnitConverter_axisName",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_axisName" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
   arg1 = reinterpret_cast< IUnitConverter * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IUnitConverter_axisName" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -122229,13 +119716,9 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisName(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "IUnitConverter_axisName", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -122247,7 +119730,7 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisName(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IUnitConverter_axisName__SWIG_1(self, args);
+        return _wrap_IUnitConverter_axisName__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -122267,14 +119750,14 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_axisName(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_IUnitConverter_axisName__SWIG_0(self, args);
+          return _wrap_IUnitConverter_axisName__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'IUnitConverter_axisName'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IUnitConverter_axisName'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    IUnitConverter::axisName(size_t,AxesUnits) const\n"
     "    IUnitConverter::axisName(size_t) const\n");
@@ -122287,11 +119770,12 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_availableUnits(PyObject *SWIGUNUSEDPAR
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::vector< enum AxesUnitsWrap::AxesUnits,std::allocator< enum AxesUnitsWrap::AxesUnits > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IUnitConverter_availableUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_availableUnits" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
@@ -122309,11 +119793,12 @@ SWIGINTERN PyObject *_wrap_IUnitConverter_defaultUnits(PyObject *SWIGUNUSEDPARM(
   IUnitConverter *arg1 = (IUnitConverter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AxesUnits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IUnitConverter_defaultUnits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IUnitConverter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IUnitConverter_defaultUnits" "', argument " "1"" of type '" "IUnitConverter const *""'"); 
   }
@@ -122328,7 +119813,7 @@ fail:
 
 SWIGINTERN PyObject *IUnitConverter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IUnitConverter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -122337,7 +119822,7 @@ SWIGINTERN PyObject *_wrap_new_IterationInfo(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   IterationInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_IterationInfo")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_IterationInfo", 0, 0, 0)) SWIG_fail;
   result = (IterationInfo *)new IterationInfo();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IterationInfo, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -122357,17 +119842,15 @@ SWIGINTERN PyObject *_wrap_IterationInfo_update(PyObject *SWIGUNUSEDPARM(self),
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IterationInfo_update",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IterationInfo_update", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IterationInfo_update" "', argument " "1"" of type '" "IterationInfo *""'"); 
   }
   arg1 = reinterpret_cast< IterationInfo * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IterationInfo_update" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -122375,7 +119858,7 @@ SWIGINTERN PyObject *_wrap_IterationInfo_update(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IterationInfo_update" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
   arg2 = reinterpret_cast< Fit::Parameters * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IterationInfo_update" "', argument " "3"" of type '" "double""'");
   } 
@@ -122393,11 +119876,12 @@ SWIGINTERN PyObject *_wrap_IterationInfo_iterationCount(PyObject *SWIGUNUSEDPARM
   IterationInfo *arg1 = (IterationInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   unsigned int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IterationInfo_iterationCount",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IterationInfo_iterationCount" "', argument " "1"" of type '" "IterationInfo const *""'"); 
   }
@@ -122415,11 +119899,12 @@ SWIGINTERN PyObject *_wrap_IterationInfo_chi2(PyObject *SWIGUNUSEDPARM(self), Py
   IterationInfo *arg1 = (IterationInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IterationInfo_chi2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IterationInfo_chi2" "', argument " "1"" of type '" "IterationInfo const *""'"); 
   }
@@ -122437,11 +119922,12 @@ SWIGINTERN PyObject *_wrap_IterationInfo_parameters(PyObject *SWIGUNUSEDPARM(sel
   IterationInfo *arg1 = (IterationInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Fit::Parameters result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IterationInfo_parameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IterationInfo_parameters" "', argument " "1"" of type '" "IterationInfo const *""'"); 
   }
@@ -122459,11 +119945,12 @@ SWIGINTERN PyObject *_wrap_IterationInfo_parameterMap(PyObject *SWIGUNUSEDPARM(s
   IterationInfo *arg1 = (IterationInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::map< std::string,double,std::less< std::string >,std::allocator< std::pair< std::string const,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IterationInfo_parameterMap",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IterationInfo_parameterMap" "', argument " "1"" of type '" "IterationInfo const *""'"); 
   }
@@ -122481,10 +119968,11 @@ SWIGINTERN PyObject *_wrap_delete_IterationInfo(PyObject *SWIGUNUSEDPARM(self),
   IterationInfo *arg1 = (IterationInfo *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IterationInfo",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IterationInfo, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IterationInfo, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IterationInfo" "', argument " "1"" of type '" "IterationInfo *""'"); 
   }
@@ -122499,12 +119987,16 @@ fail:
 
 SWIGINTERN PyObject *IterationInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IterationInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IterationInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = 0 ;
   double arg2 ;
@@ -122517,14 +120009,10 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
   int res3 = SWIG_OLDOBJ ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:FindPeaks",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
@@ -122532,14 +120020,14 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FindPeaks" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FindPeaks" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -122548,7 +120036,7 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
     }
     arg3 = ptr;
   }
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FindPeaks" "', argument " "4"" of type '" "double""'");
   } 
@@ -122563,7 +120051,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = 0 ;
   double arg2 ;
@@ -122573,13 +120061,10 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   double val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:FindPeaks",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
@@ -122587,14 +120072,14 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FindPeaks" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FindPeaks" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -122613,7 +120098,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = 0 ;
   double arg2 ;
@@ -122621,12 +120106,10 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FindPeaks",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
@@ -122634,7 +120117,7 @@ SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
   arg1 = reinterpret_cast< Histogram2D * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FindPeaks" "', argument " "2"" of type '" "double""'");
   } 
@@ -122647,16 +120130,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Histogram2D *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FindPeaks",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Histogram2D,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FindPeaks" "', argument " "1"" of type '" "Histogram2D const &""'"); 
   }
@@ -122677,24 +120159,20 @@ SWIGINTERN PyObject *_wrap_FindPeaks(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "FindPeaks", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_FindPeaks__SWIG_3(self, args);
+      return _wrap_FindPeaks__SWIG_3(self, argc, argv);
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -122702,13 +120180,13 @@ SWIGINTERN PyObject *_wrap_FindPeaks(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_FindPeaks__SWIG_2(self, args);
+        return _wrap_FindPeaks__SWIG_2(self, argc, argv);
       }
     }
   }
   if (argc == 3) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -122719,14 +120197,14 @@ SWIGINTERN PyObject *_wrap_FindPeaks(PyObject *self, PyObject *args) {
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_FindPeaks__SWIG_1(self, args);
+          return _wrap_FindPeaks__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   if (argc == 4) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Histogram2D, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -122742,7 +120220,7 @@ SWIGINTERN PyObject *_wrap_FindPeaks(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_FindPeaks__SWIG_0(self, args);
+            return _wrap_FindPeaks__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -122750,7 +120228,7 @@ SWIGINTERN PyObject *_wrap_FindPeaks(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FindPeaks'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FindPeaks'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    SpectrumUtils::FindPeaks(Histogram2D const &,double,std::string const &,double)\n"
     "    SpectrumUtils::FindPeaks(Histogram2D const &,double,std::string const &)\n"
@@ -122765,10 +120243,11 @@ SWIGINTERN PyObject *_wrap_delete_ScanResolution(PyObject *SWIGUNUSEDPARM(self),
   ScanResolution *arg1 = (ScanResolution *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_ScanResolution",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ScanResolution, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ScanResolution, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ScanResolution" "', argument " "1"" of type '" "ScanResolution *""'"); 
   }
@@ -122781,7 +120260,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RangedDistribution *arg1 = 0 ;
   double arg2 ;
@@ -122789,12 +120268,10 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_0(PyObjec
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ScanResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ScanResolution_scanRelativeResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScanResolution_scanRelativeResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
@@ -122802,7 +120279,7 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_0(PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ScanResolution_scanRelativeResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
   arg1 = reinterpret_cast< RangedDistribution * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ScanResolution_scanRelativeResolution" "', argument " "2"" of type '" "double""'");
   } 
@@ -122815,19 +120292,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RangedDistribution *arg1 = 0 ;
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ScanResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ScanResolution_scanRelativeResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScanResolution_scanRelativeResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
@@ -122837,7 +120312,7 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution__SWIG_1(PyObjec
   arg1 = reinterpret_cast< RangedDistribution * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScanResolution_scanRelativeResolution" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -122861,16 +120336,12 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution(PyObject *self,
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ScanResolution_scanRelativeResolution", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -122878,25 +120349,25 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanRelativeResolution(PyObject *self,
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_ScanResolution_scanRelativeResolution__SWIG_0(self, args);
+        return _wrap_ScanResolution_scanRelativeResolution__SWIG_0(self, argc, argv);
       }
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ScanResolution_scanRelativeResolution__SWIG_1(self, args);
+        return _wrap_ScanResolution_scanRelativeResolution__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ScanResolution_scanRelativeResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ScanResolution_scanRelativeResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ScanResolution::scanRelativeResolution(RangedDistribution const &,double)\n"
     "    ScanResolution::scanRelativeResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -122904,7 +120375,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RangedDistribution *arg1 = 0 ;
   double arg2 ;
@@ -122912,12 +120383,10 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(PyObjec
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ScanResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ScanResolution_scanAbsoluteResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScanResolution_scanAbsoluteResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
@@ -122925,7 +120394,7 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(PyObjec
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ScanResolution_scanAbsoluteResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
   arg1 = reinterpret_cast< RangedDistribution * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ScanResolution_scanAbsoluteResolution" "', argument " "2"" of type '" "double""'");
   } 
@@ -122938,19 +120407,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   RangedDistribution *arg1 = 0 ;
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ScanResolution *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ScanResolution_scanAbsoluteResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ScanResolution_scanAbsoluteResolution" "', argument " "1"" of type '" "RangedDistribution const &""'"); 
   }
@@ -122960,7 +120427,7 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution__SWIG_1(PyObjec
   arg1 = reinterpret_cast< RangedDistribution * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ScanResolution_scanAbsoluteResolution" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -122984,16 +120451,12 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution(PyObject *self,
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "ScanResolution_scanAbsoluteResolution", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -123001,25 +120464,25 @@ SWIGINTERN PyObject *_wrap_ScanResolution_scanAbsoluteResolution(PyObject *self,
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(self, args);
+        return _wrap_ScanResolution_scanAbsoluteResolution__SWIG_0(self, argc, argv);
       }
     }
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_ScanResolution_scanAbsoluteResolution__SWIG_1(self, args);
+        return _wrap_ScanResolution_scanAbsoluteResolution__SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ScanResolution_scanAbsoluteResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'ScanResolution_scanAbsoluteResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    ScanResolution::scanAbsoluteResolution(RangedDistribution const &,double)\n"
     "    ScanResolution::scanAbsoluteResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -123029,30 +120492,28 @@ fail:
 
 SWIGINTERN PyObject *ScanResolution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ScanResolution, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   std::vector< double,std::allocator< double > > arg2 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   AngularSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_AngularSpecScan",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_AngularSpecScan" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    int res = swig::asptr(obj1, &ptr);
+    int res = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_AngularSpecScan" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > >""'"); 
     }
@@ -123067,7 +120528,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   IAxis *arg2 = 0 ;
@@ -123075,17 +120536,15 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_1(PyObject *SWIGUNUSEDPARM(
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   AngularSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_AngularSpecScan",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_AngularSpecScan" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IAxis,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_AngularSpecScan" "', argument " "2"" of type '" "IAxis const &""'"); 
   }
@@ -123101,7 +120560,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -123115,29 +120574,25 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   AngularSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_AngularSpecScan",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_AngularSpecScan" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_AngularSpecScan" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_AngularSpecScan" "', argument " "3"" of type '" "double""'");
   } 
   arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_AngularSpecScan" "', argument " "4"" of type '" "double""'");
   } 
@@ -123155,13 +120610,9 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_AngularSpecScan", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     {
@@ -123169,10 +120620,10 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_AngularSpecScan__SWIG_1(self, args);
+        return _wrap_new_AngularSpecScan__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -123186,7 +120637,7 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_AngularSpecScan__SWIG_0(self, args);
+        return _wrap_new_AngularSpecScan__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -123212,7 +120663,7 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_AngularSpecScan__SWIG_2(self, args);
+            return _wrap_new_AngularSpecScan__SWIG_2(self, argc, argv);
           }
         }
       }
@@ -123220,7 +120671,7 @@ SWIGINTERN PyObject *_wrap_new_AngularSpecScan(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_AngularSpecScan'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_AngularSpecScan'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    AngularSpecScan::AngularSpecScan(double,std::vector< double,std::allocator< double > >)\n"
     "    AngularSpecScan::AngularSpecScan(double,IAxis const &)\n"
@@ -123234,10 +120685,11 @@ SWIGINTERN PyObject *_wrap_delete_AngularSpecScan(PyObject *SWIGUNUSEDPARM(self)
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_AngularSpecScan",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AngularSpecScan" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
@@ -123255,11 +120707,12 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_clone(PyObject *SWIGUNUSEDPARM(self),
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AngularSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AngularSpecScan_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_clone" "', argument " "1"" of type '" "AngularSpecScan const *""'"); 
   }
@@ -123280,16 +120733,15 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setFootprintFactor(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AngularSpecScan_setFootprintFactor",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AngularSpecScan_setFootprintFactor", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setFootprintFactor" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IFootprintFactor, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setFootprintFactor" "', argument " "2"" of type '" "IFootprintFactor const *""'"); 
   }
@@ -123310,16 +120762,15 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setWavelengthResolution(PyObject *SWI
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AngularSpecScan_setWavelengthResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AngularSpecScan_setWavelengthResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setWavelengthResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setWavelengthResolution" "', argument " "2"" of type '" "ScanResolution const &""'"); 
   }
@@ -123335,7 +120786,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123346,17 +120797,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setRelativeWavelengthResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123364,7 +120812,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -123377,7 +120825,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123387,17 +120835,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setRelativeWavelengthResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123407,7 +120852,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AngularSpecScan_setRelativeWavelengthResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -123431,20 +120876,16 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution(PyObj
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "AngularSpecScan_setRelativeWavelengthResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -123452,7 +120893,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution(PyObj
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_0(self, args);
+          return _wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -123463,20 +120904,20 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeWavelengthResolution(PyObj
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_1(self, args);
+          return _wrap_AngularSpecScan_setRelativeWavelengthResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'AngularSpecScan_setRelativeWavelengthResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'AngularSpecScan_setRelativeWavelengthResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    AngularSpecScan::setRelativeWavelengthResolution(RangedDistribution const &,double)\n"
     "    AngularSpecScan::setRelativeWavelengthResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -123484,7 +120925,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123495,17 +120936,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setAbsoluteWavelengthResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123513,7 +120951,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -123526,7 +120964,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123536,17 +120974,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setAbsoluteWavelengthResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123556,7 +120991,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AngularSpecScan_setAbsoluteWavelengthResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -123580,20 +121015,16 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution(PyObj
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "AngularSpecScan_setAbsoluteWavelengthResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -123601,7 +121032,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution(PyObj
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_0(self, args);
+          return _wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -123612,20 +121043,20 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteWavelengthResolution(PyObj
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_1(self, args);
+          return _wrap_AngularSpecScan_setAbsoluteWavelengthResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'AngularSpecScan_setAbsoluteWavelengthResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'AngularSpecScan_setAbsoluteWavelengthResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    AngularSpecScan::setAbsoluteWavelengthResolution(RangedDistribution const &,double)\n"
     "    AngularSpecScan::setAbsoluteWavelengthResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -123641,16 +121072,15 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAngleResolution(PyObject *SWIGUNUS
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AngularSpecScan_setAngleResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AngularSpecScan_setAngleResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setAngleResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setAngleResolution" "', argument " "2"" of type '" "ScanResolution const &""'"); 
   }
@@ -123666,7 +121096,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123677,17 +121107,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setRelativeAngularResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123695,7 +121122,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -123708,7 +121135,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123718,17 +121145,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setRelativeAngularResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123738,7 +121162,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AngularSpecScan_setRelativeAngularResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -123762,20 +121186,16 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution(PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "AngularSpecScan_setRelativeAngularResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -123783,7 +121203,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution(PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(self, args);
+          return _wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -123794,20 +121214,20 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setRelativeAngularResolution(PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(self, args);
+          return _wrap_AngularSpecScan_setRelativeAngularResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'AngularSpecScan_setRelativeAngularResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'AngularSpecScan_setRelativeAngularResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    AngularSpecScan::setRelativeAngularResolution(RangedDistribution const &,double)\n"
     "    AngularSpecScan::setRelativeAngularResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -123815,7 +121235,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123826,17 +121246,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setAbsoluteAngularResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123844,7 +121261,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -123857,7 +121274,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   AngularSpecScan *arg1 = (AngularSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -123867,17 +121284,14 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:AngularSpecScan_setAbsoluteAngularResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AngularSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "1"" of type '" "AngularSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< AngularSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -123887,7 +121301,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AngularSpecScan_setAbsoluteAngularResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -123911,20 +121325,16 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution(PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "AngularSpecScan_setAbsoluteAngularResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -123932,7 +121342,7 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution(PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(self, args);
+          return _wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -123943,20 +121353,20 @@ SWIGINTERN PyObject *_wrap_AngularSpecScan_setAbsoluteAngularResolution(PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AngularSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(self, args);
+          return _wrap_AngularSpecScan_setAbsoluteAngularResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'AngularSpecScan_setAbsoluteAngularResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'AngularSpecScan_setAbsoluteAngularResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    AngularSpecScan::setAbsoluteAngularResolution(RangedDistribution const &,double)\n"
     "    AngularSpecScan::setAbsoluteAngularResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -123966,21 +121376,24 @@ fail:
 
 SWIGINTERN PyObject *AngularSpecScan_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AngularSpecScan, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AngularSpecScan_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double,std::allocator< double > > arg1 ;
-  PyObject * obj0 = 0 ;
   QSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_QSpecScan",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    int res = swig::asptr(obj0, &ptr);
+    int res = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_QSpecScan" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > >""'"); 
     }
@@ -123995,16 +121408,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   IAxis *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   QSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_QSpecScan",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_IAxis,  0  | 0);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IAxis,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_QSpecScan" "', argument " "1"" of type '" "IAxis const &""'"); 
   }
@@ -124020,7 +121432,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   double arg2 ;
@@ -124031,23 +121443,20 @@ SWIGINTERN PyObject *_wrap_new_QSpecScan__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   QSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_QSpecScan",&obj0,&obj1,&obj2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_QSpecScan" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_QSpecScan" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_QSpecScan" "', argument " "3"" of type '" "double""'");
   } 
@@ -124065,19 +121474,15 @@ SWIGINTERN PyObject *_wrap_new_QSpecScan(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_QSpecScan", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IAxis, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_QSpecScan__SWIG_1(self, args);
+      return _wrap_new_QSpecScan__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -124085,7 +121490,7 @@ SWIGINTERN PyObject *_wrap_new_QSpecScan(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_QSpecScan__SWIG_0(self, args);
+      return _wrap_new_QSpecScan__SWIG_0(self, argc, argv);
     }
   }
   if (argc == 3) {
@@ -124105,14 +121510,14 @@ SWIGINTERN PyObject *_wrap_new_QSpecScan(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_new_QSpecScan__SWIG_2(self, args);
+          return _wrap_new_QSpecScan__SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_QSpecScan'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_QSpecScan'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    QSpecScan::QSpecScan(std::vector< double,std::allocator< double > >)\n"
     "    QSpecScan::QSpecScan(IAxis const &)\n"
@@ -124126,10 +121531,11 @@ SWIGINTERN PyObject *_wrap_delete_QSpecScan(PyObject *SWIGUNUSEDPARM(self), PyOb
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_QSpecScan",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_QSpecScan" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
@@ -124147,11 +121553,12 @@ SWIGINTERN PyObject *_wrap_QSpecScan_clone(PyObject *SWIGUNUSEDPARM(self), PyObj
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   QSpecScan *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:QSpecScan_clone",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_clone" "', argument " "1"" of type '" "QSpecScan const *""'"); 
   }
@@ -124172,16 +121579,15 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setQResolution(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:QSpecScan_setQResolution",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "QSpecScan_setQResolution", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_setQResolution" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< QSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ScanResolution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QSpecScan_setQResolution" "', argument " "2"" of type '" "ScanResolution const &""'"); 
   }
@@ -124197,7 +121603,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -124208,17 +121614,14 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_0(PyObject *SW
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:QSpecScan_setRelativeQResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< QSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -124226,7 +121629,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_0(PyObject *SW
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "QSpecScan_setRelativeQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -124239,7 +121642,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -124249,17 +121652,14 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_1(PyObject *SW
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:QSpecScan_setRelativeQResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< QSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -124269,7 +121669,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution__SWIG_1(PyObject *SW
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "QSpecScan_setRelativeQResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -124293,20 +121693,16 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "QSpecScan_setRelativeQResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_QSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -124314,7 +121710,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_QSpecScan_setRelativeQResolution__SWIG_0(self, args);
+          return _wrap_QSpecScan_setRelativeQResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -124325,20 +121721,20 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setRelativeQResolution(PyObject *self, PyOb
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_QSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_QSpecScan_setRelativeQResolution__SWIG_1(self, args);
+          return _wrap_QSpecScan_setRelativeQResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'QSpecScan_setRelativeQResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'QSpecScan_setRelativeQResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    QSpecScan::setRelativeQResolution(RangedDistribution const &,double)\n"
     "    QSpecScan::setRelativeQResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -124346,7 +121742,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -124357,17 +121753,14 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(PyObject *SW
   int res2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:QSpecScan_setAbsoluteQResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< QSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -124375,7 +121768,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(PyObject *SW
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "3"" of type '" "double""'");
   } 
@@ -124388,7 +121781,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   QSpecScan *arg1 = (QSpecScan *) 0 ;
   RangedDistribution *arg2 = 0 ;
@@ -124398,17 +121791,14 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(PyObject *SW
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:QSpecScan_setAbsoluteQResolution",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_QSpecScan, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "1"" of type '" "QSpecScan *""'"); 
   }
   arg1 = reinterpret_cast< QSpecScan * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RangedDistribution,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "2"" of type '" "RangedDistribution const &""'"); 
   }
@@ -124418,7 +121808,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(PyObject *SW
   arg2 = reinterpret_cast< RangedDistribution * >(argp2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "QSpecScan_setAbsoluteQResolution" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -124442,20 +121832,16 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "QSpecScan_setAbsoluteQResolution", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_QSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -124463,7 +121849,7 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(self, args);
+          return _wrap_QSpecScan_setAbsoluteQResolution__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -124474,20 +121860,20 @@ SWIGINTERN PyObject *_wrap_QSpecScan_setAbsoluteQResolution(PyObject *self, PyOb
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_QSpecScan, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_RangedDistribution, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(self, args);
+          return _wrap_QSpecScan_setAbsoluteQResolution__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'QSpecScan_setAbsoluteQResolution'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'QSpecScan_setAbsoluteQResolution'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    QSpecScan::setAbsoluteQResolution(RangedDistribution const &,double)\n"
     "    QSpecScan::setAbsoluteQResolution(RangedDistribution const &,std::vector< double,std::allocator< double > > const &)\n");
@@ -124497,1895 +121883,1784 @@ fail:
 
 SWIGINTERN PyObject *QSpecScan_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_QSpecScan, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *QSpecScan_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 static PyMethodDef SwigMethods[] = {
-	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
-	 { (char *)"delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_VARARGS, (char *)"delete_SwigPyIterator(SwigPyIterator self)"},
-	 { (char *)"SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_VARARGS, (char *)"SwigPyIterator_value(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, (char *)"\n"
-		"incr(size_t n=1) -> SwigPyIterator\n"
-		"SwigPyIterator_incr(SwigPyIterator self) -> SwigPyIterator\n"
-		""},
-	 { (char *)"SwigPyIterator_decr", _wrap_SwigPyIterator_decr, METH_VARARGS, (char *)"\n"
-		"decr(size_t n=1) -> SwigPyIterator\n"
-		"SwigPyIterator_decr(SwigPyIterator self) -> SwigPyIterator\n"
-		""},
-	 { (char *)"SwigPyIterator_distance", _wrap_SwigPyIterator_distance, METH_VARARGS, (char *)"SwigPyIterator_distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"},
-	 { (char *)"SwigPyIterator_equal", _wrap_SwigPyIterator_equal, METH_VARARGS, (char *)"SwigPyIterator_equal(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator_copy", _wrap_SwigPyIterator_copy, METH_VARARGS, (char *)"SwigPyIterator_copy(SwigPyIterator self) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator_next", _wrap_SwigPyIterator_next, METH_VARARGS, (char *)"SwigPyIterator_next(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator___next__", _wrap_SwigPyIterator___next__, METH_VARARGS, (char *)"SwigPyIterator___next__(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_previous", _wrap_SwigPyIterator_previous, METH_VARARGS, (char *)"SwigPyIterator_previous(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_advance", _wrap_SwigPyIterator_advance, METH_VARARGS, (char *)"SwigPyIterator_advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___eq__", _wrap_SwigPyIterator___eq__, METH_VARARGS, (char *)"SwigPyIterator___eq__(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator___ne__", _wrap_SwigPyIterator___ne__, METH_VARARGS, (char *)"SwigPyIterator___ne__(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator___iadd__", _wrap_SwigPyIterator___iadd__, METH_VARARGS, (char *)"SwigPyIterator___iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___isub__", _wrap_SwigPyIterator___isub__, METH_VARARGS, (char *)"SwigPyIterator___isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, (char *)"SwigPyIterator___add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, (char *)"\n"
-		"__sub__(ptrdiff_t n) -> SwigPyIterator\n"
+	 { "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL},
+	 { "delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_O, "delete_SwigPyIterator(SwigPyIterator self)"},
+	 { "SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_O, "SwigPyIterator_value(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, "SwigPyIterator_incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"},
+	 { "SwigPyIterator_decr", _wrap_SwigPyIterator_decr, METH_VARARGS, "SwigPyIterator_decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"},
+	 { "SwigPyIterator_distance", _wrap_SwigPyIterator_distance, METH_VARARGS, "SwigPyIterator_distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"},
+	 { "SwigPyIterator_equal", _wrap_SwigPyIterator_equal, METH_VARARGS, "SwigPyIterator_equal(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator_copy", _wrap_SwigPyIterator_copy, METH_O, "SwigPyIterator_copy(SwigPyIterator self) -> SwigPyIterator"},
+	 { "SwigPyIterator_next", _wrap_SwigPyIterator_next, METH_O, "SwigPyIterator_next(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator___next__", _wrap_SwigPyIterator___next__, METH_O, "SwigPyIterator___next__(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_previous", _wrap_SwigPyIterator_previous, METH_O, "SwigPyIterator_previous(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_advance", _wrap_SwigPyIterator_advance, METH_VARARGS, "SwigPyIterator_advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___eq__", _wrap_SwigPyIterator___eq__, METH_VARARGS, "SwigPyIterator___eq__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator___ne__", _wrap_SwigPyIterator___ne__, METH_VARARGS, "SwigPyIterator___ne__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator___iadd__", _wrap_SwigPyIterator___iadd__, METH_VARARGS, "SwigPyIterator___iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___isub__", _wrap_SwigPyIterator___isub__, METH_VARARGS, "SwigPyIterator___isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, "SwigPyIterator___add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, "\n"
+		"SwigPyIterator___sub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator\n"
 		"SwigPyIterator___sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t\n"
 		""},
-	 { (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vdouble1d_t_iterator", _wrap_vdouble1d_t_iterator, METH_VARARGS, (char *)"vdouble1d_t_iterator(vdouble1d_t self) -> SwigPyIterator"},
-	 { (char *)"vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_VARARGS, (char *)"vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_VARARGS, (char *)"vdouble1d_t___bool__(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_VARARGS, (char *)"vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, (char *)"vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"},
-	 { (char *)"vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n"
+	 { "SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_O, NULL},
+	 { "vdouble1d_t_iterator", _wrap_vdouble1d_t_iterator, METH_O, "vdouble1d_t_iterator(vdouble1d_t self) -> SwigPyIterator"},
+	 { "vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_O, "vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_O, "vdouble1d_t___bool__(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_O, "vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, "vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"},
+	 { "vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, "\n"
+		"vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n"
 		"vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n"
 		""},
-	 { (char *)"vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, (char *)"vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"},
-	 { (char *)"vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< double >::difference_type i)\n"
+	 { "vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, "vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"},
+	 { "vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___delitem__(vdouble1d_t self, std::vector< double >::difference_type i)\n"
 		"vdouble1d_t___delitem__(vdouble1d_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vdouble1d_t___getitem__", _wrap_vdouble1d_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vdouble1d_t\n"
+	 { "vdouble1d_t___getitem__", _wrap_vdouble1d_t___getitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___getitem__(vdouble1d_t self, PySliceObject * slice) -> vdouble1d_t\n"
 		"vdouble1d_t___getitem__(vdouble1d_t self, std::vector< double >::difference_type i) -> std::vector< double >::value_type const &\n"
 		""},
-	 { (char *)"vdouble1d_t___setitem__", _wrap_vdouble1d_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vdouble1d_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vdouble1d_t___setitem__", _wrap_vdouble1d_t___setitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___setitem__(vdouble1d_t self, PySliceObject * slice, vdouble1d_t v)\n"
+		"vdouble1d_t___setitem__(vdouble1d_t self, PySliceObject * slice)\n"
 		"vdouble1d_t___setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"},
-	 { (char *)"vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, (char *)"vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_VARARGS, (char *)"vdouble1d_t_empty(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_VARARGS, (char *)"vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_O, "vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"},
+	 { "vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, "vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_O, "vdouble1d_t_empty(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_O, "vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, "\n"
 		"vdouble1d_t_swap(vdouble1d_t self, vdouble1d_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_VARARGS, (char *)"vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"},
-	 { (char *)"vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_VARARGS, (char *)"vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"},
-	 { (char *)"vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_VARARGS, (char *)"vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
-	 { (char *)"vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_VARARGS, (char *)"vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
-	 { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"},
-	 { (char *)"vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_VARARGS, (char *)"vdouble1d_t_pop_back(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< double >::iterator pos) -> std::vector< double >::iterator\n"
+	 { "vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_O, "vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"},
+	 { "vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_O, "vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"},
+	 { "vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_O, "vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
+	 { "vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_O, "vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
+	 { "vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_O, "vdouble1d_t_clear(vdouble1d_t self)"},
+	 { "vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_O, "vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"},
+	 { "vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_O, "vdouble1d_t_pop_back(vdouble1d_t self)"},
+	 { "vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, "\n"
+		"vdouble1d_t_erase(vdouble1d_t self, std::vector< double >::iterator pos) -> std::vector< double >::iterator\n"
 		"vdouble1d_t_erase(vdouble1d_t self, std::vector< double >::iterator first, std::vector< double >::iterator last) -> std::vector< double >::iterator\n"
 		""},
-	 { (char *)"new_vdouble1d_t", _wrap_new_vdouble1d_t, METH_VARARGS, (char *)"\n"
+	 { "new_vdouble1d_t", _wrap_new_vdouble1d_t, METH_VARARGS, "\n"
 		"vdouble1d_t()\n"
-		"vdouble1d_t(vdouble1d_t arg2)\n"
+		"vdouble1d_t(vdouble1d_t other)\n"
 		"vdouble1d_t(std::vector< double >::size_type size)\n"
 		"new_vdouble1d_t(std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t\n"
 		""},
-	 { (char *)"vdouble1d_t_push_back", _wrap_vdouble1d_t_push_back, METH_VARARGS, (char *)"vdouble1d_t_push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_front", _wrap_vdouble1d_t_front, METH_VARARGS, (char *)"vdouble1d_t_front(vdouble1d_t self) -> std::vector< double >::value_type const &"},
-	 { (char *)"vdouble1d_t_back", _wrap_vdouble1d_t_back, METH_VARARGS, (char *)"vdouble1d_t_back(vdouble1d_t self) -> std::vector< double >::value_type const &"},
-	 { (char *)"vdouble1d_t_assign", _wrap_vdouble1d_t_assign, METH_VARARGS, (char *)"vdouble1d_t_assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_resize", _wrap_vdouble1d_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< double >::size_type new_size)\n"
+	 { "vdouble1d_t_push_back", _wrap_vdouble1d_t_push_back, METH_VARARGS, "vdouble1d_t_push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_front", _wrap_vdouble1d_t_front, METH_O, "vdouble1d_t_front(vdouble1d_t self) -> std::vector< double >::value_type const &"},
+	 { "vdouble1d_t_back", _wrap_vdouble1d_t_back, METH_O, "vdouble1d_t_back(vdouble1d_t self) -> std::vector< double >::value_type const &"},
+	 { "vdouble1d_t_assign", _wrap_vdouble1d_t_assign, METH_VARARGS, "vdouble1d_t_assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_resize", _wrap_vdouble1d_t_resize, METH_VARARGS, "\n"
+		"vdouble1d_t_resize(vdouble1d_t self, std::vector< double >::size_type new_size)\n"
 		"vdouble1d_t_resize(vdouble1d_t self, std::vector< double >::size_type new_size, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_insert", _wrap_vdouble1d_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator\n"
+	 { "vdouble1d_t_insert", _wrap_vdouble1d_t_insert, METH_VARARGS, "\n"
+		"vdouble1d_t_insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator\n"
 		"vdouble1d_t_insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::size_type n, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_reserve", _wrap_vdouble1d_t_reserve, METH_VARARGS, (char *)"vdouble1d_t_reserve(vdouble1d_t self, std::vector< double >::size_type n)"},
-	 { (char *)"vdouble1d_t_capacity", _wrap_vdouble1d_t_capacity, METH_VARARGS, (char *)"vdouble1d_t_capacity(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"delete_vdouble1d_t", _wrap_delete_vdouble1d_t, METH_VARARGS, (char *)"delete_vdouble1d_t(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_swigregister", vdouble1d_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vdouble2d_t_iterator", _wrap_vdouble2d_t_iterator, METH_VARARGS, (char *)"vdouble2d_t_iterator(vdouble2d_t self) -> SwigPyIterator"},
-	 { (char *)"vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_VARARGS, (char *)"vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_VARARGS, (char *)"vdouble2d_t___bool__(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_VARARGS, (char *)"vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, (char *)"vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"},
-	 { (char *)"vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n"
+	 { "vdouble1d_t_reserve", _wrap_vdouble1d_t_reserve, METH_VARARGS, "vdouble1d_t_reserve(vdouble1d_t self, std::vector< double >::size_type n)"},
+	 { "vdouble1d_t_capacity", _wrap_vdouble1d_t_capacity, METH_O, "vdouble1d_t_capacity(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "delete_vdouble1d_t", _wrap_delete_vdouble1d_t, METH_O, "delete_vdouble1d_t(vdouble1d_t self)"},
+	 { "vdouble1d_t_swigregister", vdouble1d_t_swigregister, METH_O, NULL},
+	 { "vdouble1d_t_swiginit", vdouble1d_t_swiginit, METH_VARARGS, NULL},
+	 { "vdouble2d_t_iterator", _wrap_vdouble2d_t_iterator, METH_O, "vdouble2d_t_iterator(vdouble2d_t self) -> SwigPyIterator"},
+	 { "vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_O, "vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_O, "vdouble2d_t___bool__(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_O, "vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, "vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"},
+	 { "vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, "\n"
+		"vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n"
 		"vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n"
 		""},
-	 { (char *)"vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, (char *)"vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"},
-	 { (char *)"vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::vector< double > >::difference_type i)\n"
+	 { "vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, "vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"},
+	 { "vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___delitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i)\n"
 		"vdouble2d_t___delitem__(vdouble2d_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vdouble2d_t___getitem__", _wrap_vdouble2d_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vdouble2d_t\n"
+	 { "vdouble2d_t___getitem__", _wrap_vdouble2d_t___getitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___getitem__(vdouble2d_t self, PySliceObject * slice) -> vdouble2d_t\n"
 		"vdouble2d_t___getitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i) -> vdouble1d_t\n"
 		""},
-	 { (char *)"vdouble2d_t___setitem__", _wrap_vdouble2d_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vdouble2d_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vdouble2d_t___setitem__", _wrap_vdouble2d_t___setitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___setitem__(vdouble2d_t self, PySliceObject * slice, vdouble2d_t v)\n"
+		"vdouble2d_t___setitem__(vdouble2d_t self, PySliceObject * slice)\n"
 		"vdouble2d_t___setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, (char *)"vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_VARARGS, (char *)"vdouble2d_t_empty(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_VARARGS, (char *)"vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_O, "vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, "vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"},
+	 { "vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_O, "vdouble2d_t_empty(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_O, "vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, "\n"
 		"vdouble2d_t_swap(vdouble2d_t self, vdouble2d_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_VARARGS, (char *)"vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
-	 { (char *)"vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_VARARGS, (char *)"vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
-	 { (char *)"vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_VARARGS, (char *)"vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
-	 { (char *)"vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_VARARGS, (char *)"vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
-	 { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"},
-	 { (char *)"vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_VARARGS, (char *)"vdouble2d_t_pop_back(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n"
+	 { "vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_O, "vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
+	 { "vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_O, "vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
+	 { "vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_O, "vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
+	 { "vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_O, "vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
+	 { "vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_O, "vdouble2d_t_clear(vdouble2d_t self)"},
+	 { "vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_O, "vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"},
+	 { "vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_O, "vdouble2d_t_pop_back(vdouble2d_t self)"},
+	 { "vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, "\n"
+		"vdouble2d_t_erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n"
 		"vdouble2d_t_erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator first, std::vector< std::vector< double > >::iterator last) -> std::vector< std::vector< double > >::iterator\n"
 		""},
-	 { (char *)"new_vdouble2d_t", _wrap_new_vdouble2d_t, METH_VARARGS, (char *)"\n"
+	 { "new_vdouble2d_t", _wrap_new_vdouble2d_t, METH_VARARGS, "\n"
 		"vdouble2d_t()\n"
-		"vdouble2d_t(vdouble2d_t arg2)\n"
+		"vdouble2d_t(vdouble2d_t other)\n"
 		"vdouble2d_t(std::vector< std::vector< double > >::size_type size)\n"
 		"new_vdouble2d_t(std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t\n"
 		""},
-	 { (char *)"vdouble2d_t_push_back", _wrap_vdouble2d_t_push_back, METH_VARARGS, (char *)"vdouble2d_t_push_back(vdouble2d_t self, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_front", _wrap_vdouble2d_t_front, METH_VARARGS, (char *)"vdouble2d_t_front(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_back", _wrap_vdouble2d_t_back, METH_VARARGS, (char *)"vdouble2d_t_back(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_assign", _wrap_vdouble2d_t_assign, METH_VARARGS, (char *)"vdouble2d_t_assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_resize", _wrap_vdouble2d_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::vector< double > >::size_type new_size)\n"
+	 { "vdouble2d_t_push_back", _wrap_vdouble2d_t_push_back, METH_VARARGS, "vdouble2d_t_push_back(vdouble2d_t self, vdouble1d_t x)"},
+	 { "vdouble2d_t_front", _wrap_vdouble2d_t_front, METH_O, "vdouble2d_t_front(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_back", _wrap_vdouble2d_t_back, METH_O, "vdouble2d_t_back(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_assign", _wrap_vdouble2d_t_assign, METH_VARARGS, "vdouble2d_t_assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"},
+	 { "vdouble2d_t_resize", _wrap_vdouble2d_t_resize, METH_VARARGS, "\n"
+		"vdouble2d_t_resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size)\n"
 		"vdouble2d_t_resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_insert", _wrap_vdouble2d_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator\n"
+	 { "vdouble2d_t_insert", _wrap_vdouble2d_t_insert, METH_VARARGS, "\n"
+		"vdouble2d_t_insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator\n"
 		"vdouble2d_t_insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_reserve", _wrap_vdouble2d_t_reserve, METH_VARARGS, (char *)"vdouble2d_t_reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"},
-	 { (char *)"vdouble2d_t_capacity", _wrap_vdouble2d_t_capacity, METH_VARARGS, (char *)"vdouble2d_t_capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"delete_vdouble2d_t", _wrap_delete_vdouble2d_t, METH_VARARGS, (char *)"delete_vdouble2d_t(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_swigregister", vdouble2d_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_integer_t_iterator", _wrap_vector_integer_t_iterator, METH_VARARGS, (char *)"vector_integer_t_iterator(vector_integer_t self) -> SwigPyIterator"},
-	 { (char *)"vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_VARARGS, (char *)"vector_integer_t___nonzero__(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_VARARGS, (char *)"vector_integer_t___bool__(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_VARARGS, (char *)"vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, (char *)"vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"},
-	 { (char *)"vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n"
+	 { "vdouble2d_t_reserve", _wrap_vdouble2d_t_reserve, METH_VARARGS, "vdouble2d_t_reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"},
+	 { "vdouble2d_t_capacity", _wrap_vdouble2d_t_capacity, METH_O, "vdouble2d_t_capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "delete_vdouble2d_t", _wrap_delete_vdouble2d_t, METH_O, "delete_vdouble2d_t(vdouble2d_t self)"},
+	 { "vdouble2d_t_swigregister", vdouble2d_t_swigregister, METH_O, NULL},
+	 { "vdouble2d_t_swiginit", vdouble2d_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_integer_t_iterator", _wrap_vector_integer_t_iterator, METH_O, "vector_integer_t_iterator(vector_integer_t self) -> SwigPyIterator"},
+	 { "vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_O, "vector_integer_t___nonzero__(vector_integer_t self) -> bool"},
+	 { "vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_O, "vector_integer_t___bool__(vector_integer_t self) -> bool"},
+	 { "vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_O, "vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, "vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"},
+	 { "vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, "\n"
+		"vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n"
 		"vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n"
 		""},
-	 { (char *)"vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, (char *)"vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"},
-	 { (char *)"vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< int >::difference_type i)\n"
+	 { "vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, "vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"},
+	 { "vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, "\n"
+		"vector_integer_t___delitem__(vector_integer_t self, std::vector< int >::difference_type i)\n"
 		"vector_integer_t___delitem__(vector_integer_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_integer_t___getitem__", _wrap_vector_integer_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_integer_t\n"
+	 { "vector_integer_t___getitem__", _wrap_vector_integer_t___getitem__, METH_VARARGS, "\n"
+		"vector_integer_t___getitem__(vector_integer_t self, PySliceObject * slice) -> vector_integer_t\n"
 		"vector_integer_t___getitem__(vector_integer_t self, std::vector< int >::difference_type i) -> std::vector< int >::value_type const &\n"
 		""},
-	 { (char *)"vector_integer_t___setitem__", _wrap_vector_integer_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_integer_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_integer_t___setitem__", _wrap_vector_integer_t___setitem__, METH_VARARGS, "\n"
+		"vector_integer_t___setitem__(vector_integer_t self, PySliceObject * slice, vector_integer_t v)\n"
+		"vector_integer_t___setitem__(vector_integer_t self, PySliceObject * slice)\n"
 		"vector_integer_t___setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"},
-	 { (char *)"vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, (char *)"vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_VARARGS, (char *)"vector_integer_t_empty(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t_size", _wrap_vector_integer_t_size, METH_VARARGS, (char *)"vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_O, "vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"},
+	 { "vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, "vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_O, "vector_integer_t_empty(vector_integer_t self) -> bool"},
+	 { "vector_integer_t_size", _wrap_vector_integer_t_size, METH_O, "vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, "\n"
 		"vector_integer_t_swap(vector_integer_t self, vector_integer_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_VARARGS, (char *)"vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"},
-	 { (char *)"vector_integer_t_end", _wrap_vector_integer_t_end, METH_VARARGS, (char *)"vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"},
-	 { (char *)"vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_VARARGS, (char *)"vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
-	 { (char *)"vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_VARARGS, (char *)"vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
-	 { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"},
-	 { (char *)"vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_VARARGS, (char *)"vector_integer_t_pop_back(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< int >::iterator pos) -> std::vector< int >::iterator\n"
+	 { "vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_O, "vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"},
+	 { "vector_integer_t_end", _wrap_vector_integer_t_end, METH_O, "vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"},
+	 { "vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_O, "vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
+	 { "vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_O, "vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
+	 { "vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_O, "vector_integer_t_clear(vector_integer_t self)"},
+	 { "vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_O, "vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"},
+	 { "vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_O, "vector_integer_t_pop_back(vector_integer_t self)"},
+	 { "vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, "\n"
+		"vector_integer_t_erase(vector_integer_t self, std::vector< int >::iterator pos) -> std::vector< int >::iterator\n"
 		"vector_integer_t_erase(vector_integer_t self, std::vector< int >::iterator first, std::vector< int >::iterator last) -> std::vector< int >::iterator\n"
 		""},
-	 { (char *)"new_vector_integer_t", _wrap_new_vector_integer_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_integer_t", _wrap_new_vector_integer_t, METH_VARARGS, "\n"
 		"vector_integer_t()\n"
-		"vector_integer_t(vector_integer_t arg2)\n"
+		"vector_integer_t(vector_integer_t other)\n"
 		"vector_integer_t(std::vector< int >::size_type size)\n"
 		"new_vector_integer_t(std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t\n"
 		""},
-	 { (char *)"vector_integer_t_push_back", _wrap_vector_integer_t_push_back, METH_VARARGS, (char *)"vector_integer_t_push_back(vector_integer_t self, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_front", _wrap_vector_integer_t_front, METH_VARARGS, (char *)"vector_integer_t_front(vector_integer_t self) -> std::vector< int >::value_type const &"},
-	 { (char *)"vector_integer_t_back", _wrap_vector_integer_t_back, METH_VARARGS, (char *)"vector_integer_t_back(vector_integer_t self) -> std::vector< int >::value_type const &"},
-	 { (char *)"vector_integer_t_assign", _wrap_vector_integer_t_assign, METH_VARARGS, (char *)"vector_integer_t_assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_resize", _wrap_vector_integer_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< int >::size_type new_size)\n"
+	 { "vector_integer_t_push_back", _wrap_vector_integer_t_push_back, METH_VARARGS, "vector_integer_t_push_back(vector_integer_t self, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_front", _wrap_vector_integer_t_front, METH_O, "vector_integer_t_front(vector_integer_t self) -> std::vector< int >::value_type const &"},
+	 { "vector_integer_t_back", _wrap_vector_integer_t_back, METH_O, "vector_integer_t_back(vector_integer_t self) -> std::vector< int >::value_type const &"},
+	 { "vector_integer_t_assign", _wrap_vector_integer_t_assign, METH_VARARGS, "vector_integer_t_assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_resize", _wrap_vector_integer_t_resize, METH_VARARGS, "\n"
+		"vector_integer_t_resize(vector_integer_t self, std::vector< int >::size_type new_size)\n"
 		"vector_integer_t_resize(vector_integer_t self, std::vector< int >::size_type new_size, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_insert", _wrap_vector_integer_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator\n"
+	 { "vector_integer_t_insert", _wrap_vector_integer_t_insert, METH_VARARGS, "\n"
+		"vector_integer_t_insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator\n"
 		"vector_integer_t_insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::size_type n, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_reserve", _wrap_vector_integer_t_reserve, METH_VARARGS, (char *)"vector_integer_t_reserve(vector_integer_t self, std::vector< int >::size_type n)"},
-	 { (char *)"vector_integer_t_capacity", _wrap_vector_integer_t_capacity, METH_VARARGS, (char *)"vector_integer_t_capacity(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"delete_vector_integer_t", _wrap_delete_vector_integer_t, METH_VARARGS, (char *)"delete_vector_integer_t(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_swigregister", vector_integer_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vinteger2d_t_iterator", _wrap_vinteger2d_t_iterator, METH_VARARGS, (char *)"vinteger2d_t_iterator(vinteger2d_t self) -> SwigPyIterator"},
-	 { (char *)"vinteger2d_t___nonzero__", _wrap_vinteger2d_t___nonzero__, METH_VARARGS, (char *)"vinteger2d_t___nonzero__(vinteger2d_t self) -> bool"},
-	 { (char *)"vinteger2d_t___bool__", _wrap_vinteger2d_t___bool__, METH_VARARGS, (char *)"vinteger2d_t___bool__(vinteger2d_t self) -> bool"},
-	 { (char *)"vinteger2d_t___len__", _wrap_vinteger2d_t___len__, METH_VARARGS, (char *)"vinteger2d_t___len__(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
-	 { (char *)"vinteger2d_t___getslice__", _wrap_vinteger2d_t___getslice__, METH_VARARGS, (char *)"vinteger2d_t___getslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j) -> vinteger2d_t"},
-	 { (char *)"vinteger2d_t___setslice__", _wrap_vinteger2d_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)\n"
+	 { "vector_integer_t_reserve", _wrap_vector_integer_t_reserve, METH_VARARGS, "vector_integer_t_reserve(vector_integer_t self, std::vector< int >::size_type n)"},
+	 { "vector_integer_t_capacity", _wrap_vector_integer_t_capacity, METH_O, "vector_integer_t_capacity(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "delete_vector_integer_t", _wrap_delete_vector_integer_t, METH_O, "delete_vector_integer_t(vector_integer_t self)"},
+	 { "vector_integer_t_swigregister", vector_integer_t_swigregister, METH_O, NULL},
+	 { "vector_integer_t_swiginit", vector_integer_t_swiginit, METH_VARARGS, NULL},
+	 { "vinteger2d_t_iterator", _wrap_vinteger2d_t_iterator, METH_O, "vinteger2d_t_iterator(vinteger2d_t self) -> SwigPyIterator"},
+	 { "vinteger2d_t___nonzero__", _wrap_vinteger2d_t___nonzero__, METH_O, "vinteger2d_t___nonzero__(vinteger2d_t self) -> bool"},
+	 { "vinteger2d_t___bool__", _wrap_vinteger2d_t___bool__, METH_O, "vinteger2d_t___bool__(vinteger2d_t self) -> bool"},
+	 { "vinteger2d_t___len__", _wrap_vinteger2d_t___len__, METH_O, "vinteger2d_t___len__(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
+	 { "vinteger2d_t___getslice__", _wrap_vinteger2d_t___getslice__, METH_VARARGS, "vinteger2d_t___getslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j) -> vinteger2d_t"},
+	 { "vinteger2d_t___setslice__", _wrap_vinteger2d_t___setslice__, METH_VARARGS, "\n"
+		"vinteger2d_t___setslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)\n"
 		"vinteger2d_t___setslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j, vinteger2d_t v)\n"
 		""},
-	 { (char *)"vinteger2d_t___delslice__", _wrap_vinteger2d_t___delslice__, METH_VARARGS, (char *)"vinteger2d_t___delslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)"},
-	 { (char *)"vinteger2d_t___delitem__", _wrap_vinteger2d_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::vector< int > >::difference_type i)\n"
+	 { "vinteger2d_t___delslice__", _wrap_vinteger2d_t___delslice__, METH_VARARGS, "vinteger2d_t___delslice__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, std::vector< std::vector< int > >::difference_type j)"},
+	 { "vinteger2d_t___delitem__", _wrap_vinteger2d_t___delitem__, METH_VARARGS, "\n"
+		"vinteger2d_t___delitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i)\n"
 		"vinteger2d_t___delitem__(vinteger2d_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vinteger2d_t___getitem__", _wrap_vinteger2d_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vinteger2d_t\n"
+	 { "vinteger2d_t___getitem__", _wrap_vinteger2d_t___getitem__, METH_VARARGS, "\n"
+		"vinteger2d_t___getitem__(vinteger2d_t self, PySliceObject * slice) -> vinteger2d_t\n"
 		"vinteger2d_t___getitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i) -> vector_integer_t\n"
 		""},
-	 { (char *)"vinteger2d_t___setitem__", _wrap_vinteger2d_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vinteger2d_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vinteger2d_t___setitem__", _wrap_vinteger2d_t___setitem__, METH_VARARGS, "\n"
+		"vinteger2d_t___setitem__(vinteger2d_t self, PySliceObject * slice, vinteger2d_t v)\n"
+		"vinteger2d_t___setitem__(vinteger2d_t self, PySliceObject * slice)\n"
 		"vinteger2d_t___setitem__(vinteger2d_t self, std::vector< std::vector< int > >::difference_type i, vector_integer_t x)\n"
 		""},
-	 { (char *)"vinteger2d_t_pop", _wrap_vinteger2d_t_pop, METH_VARARGS, (char *)"vinteger2d_t_pop(vinteger2d_t self) -> vector_integer_t"},
-	 { (char *)"vinteger2d_t_append", _wrap_vinteger2d_t_append, METH_VARARGS, (char *)"vinteger2d_t_append(vinteger2d_t self, vector_integer_t x)"},
-	 { (char *)"vinteger2d_t_empty", _wrap_vinteger2d_t_empty, METH_VARARGS, (char *)"vinteger2d_t_empty(vinteger2d_t self) -> bool"},
-	 { (char *)"vinteger2d_t_size", _wrap_vinteger2d_t_size, METH_VARARGS, (char *)"vinteger2d_t_size(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
-	 { (char *)"vinteger2d_t_swap", _wrap_vinteger2d_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vinteger2d_t_pop", _wrap_vinteger2d_t_pop, METH_O, "vinteger2d_t_pop(vinteger2d_t self) -> vector_integer_t"},
+	 { "vinteger2d_t_append", _wrap_vinteger2d_t_append, METH_VARARGS, "vinteger2d_t_append(vinteger2d_t self, vector_integer_t x)"},
+	 { "vinteger2d_t_empty", _wrap_vinteger2d_t_empty, METH_O, "vinteger2d_t_empty(vinteger2d_t self) -> bool"},
+	 { "vinteger2d_t_size", _wrap_vinteger2d_t_size, METH_O, "vinteger2d_t_size(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
+	 { "vinteger2d_t_swap", _wrap_vinteger2d_t_swap, METH_VARARGS, "\n"
 		"vinteger2d_t_swap(vinteger2d_t self, vinteger2d_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vinteger2d_t_begin", _wrap_vinteger2d_t_begin, METH_VARARGS, (char *)"vinteger2d_t_begin(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"},
-	 { (char *)"vinteger2d_t_end", _wrap_vinteger2d_t_end, METH_VARARGS, (char *)"vinteger2d_t_end(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"},
-	 { (char *)"vinteger2d_t_rbegin", _wrap_vinteger2d_t_rbegin, METH_VARARGS, (char *)"vinteger2d_t_rbegin(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"},
-	 { (char *)"vinteger2d_t_rend", _wrap_vinteger2d_t_rend, METH_VARARGS, (char *)"vinteger2d_t_rend(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"},
-	 { (char *)"vinteger2d_t_clear", _wrap_vinteger2d_t_clear, METH_VARARGS, (char *)"vinteger2d_t_clear(vinteger2d_t self)"},
-	 { (char *)"vinteger2d_t_get_allocator", _wrap_vinteger2d_t_get_allocator, METH_VARARGS, (char *)"vinteger2d_t_get_allocator(vinteger2d_t self) -> std::vector< std::vector< int > >::allocator_type"},
-	 { (char *)"vinteger2d_t_pop_back", _wrap_vinteger2d_t_pop_back, METH_VARARGS, (char *)"vinteger2d_t_pop_back(vinteger2d_t self)"},
-	 { (char *)"vinteger2d_t_erase", _wrap_vinteger2d_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::vector< int > >::iterator pos) -> std::vector< std::vector< int > >::iterator\n"
+	 { "vinteger2d_t_begin", _wrap_vinteger2d_t_begin, METH_O, "vinteger2d_t_begin(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"},
+	 { "vinteger2d_t_end", _wrap_vinteger2d_t_end, METH_O, "vinteger2d_t_end(vinteger2d_t self) -> std::vector< std::vector< int > >::iterator"},
+	 { "vinteger2d_t_rbegin", _wrap_vinteger2d_t_rbegin, METH_O, "vinteger2d_t_rbegin(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"},
+	 { "vinteger2d_t_rend", _wrap_vinteger2d_t_rend, METH_O, "vinteger2d_t_rend(vinteger2d_t self) -> std::vector< std::vector< int > >::reverse_iterator"},
+	 { "vinteger2d_t_clear", _wrap_vinteger2d_t_clear, METH_O, "vinteger2d_t_clear(vinteger2d_t self)"},
+	 { "vinteger2d_t_get_allocator", _wrap_vinteger2d_t_get_allocator, METH_O, "vinteger2d_t_get_allocator(vinteger2d_t self) -> std::vector< std::vector< int > >::allocator_type"},
+	 { "vinteger2d_t_pop_back", _wrap_vinteger2d_t_pop_back, METH_O, "vinteger2d_t_pop_back(vinteger2d_t self)"},
+	 { "vinteger2d_t_erase", _wrap_vinteger2d_t_erase, METH_VARARGS, "\n"
+		"vinteger2d_t_erase(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos) -> std::vector< std::vector< int > >::iterator\n"
 		"vinteger2d_t_erase(vinteger2d_t self, std::vector< std::vector< int > >::iterator first, std::vector< std::vector< int > >::iterator last) -> std::vector< std::vector< int > >::iterator\n"
 		""},
-	 { (char *)"new_vinteger2d_t", _wrap_new_vinteger2d_t, METH_VARARGS, (char *)"\n"
+	 { "new_vinteger2d_t", _wrap_new_vinteger2d_t, METH_VARARGS, "\n"
 		"vinteger2d_t()\n"
-		"vinteger2d_t(vinteger2d_t arg2)\n"
+		"vinteger2d_t(vinteger2d_t other)\n"
 		"vinteger2d_t(std::vector< std::vector< int > >::size_type size)\n"
 		"new_vinteger2d_t(std::vector< std::vector< int > >::size_type size, vector_integer_t value) -> vinteger2d_t\n"
 		""},
-	 { (char *)"vinteger2d_t_push_back", _wrap_vinteger2d_t_push_back, METH_VARARGS, (char *)"vinteger2d_t_push_back(vinteger2d_t self, vector_integer_t x)"},
-	 { (char *)"vinteger2d_t_front", _wrap_vinteger2d_t_front, METH_VARARGS, (char *)"vinteger2d_t_front(vinteger2d_t self) -> vector_integer_t"},
-	 { (char *)"vinteger2d_t_back", _wrap_vinteger2d_t_back, METH_VARARGS, (char *)"vinteger2d_t_back(vinteger2d_t self) -> vector_integer_t"},
-	 { (char *)"vinteger2d_t_assign", _wrap_vinteger2d_t_assign, METH_VARARGS, (char *)"vinteger2d_t_assign(vinteger2d_t self, std::vector< std::vector< int > >::size_type n, vector_integer_t x)"},
-	 { (char *)"vinteger2d_t_resize", _wrap_vinteger2d_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::vector< int > >::size_type new_size)\n"
+	 { "vinteger2d_t_push_back", _wrap_vinteger2d_t_push_back, METH_VARARGS, "vinteger2d_t_push_back(vinteger2d_t self, vector_integer_t x)"},
+	 { "vinteger2d_t_front", _wrap_vinteger2d_t_front, METH_O, "vinteger2d_t_front(vinteger2d_t self) -> vector_integer_t"},
+	 { "vinteger2d_t_back", _wrap_vinteger2d_t_back, METH_O, "vinteger2d_t_back(vinteger2d_t self) -> vector_integer_t"},
+	 { "vinteger2d_t_assign", _wrap_vinteger2d_t_assign, METH_VARARGS, "vinteger2d_t_assign(vinteger2d_t self, std::vector< std::vector< int > >::size_type n, vector_integer_t x)"},
+	 { "vinteger2d_t_resize", _wrap_vinteger2d_t_resize, METH_VARARGS, "\n"
+		"vinteger2d_t_resize(vinteger2d_t self, std::vector< std::vector< int > >::size_type new_size)\n"
 		"vinteger2d_t_resize(vinteger2d_t self, std::vector< std::vector< int > >::size_type new_size, vector_integer_t x)\n"
 		""},
-	 { (char *)"vinteger2d_t_insert", _wrap_vinteger2d_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::vector< int > >::iterator pos, vector_integer_t x) -> std::vector< std::vector< int > >::iterator\n"
+	 { "vinteger2d_t_insert", _wrap_vinteger2d_t_insert, METH_VARARGS, "\n"
+		"vinteger2d_t_insert(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos, vector_integer_t x) -> std::vector< std::vector< int > >::iterator\n"
 		"vinteger2d_t_insert(vinteger2d_t self, std::vector< std::vector< int > >::iterator pos, std::vector< std::vector< int > >::size_type n, vector_integer_t x)\n"
 		""},
-	 { (char *)"vinteger2d_t_reserve", _wrap_vinteger2d_t_reserve, METH_VARARGS, (char *)"vinteger2d_t_reserve(vinteger2d_t self, std::vector< std::vector< int > >::size_type n)"},
-	 { (char *)"vinteger2d_t_capacity", _wrap_vinteger2d_t_capacity, METH_VARARGS, (char *)"vinteger2d_t_capacity(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
-	 { (char *)"delete_vinteger2d_t", _wrap_delete_vinteger2d_t, METH_VARARGS, (char *)"delete_vinteger2d_t(vinteger2d_t self)"},
-	 { (char *)"vinteger2d_t_swigregister", vinteger2d_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_longinteger_t_iterator", _wrap_vector_longinteger_t_iterator, METH_VARARGS, (char *)"vector_longinteger_t_iterator(vector_longinteger_t self) -> SwigPyIterator"},
-	 { (char *)"vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_VARARGS, (char *)"vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_VARARGS, (char *)"vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_VARARGS, (char *)"vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, (char *)"vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"},
-	 { (char *)"vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n"
+	 { "vinteger2d_t_reserve", _wrap_vinteger2d_t_reserve, METH_VARARGS, "vinteger2d_t_reserve(vinteger2d_t self, std::vector< std::vector< int > >::size_type n)"},
+	 { "vinteger2d_t_capacity", _wrap_vinteger2d_t_capacity, METH_O, "vinteger2d_t_capacity(vinteger2d_t self) -> std::vector< std::vector< int > >::size_type"},
+	 { "delete_vinteger2d_t", _wrap_delete_vinteger2d_t, METH_O, "delete_vinteger2d_t(vinteger2d_t self)"},
+	 { "vinteger2d_t_swigregister", vinteger2d_t_swigregister, METH_O, NULL},
+	 { "vinteger2d_t_swiginit", vinteger2d_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_longinteger_t_iterator", _wrap_vector_longinteger_t_iterator, METH_O, "vector_longinteger_t_iterator(vector_longinteger_t self) -> SwigPyIterator"},
+	 { "vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_O, "vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_O, "vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_O, "vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, "vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"},
+	 { "vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, "\n"
+		"vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n"
 		"vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n"
 		""},
-	 { (char *)"vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, (char *)"vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"},
-	 { (char *)"vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< unsigned long >::difference_type i)\n"
+	 { "vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, "vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"},
+	 { "vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___delitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i)\n"
 		"vector_longinteger_t___delitem__(vector_longinteger_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_longinteger_t___getitem__", _wrap_vector_longinteger_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_longinteger_t\n"
+	 { "vector_longinteger_t___getitem__", _wrap_vector_longinteger_t___getitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___getitem__(vector_longinteger_t self, PySliceObject * slice) -> vector_longinteger_t\n"
 		"vector_longinteger_t___getitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i) -> std::vector< unsigned long >::value_type const &\n"
 		""},
-	 { (char *)"vector_longinteger_t___setitem__", _wrap_vector_longinteger_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_longinteger_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_longinteger_t___setitem__", _wrap_vector_longinteger_t___setitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___setitem__(vector_longinteger_t self, PySliceObject * slice, vector_longinteger_t v)\n"
+		"vector_longinteger_t___setitem__(vector_longinteger_t self, PySliceObject * slice)\n"
 		"vector_longinteger_t___setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"},
-	 { (char *)"vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, (char *)"vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_VARARGS, (char *)"vector_longinteger_t_empty(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_VARARGS, (char *)"vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_O, "vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"},
+	 { "vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, "vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_O, "vector_longinteger_t_empty(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_O, "vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, "\n"
 		"vector_longinteger_t_swap(vector_longinteger_t self, vector_longinteger_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_VARARGS, (char *)"vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
-	 { (char *)"vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_VARARGS, (char *)"vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
-	 { (char *)"vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_VARARGS, (char *)"vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
-	 { (char *)"vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_VARARGS, (char *)"vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
-	 { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"},
-	 { (char *)"vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_VARARGS, (char *)"vector_longinteger_t_pop_back(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n"
+	 { "vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_O, "vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
+	 { "vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_O, "vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
+	 { "vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_O, "vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
+	 { "vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_O, "vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
+	 { "vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_O, "vector_longinteger_t_clear(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_O, "vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"},
+	 { "vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_O, "vector_longinteger_t_pop_back(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, "\n"
+		"vector_longinteger_t_erase(vector_longinteger_t self, std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n"
 		"vector_longinteger_t_erase(vector_longinteger_t self, std::vector< unsigned long >::iterator first, std::vector< unsigned long >::iterator last) -> std::vector< unsigned long >::iterator\n"
 		""},
-	 { (char *)"new_vector_longinteger_t", _wrap_new_vector_longinteger_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_longinteger_t", _wrap_new_vector_longinteger_t, METH_VARARGS, "\n"
 		"vector_longinteger_t()\n"
-		"vector_longinteger_t(vector_longinteger_t arg2)\n"
+		"vector_longinteger_t(vector_longinteger_t other)\n"
 		"vector_longinteger_t(std::vector< unsigned long >::size_type size)\n"
 		"new_vector_longinteger_t(std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t\n"
 		""},
-	 { (char *)"vector_longinteger_t_push_back", _wrap_vector_longinteger_t_push_back, METH_VARARGS, (char *)"vector_longinteger_t_push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_front", _wrap_vector_longinteger_t_front, METH_VARARGS, (char *)"vector_longinteger_t_front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
-	 { (char *)"vector_longinteger_t_back", _wrap_vector_longinteger_t_back, METH_VARARGS, (char *)"vector_longinteger_t_back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
-	 { (char *)"vector_longinteger_t_assign", _wrap_vector_longinteger_t_assign, METH_VARARGS, (char *)"vector_longinteger_t_assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_resize", _wrap_vector_longinteger_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< unsigned long >::size_type new_size)\n"
+	 { "vector_longinteger_t_push_back", _wrap_vector_longinteger_t_push_back, METH_VARARGS, "vector_longinteger_t_push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_front", _wrap_vector_longinteger_t_front, METH_O, "vector_longinteger_t_front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
+	 { "vector_longinteger_t_back", _wrap_vector_longinteger_t_back, METH_O, "vector_longinteger_t_back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
+	 { "vector_longinteger_t_assign", _wrap_vector_longinteger_t_assign, METH_VARARGS, "vector_longinteger_t_assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_resize", _wrap_vector_longinteger_t_resize, METH_VARARGS, "\n"
+		"vector_longinteger_t_resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size)\n"
 		"vector_longinteger_t_resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_insert", _wrap_vector_longinteger_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator\n"
+	 { "vector_longinteger_t_insert", _wrap_vector_longinteger_t_insert, METH_VARARGS, "\n"
+		"vector_longinteger_t_insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator\n"
 		"vector_longinteger_t_insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_reserve", _wrap_vector_longinteger_t_reserve, METH_VARARGS, (char *)"vector_longinteger_t_reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"},
-	 { (char *)"vector_longinteger_t_capacity", _wrap_vector_longinteger_t_capacity, METH_VARARGS, (char *)"vector_longinteger_t_capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"delete_vector_longinteger_t", _wrap_delete_vector_longinteger_t, METH_VARARGS, (char *)"delete_vector_longinteger_t(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_swigregister", vector_longinteger_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_complex_t_iterator", _wrap_vector_complex_t_iterator, METH_VARARGS, (char *)"vector_complex_t_iterator(vector_complex_t self) -> SwigPyIterator"},
-	 { (char *)"vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_VARARGS, (char *)"vector_complex_t___nonzero__(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_VARARGS, (char *)"vector_complex_t___bool__(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_VARARGS, (char *)"vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, (char *)"vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"},
-	 { (char *)"vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n"
+	 { "vector_longinteger_t_reserve", _wrap_vector_longinteger_t_reserve, METH_VARARGS, "vector_longinteger_t_reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"},
+	 { "vector_longinteger_t_capacity", _wrap_vector_longinteger_t_capacity, METH_O, "vector_longinteger_t_capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "delete_vector_longinteger_t", _wrap_delete_vector_longinteger_t, METH_O, "delete_vector_longinteger_t(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_swigregister", vector_longinteger_t_swigregister, METH_O, NULL},
+	 { "vector_longinteger_t_swiginit", vector_longinteger_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_complex_t_iterator", _wrap_vector_complex_t_iterator, METH_O, "vector_complex_t_iterator(vector_complex_t self) -> SwigPyIterator"},
+	 { "vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_O, "vector_complex_t___nonzero__(vector_complex_t self) -> bool"},
+	 { "vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_O, "vector_complex_t___bool__(vector_complex_t self) -> bool"},
+	 { "vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_O, "vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, "vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"},
+	 { "vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, "\n"
+		"vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n"
 		"vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n"
 		""},
-	 { (char *)"vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, (char *)"vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"},
-	 { (char *)"vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::complex< double > >::difference_type i)\n"
+	 { "vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, "vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"},
+	 { "vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, "\n"
+		"vector_complex_t___delitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i)\n"
 		"vector_complex_t___delitem__(vector_complex_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_complex_t___getitem__", _wrap_vector_complex_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_complex_t\n"
+	 { "vector_complex_t___getitem__", _wrap_vector_complex_t___getitem__, METH_VARARGS, "\n"
+		"vector_complex_t___getitem__(vector_complex_t self, PySliceObject * slice) -> vector_complex_t\n"
 		"vector_complex_t___getitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i) -> std::vector< std::complex< double > >::value_type const &\n"
 		""},
-	 { (char *)"vector_complex_t___setitem__", _wrap_vector_complex_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_complex_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_complex_t___setitem__", _wrap_vector_complex_t___setitem__, METH_VARARGS, "\n"
+		"vector_complex_t___setitem__(vector_complex_t self, PySliceObject * slice, vector_complex_t v)\n"
+		"vector_complex_t___setitem__(vector_complex_t self, PySliceObject * slice)\n"
 		"vector_complex_t___setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"},
-	 { (char *)"vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, (char *)"vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_VARARGS, (char *)"vector_complex_t_empty(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t_size", _wrap_vector_complex_t_size, METH_VARARGS, (char *)"vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_O, "vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"},
+	 { "vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, "vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_O, "vector_complex_t_empty(vector_complex_t self) -> bool"},
+	 { "vector_complex_t_size", _wrap_vector_complex_t_size, METH_O, "vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, "\n"
 		"vector_complex_t_swap(vector_complex_t self, vector_complex_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_VARARGS, (char *)"vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
-	 { (char *)"vector_complex_t_end", _wrap_vector_complex_t_end, METH_VARARGS, (char *)"vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
-	 { (char *)"vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_VARARGS, (char *)"vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
-	 { (char *)"vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_VARARGS, (char *)"vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
-	 { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"},
-	 { (char *)"vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_VARARGS, (char *)"vector_complex_t_pop_back(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n"
+	 { "vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_O, "vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
+	 { "vector_complex_t_end", _wrap_vector_complex_t_end, METH_O, "vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
+	 { "vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_O, "vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
+	 { "vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_O, "vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
+	 { "vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_O, "vector_complex_t_clear(vector_complex_t self)"},
+	 { "vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_O, "vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"},
+	 { "vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_O, "vector_complex_t_pop_back(vector_complex_t self)"},
+	 { "vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, "\n"
+		"vector_complex_t_erase(vector_complex_t self, std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n"
 		"vector_complex_t_erase(vector_complex_t self, std::vector< std::complex< double > >::iterator first, std::vector< std::complex< double > >::iterator last) -> std::vector< std::complex< double > >::iterator\n"
 		""},
-	 { (char *)"new_vector_complex_t", _wrap_new_vector_complex_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_complex_t", _wrap_new_vector_complex_t, METH_VARARGS, "\n"
 		"vector_complex_t()\n"
-		"vector_complex_t(vector_complex_t arg2)\n"
+		"vector_complex_t(vector_complex_t other)\n"
 		"vector_complex_t(std::vector< std::complex< double > >::size_type size)\n"
 		"new_vector_complex_t(std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t\n"
 		""},
-	 { (char *)"vector_complex_t_push_back", _wrap_vector_complex_t_push_back, METH_VARARGS, (char *)"vector_complex_t_push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_front", _wrap_vector_complex_t_front, METH_VARARGS, (char *)"vector_complex_t_front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
-	 { (char *)"vector_complex_t_back", _wrap_vector_complex_t_back, METH_VARARGS, (char *)"vector_complex_t_back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
-	 { (char *)"vector_complex_t_assign", _wrap_vector_complex_t_assign, METH_VARARGS, (char *)"vector_complex_t_assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_resize", _wrap_vector_complex_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::complex< double > >::size_type new_size)\n"
+	 { "vector_complex_t_push_back", _wrap_vector_complex_t_push_back, METH_VARARGS, "vector_complex_t_push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_front", _wrap_vector_complex_t_front, METH_O, "vector_complex_t_front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
+	 { "vector_complex_t_back", _wrap_vector_complex_t_back, METH_O, "vector_complex_t_back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
+	 { "vector_complex_t_assign", _wrap_vector_complex_t_assign, METH_VARARGS, "vector_complex_t_assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_resize", _wrap_vector_complex_t_resize, METH_VARARGS, "\n"
+		"vector_complex_t_resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size)\n"
 		"vector_complex_t_resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_insert", _wrap_vector_complex_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator\n"
+	 { "vector_complex_t_insert", _wrap_vector_complex_t_insert, METH_VARARGS, "\n"
+		"vector_complex_t_insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator\n"
 		"vector_complex_t_insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_reserve", _wrap_vector_complex_t_reserve, METH_VARARGS, (char *)"vector_complex_t_reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"},
-	 { (char *)"vector_complex_t_capacity", _wrap_vector_complex_t_capacity, METH_VARARGS, (char *)"vector_complex_t_capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"delete_vector_complex_t", _wrap_delete_vector_complex_t, METH_VARARGS, (char *)"delete_vector_complex_t(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_swigregister", vector_complex_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_string_t_iterator", _wrap_vector_string_t_iterator, METH_VARARGS, (char *)"vector_string_t_iterator(vector_string_t self) -> SwigPyIterator"},
-	 { (char *)"vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_VARARGS, (char *)"vector_string_t___nonzero__(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_VARARGS, (char *)"vector_string_t___bool__(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t___len__", _wrap_vector_string_t___len__, METH_VARARGS, (char *)"vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, (char *)"vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"},
-	 { (char *)"vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n"
+	 { "vector_complex_t_reserve", _wrap_vector_complex_t_reserve, METH_VARARGS, "vector_complex_t_reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"},
+	 { "vector_complex_t_capacity", _wrap_vector_complex_t_capacity, METH_O, "vector_complex_t_capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "delete_vector_complex_t", _wrap_delete_vector_complex_t, METH_O, "delete_vector_complex_t(vector_complex_t self)"},
+	 { "vector_complex_t_swigregister", vector_complex_t_swigregister, METH_O, NULL},
+	 { "vector_complex_t_swiginit", vector_complex_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_string_t_iterator", _wrap_vector_string_t_iterator, METH_O, "vector_string_t_iterator(vector_string_t self) -> SwigPyIterator"},
+	 { "vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_O, "vector_string_t___nonzero__(vector_string_t self) -> bool"},
+	 { "vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_O, "vector_string_t___bool__(vector_string_t self) -> bool"},
+	 { "vector_string_t___len__", _wrap_vector_string_t___len__, METH_O, "vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, "vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"},
+	 { "vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, "\n"
+		"vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n"
 		"vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n"
 		""},
-	 { (char *)"vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, (char *)"vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"},
-	 { (char *)"vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::string >::difference_type i)\n"
+	 { "vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, "vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"},
+	 { "vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, "\n"
+		"vector_string_t___delitem__(vector_string_t self, std::vector< std::string >::difference_type i)\n"
 		"vector_string_t___delitem__(vector_string_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_string_t___getitem__", _wrap_vector_string_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_string_t\n"
+	 { "vector_string_t___getitem__", _wrap_vector_string_t___getitem__, METH_VARARGS, "\n"
+		"vector_string_t___getitem__(vector_string_t self, PySliceObject * slice) -> vector_string_t\n"
 		"vector_string_t___getitem__(vector_string_t self, std::vector< std::string >::difference_type i) -> std::vector< std::string >::value_type const &\n"
 		""},
-	 { (char *)"vector_string_t___setitem__", _wrap_vector_string_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_string_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_string_t___setitem__", _wrap_vector_string_t___setitem__, METH_VARARGS, "\n"
+		"vector_string_t___setitem__(vector_string_t self, PySliceObject * slice, vector_string_t v)\n"
+		"vector_string_t___setitem__(vector_string_t self, PySliceObject * slice)\n"
 		"vector_string_t___setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"},
-	 { (char *)"vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, (char *)"vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_empty", _wrap_vector_string_t_empty, METH_VARARGS, (char *)"vector_string_t_empty(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t_size", _wrap_vector_string_t_size, METH_VARARGS, (char *)"vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_string_t_pop", _wrap_vector_string_t_pop, METH_O, "vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"},
+	 { "vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, "vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_empty", _wrap_vector_string_t_empty, METH_O, "vector_string_t_empty(vector_string_t self) -> bool"},
+	 { "vector_string_t_size", _wrap_vector_string_t_size, METH_O, "vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, "\n"
 		"vector_string_t_swap(vector_string_t self, vector_string_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_string_t_begin", _wrap_vector_string_t_begin, METH_VARARGS, (char *)"vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"},
-	 { (char *)"vector_string_t_end", _wrap_vector_string_t_end, METH_VARARGS, (char *)"vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"},
-	 { (char *)"vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_VARARGS, (char *)"vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
-	 { (char *)"vector_string_t_rend", _wrap_vector_string_t_rend, METH_VARARGS, (char *)"vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
-	 { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"},
-	 { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"},
-	 { (char *)"vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_VARARGS, (char *)"vector_string_t_pop_back(vector_string_t self)"},
-	 { (char *)"vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n"
+	 { "vector_string_t_begin", _wrap_vector_string_t_begin, METH_O, "vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"},
+	 { "vector_string_t_end", _wrap_vector_string_t_end, METH_O, "vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"},
+	 { "vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_O, "vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
+	 { "vector_string_t_rend", _wrap_vector_string_t_rend, METH_O, "vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
+	 { "vector_string_t_clear", _wrap_vector_string_t_clear, METH_O, "vector_string_t_clear(vector_string_t self)"},
+	 { "vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_O, "vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"},
+	 { "vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_O, "vector_string_t_pop_back(vector_string_t self)"},
+	 { "vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, "\n"
+		"vector_string_t_erase(vector_string_t self, std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n"
 		"vector_string_t_erase(vector_string_t self, std::vector< std::string >::iterator first, std::vector< std::string >::iterator last) -> std::vector< std::string >::iterator\n"
 		""},
-	 { (char *)"new_vector_string_t", _wrap_new_vector_string_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_string_t", _wrap_new_vector_string_t, METH_VARARGS, "\n"
 		"vector_string_t()\n"
-		"vector_string_t(vector_string_t arg2)\n"
+		"vector_string_t(vector_string_t other)\n"
 		"vector_string_t(std::vector< std::string >::size_type size)\n"
 		"new_vector_string_t(std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t\n"
 		""},
-	 { (char *)"vector_string_t_push_back", _wrap_vector_string_t_push_back, METH_VARARGS, (char *)"vector_string_t_push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_front", _wrap_vector_string_t_front, METH_VARARGS, (char *)"vector_string_t_front(vector_string_t self) -> std::vector< std::string >::value_type const &"},
-	 { (char *)"vector_string_t_back", _wrap_vector_string_t_back, METH_VARARGS, (char *)"vector_string_t_back(vector_string_t self) -> std::vector< std::string >::value_type const &"},
-	 { (char *)"vector_string_t_assign", _wrap_vector_string_t_assign, METH_VARARGS, (char *)"vector_string_t_assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_resize", _wrap_vector_string_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::string >::size_type new_size)\n"
+	 { "vector_string_t_push_back", _wrap_vector_string_t_push_back, METH_VARARGS, "vector_string_t_push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_front", _wrap_vector_string_t_front, METH_O, "vector_string_t_front(vector_string_t self) -> std::vector< std::string >::value_type const &"},
+	 { "vector_string_t_back", _wrap_vector_string_t_back, METH_O, "vector_string_t_back(vector_string_t self) -> std::vector< std::string >::value_type const &"},
+	 { "vector_string_t_assign", _wrap_vector_string_t_assign, METH_VARARGS, "vector_string_t_assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_resize", _wrap_vector_string_t_resize, METH_VARARGS, "\n"
+		"vector_string_t_resize(vector_string_t self, std::vector< std::string >::size_type new_size)\n"
 		"vector_string_t_resize(vector_string_t self, std::vector< std::string >::size_type new_size, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_insert", _wrap_vector_string_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator\n"
+	 { "vector_string_t_insert", _wrap_vector_string_t_insert, METH_VARARGS, "\n"
+		"vector_string_t_insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator\n"
 		"vector_string_t_insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_reserve", _wrap_vector_string_t_reserve, METH_VARARGS, (char *)"vector_string_t_reserve(vector_string_t self, std::vector< std::string >::size_type n)"},
-	 { (char *)"vector_string_t_capacity", _wrap_vector_string_t_capacity, METH_VARARGS, (char *)"vector_string_t_capacity(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"delete_vector_string_t", _wrap_delete_vector_string_t, METH_VARARGS, (char *)"delete_vector_string_t(vector_string_t self)"},
-	 { (char *)"vector_string_t_swigregister", vector_string_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"map_string_double_t_iterator", _wrap_map_string_double_t_iterator, METH_VARARGS, (char *)"map_string_double_t_iterator(map_string_double_t self) -> SwigPyIterator"},
-	 { (char *)"map_string_double_t___nonzero__", _wrap_map_string_double_t___nonzero__, METH_VARARGS, (char *)"map_string_double_t___nonzero__(map_string_double_t self) -> bool"},
-	 { (char *)"map_string_double_t___bool__", _wrap_map_string_double_t___bool__, METH_VARARGS, (char *)"map_string_double_t___bool__(map_string_double_t self) -> bool"},
-	 { (char *)"map_string_double_t___len__", _wrap_map_string_double_t___len__, METH_VARARGS, (char *)"map_string_double_t___len__(map_string_double_t self) -> std::map< std::string,double >::size_type"},
-	 { (char *)"map_string_double_t___getitem__", _wrap_map_string_double_t___getitem__, METH_VARARGS, (char *)"map_string_double_t___getitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> std::map< std::string,double >::mapped_type const &"},
-	 { (char *)"map_string_double_t___delitem__", _wrap_map_string_double_t___delitem__, METH_VARARGS, (char *)"map_string_double_t___delitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)"},
-	 { (char *)"map_string_double_t_has_key", _wrap_map_string_double_t_has_key, METH_VARARGS, (char *)"map_string_double_t_has_key(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"},
-	 { (char *)"map_string_double_t_keys", _wrap_map_string_double_t_keys, METH_VARARGS, (char *)"map_string_double_t_keys(map_string_double_t self) -> PyObject *"},
-	 { (char *)"map_string_double_t_values", _wrap_map_string_double_t_values, METH_VARARGS, (char *)"map_string_double_t_values(map_string_double_t self) -> PyObject *"},
-	 { (char *)"map_string_double_t_items", _wrap_map_string_double_t_items, METH_VARARGS, (char *)"map_string_double_t_items(map_string_double_t self) -> PyObject *"},
-	 { (char *)"map_string_double_t___contains__", _wrap_map_string_double_t___contains__, METH_VARARGS, (char *)"map_string_double_t___contains__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"},
-	 { (char *)"map_string_double_t_key_iterator", _wrap_map_string_double_t_key_iterator, METH_VARARGS, (char *)"map_string_double_t_key_iterator(map_string_double_t self) -> SwigPyIterator"},
-	 { (char *)"map_string_double_t_value_iterator", _wrap_map_string_double_t_value_iterator, METH_VARARGS, (char *)"map_string_double_t_value_iterator(map_string_double_t self) -> SwigPyIterator"},
-	 { (char *)"map_string_double_t___setitem__", _wrap_map_string_double_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(std::map< std::string,double >::key_type const & key)\n"
+	 { "vector_string_t_reserve", _wrap_vector_string_t_reserve, METH_VARARGS, "vector_string_t_reserve(vector_string_t self, std::vector< std::string >::size_type n)"},
+	 { "vector_string_t_capacity", _wrap_vector_string_t_capacity, METH_O, "vector_string_t_capacity(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "delete_vector_string_t", _wrap_delete_vector_string_t, METH_O, "delete_vector_string_t(vector_string_t self)"},
+	 { "vector_string_t_swigregister", vector_string_t_swigregister, METH_O, NULL},
+	 { "vector_string_t_swiginit", vector_string_t_swiginit, METH_VARARGS, NULL},
+	 { "map_string_double_t_iterator", _wrap_map_string_double_t_iterator, METH_O, "map_string_double_t_iterator(map_string_double_t self) -> SwigPyIterator"},
+	 { "map_string_double_t___nonzero__", _wrap_map_string_double_t___nonzero__, METH_O, "map_string_double_t___nonzero__(map_string_double_t self) -> bool"},
+	 { "map_string_double_t___bool__", _wrap_map_string_double_t___bool__, METH_O, "map_string_double_t___bool__(map_string_double_t self) -> bool"},
+	 { "map_string_double_t___len__", _wrap_map_string_double_t___len__, METH_O, "map_string_double_t___len__(map_string_double_t self) -> std::map< std::string,double >::size_type"},
+	 { "map_string_double_t___getitem__", _wrap_map_string_double_t___getitem__, METH_VARARGS, "map_string_double_t___getitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> std::map< std::string,double >::mapped_type const &"},
+	 { "map_string_double_t___delitem__", _wrap_map_string_double_t___delitem__, METH_VARARGS, "map_string_double_t___delitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)"},
+	 { "map_string_double_t_has_key", _wrap_map_string_double_t_has_key, METH_VARARGS, "map_string_double_t_has_key(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"},
+	 { "map_string_double_t_keys", _wrap_map_string_double_t_keys, METH_O, "map_string_double_t_keys(map_string_double_t self) -> PyObject *"},
+	 { "map_string_double_t_values", _wrap_map_string_double_t_values, METH_O, "map_string_double_t_values(map_string_double_t self) -> PyObject *"},
+	 { "map_string_double_t_items", _wrap_map_string_double_t_items, METH_O, "map_string_double_t_items(map_string_double_t self) -> PyObject *"},
+	 { "map_string_double_t___contains__", _wrap_map_string_double_t___contains__, METH_VARARGS, "map_string_double_t___contains__(map_string_double_t self, std::map< std::string,double >::key_type const & key) -> bool"},
+	 { "map_string_double_t_key_iterator", _wrap_map_string_double_t_key_iterator, METH_O, "map_string_double_t_key_iterator(map_string_double_t self) -> SwigPyIterator"},
+	 { "map_string_double_t_value_iterator", _wrap_map_string_double_t_value_iterator, METH_O, "map_string_double_t_value_iterator(map_string_double_t self) -> SwigPyIterator"},
+	 { "map_string_double_t___setitem__", _wrap_map_string_double_t___setitem__, METH_VARARGS, "\n"
+		"map_string_double_t___setitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key)\n"
 		"map_string_double_t___setitem__(map_string_double_t self, std::map< std::string,double >::key_type const & key, std::map< std::string,double >::mapped_type const & x)\n"
 		""},
-	 { (char *)"map_string_double_t_asdict", _wrap_map_string_double_t_asdict, METH_VARARGS, (char *)"map_string_double_t_asdict(map_string_double_t self) -> PyObject *"},
-	 { (char *)"new_map_string_double_t", _wrap_new_map_string_double_t, METH_VARARGS, (char *)"\n"
-		"map_string_double_t(std::less< std::string > const & arg2)\n"
+	 { "map_string_double_t_asdict", _wrap_map_string_double_t_asdict, METH_O, "map_string_double_t_asdict(map_string_double_t self) -> PyObject *"},
+	 { "new_map_string_double_t", _wrap_new_map_string_double_t, METH_VARARGS, "\n"
+		"map_string_double_t(std::less< std::string > const & other)\n"
 		"map_string_double_t()\n"
-		"new_map_string_double_t(map_string_double_t arg2) -> map_string_double_t\n"
+		"new_map_string_double_t(map_string_double_t other) -> map_string_double_t\n"
 		""},
-	 { (char *)"map_string_double_t_empty", _wrap_map_string_double_t_empty, METH_VARARGS, (char *)"map_string_double_t_empty(map_string_double_t self) -> bool"},
-	 { (char *)"map_string_double_t_size", _wrap_map_string_double_t_size, METH_VARARGS, (char *)"map_string_double_t_size(map_string_double_t self) -> std::map< std::string,double >::size_type"},
-	 { (char *)"map_string_double_t_swap", _wrap_map_string_double_t_swap, METH_VARARGS, (char *)"\n"
+	 { "map_string_double_t_empty", _wrap_map_string_double_t_empty, METH_O, "map_string_double_t_empty(map_string_double_t self) -> bool"},
+	 { "map_string_double_t_size", _wrap_map_string_double_t_size, METH_O, "map_string_double_t_size(map_string_double_t self) -> std::map< std::string,double >::size_type"},
+	 { "map_string_double_t_swap", _wrap_map_string_double_t_swap, METH_VARARGS, "\n"
 		"map_string_double_t_swap(map_string_double_t self, map_string_double_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"map_string_double_t_begin", _wrap_map_string_double_t_begin, METH_VARARGS, (char *)"map_string_double_t_begin(map_string_double_t self) -> std::map< std::string,double >::iterator"},
-	 { (char *)"map_string_double_t_end", _wrap_map_string_double_t_end, METH_VARARGS, (char *)"map_string_double_t_end(map_string_double_t self) -> std::map< std::string,double >::iterator"},
-	 { (char *)"map_string_double_t_rbegin", _wrap_map_string_double_t_rbegin, METH_VARARGS, (char *)"map_string_double_t_rbegin(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"},
-	 { (char *)"map_string_double_t_rend", _wrap_map_string_double_t_rend, METH_VARARGS, (char *)"map_string_double_t_rend(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"},
-	 { (char *)"map_string_double_t_clear", _wrap_map_string_double_t_clear, METH_VARARGS, (char *)"map_string_double_t_clear(map_string_double_t self)"},
-	 { (char *)"map_string_double_t_get_allocator", _wrap_map_string_double_t_get_allocator, METH_VARARGS, (char *)"map_string_double_t_get_allocator(map_string_double_t self) -> std::map< std::string,double >::allocator_type"},
-	 { (char *)"map_string_double_t_count", _wrap_map_string_double_t_count, METH_VARARGS, (char *)"map_string_double_t_count(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type"},
-	 { (char *)"map_string_double_t_erase", _wrap_map_string_double_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type\n"
-		"erase(std::map< std::string,double >::iterator position)\n"
+	 { "map_string_double_t_begin", _wrap_map_string_double_t_begin, METH_O, "map_string_double_t_begin(map_string_double_t self) -> std::map< std::string,double >::iterator"},
+	 { "map_string_double_t_end", _wrap_map_string_double_t_end, METH_O, "map_string_double_t_end(map_string_double_t self) -> std::map< std::string,double >::iterator"},
+	 { "map_string_double_t_rbegin", _wrap_map_string_double_t_rbegin, METH_O, "map_string_double_t_rbegin(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"},
+	 { "map_string_double_t_rend", _wrap_map_string_double_t_rend, METH_O, "map_string_double_t_rend(map_string_double_t self) -> std::map< std::string,double >::reverse_iterator"},
+	 { "map_string_double_t_clear", _wrap_map_string_double_t_clear, METH_O, "map_string_double_t_clear(map_string_double_t self)"},
+	 { "map_string_double_t_get_allocator", _wrap_map_string_double_t_get_allocator, METH_O, "map_string_double_t_get_allocator(map_string_double_t self) -> std::map< std::string,double >::allocator_type"},
+	 { "map_string_double_t_count", _wrap_map_string_double_t_count, METH_VARARGS, "map_string_double_t_count(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type"},
+	 { "map_string_double_t_erase", _wrap_map_string_double_t_erase, METH_VARARGS, "\n"
+		"map_string_double_t_erase(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::size_type\n"
+		"map_string_double_t_erase(map_string_double_t self, std::map< std::string,double >::iterator position)\n"
 		"map_string_double_t_erase(map_string_double_t self, std::map< std::string,double >::iterator first, std::map< std::string,double >::iterator last)\n"
 		""},
-	 { (char *)"map_string_double_t_find", _wrap_map_string_double_t_find, METH_VARARGS, (char *)"map_string_double_t_find(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
-	 { (char *)"map_string_double_t_lower_bound", _wrap_map_string_double_t_lower_bound, METH_VARARGS, (char *)"map_string_double_t_lower_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
-	 { (char *)"map_string_double_t_upper_bound", _wrap_map_string_double_t_upper_bound, METH_VARARGS, (char *)"map_string_double_t_upper_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
-	 { (char *)"delete_map_string_double_t", _wrap_delete_map_string_double_t, METH_VARARGS, (char *)"delete_map_string_double_t(map_string_double_t self)"},
-	 { (char *)"map_string_double_t_swigregister", map_string_double_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_pair_double_t", _wrap_new_pair_double_t, METH_VARARGS, (char *)"\n"
+	 { "map_string_double_t_find", _wrap_map_string_double_t_find, METH_VARARGS, "map_string_double_t_find(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
+	 { "map_string_double_t_lower_bound", _wrap_map_string_double_t_lower_bound, METH_VARARGS, "map_string_double_t_lower_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
+	 { "map_string_double_t_upper_bound", _wrap_map_string_double_t_upper_bound, METH_VARARGS, "map_string_double_t_upper_bound(map_string_double_t self, std::map< std::string,double >::key_type const & x) -> std::map< std::string,double >::iterator"},
+	 { "delete_map_string_double_t", _wrap_delete_map_string_double_t, METH_O, "delete_map_string_double_t(map_string_double_t self)"},
+	 { "map_string_double_t_swigregister", map_string_double_t_swigregister, METH_O, NULL},
+	 { "map_string_double_t_swiginit", map_string_double_t_swiginit, METH_VARARGS, NULL},
+	 { "new_pair_double_t", _wrap_new_pair_double_t, METH_VARARGS, "\n"
 		"pair_double_t()\n"
 		"pair_double_t(double first, double second)\n"
-		"new_pair_double_t(pair_double_t p) -> pair_double_t\n"
-		""},
-	 { (char *)"pair_double_t_first_set", _wrap_pair_double_t_first_set, METH_VARARGS, (char *)"pair_double_t_first_set(pair_double_t self, double first)"},
-	 { (char *)"pair_double_t_first_get", _wrap_pair_double_t_first_get, METH_VARARGS, (char *)"pair_double_t_first_get(pair_double_t self) -> double"},
-	 { (char *)"pair_double_t_second_set", _wrap_pair_double_t_second_set, METH_VARARGS, (char *)"pair_double_t_second_set(pair_double_t self, double second)"},
-	 { (char *)"pair_double_t_second_get", _wrap_pair_double_t_second_get, METH_VARARGS, (char *)"pair_double_t_second_get(pair_double_t self) -> double"},
-	 { (char *)"delete_pair_double_t", _wrap_delete_pair_double_t, METH_VARARGS, (char *)"delete_pair_double_t(pair_double_t self)"},
-	 { (char *)"pair_double_t_swigregister", pair_double_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_pair_double_t_iterator", _wrap_vector_pair_double_t_iterator, METH_VARARGS, (char *)"vector_pair_double_t_iterator(vector_pair_double_t self) -> SwigPyIterator"},
-	 { (char *)"vector_pair_double_t___nonzero__", _wrap_vector_pair_double_t___nonzero__, METH_VARARGS, (char *)"vector_pair_double_t___nonzero__(vector_pair_double_t self) -> bool"},
-	 { (char *)"vector_pair_double_t___bool__", _wrap_vector_pair_double_t___bool__, METH_VARARGS, (char *)"vector_pair_double_t___bool__(vector_pair_double_t self) -> bool"},
-	 { (char *)"vector_pair_double_t___len__", _wrap_vector_pair_double_t___len__, METH_VARARGS, (char *)"vector_pair_double_t___len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
-	 { (char *)"vector_pair_double_t___getslice__", _wrap_vector_pair_double_t___getslice__, METH_VARARGS, (char *)"vector_pair_double_t___getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"},
-	 { (char *)"vector_pair_double_t___setslice__", _wrap_vector_pair_double_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)\n"
+		"new_pair_double_t(pair_double_t other) -> pair_double_t\n"
+		""},
+	 { "pair_double_t_first_set", _wrap_pair_double_t_first_set, METH_VARARGS, "pair_double_t_first_set(pair_double_t self, double first)"},
+	 { "pair_double_t_first_get", _wrap_pair_double_t_first_get, METH_O, "pair_double_t_first_get(pair_double_t self) -> double"},
+	 { "pair_double_t_second_set", _wrap_pair_double_t_second_set, METH_VARARGS, "pair_double_t_second_set(pair_double_t self, double second)"},
+	 { "pair_double_t_second_get", _wrap_pair_double_t_second_get, METH_O, "pair_double_t_second_get(pair_double_t self) -> double"},
+	 { "delete_pair_double_t", _wrap_delete_pair_double_t, METH_O, "delete_pair_double_t(pair_double_t self)"},
+	 { "pair_double_t_swigregister", pair_double_t_swigregister, METH_O, NULL},
+	 { "pair_double_t_swiginit", pair_double_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_pair_double_t_iterator", _wrap_vector_pair_double_t_iterator, METH_O, "vector_pair_double_t_iterator(vector_pair_double_t self) -> SwigPyIterator"},
+	 { "vector_pair_double_t___nonzero__", _wrap_vector_pair_double_t___nonzero__, METH_O, "vector_pair_double_t___nonzero__(vector_pair_double_t self) -> bool"},
+	 { "vector_pair_double_t___bool__", _wrap_vector_pair_double_t___bool__, METH_O, "vector_pair_double_t___bool__(vector_pair_double_t self) -> bool"},
+	 { "vector_pair_double_t___len__", _wrap_vector_pair_double_t___len__, METH_O, "vector_pair_double_t___len__(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+	 { "vector_pair_double_t___getslice__", _wrap_vector_pair_double_t___getslice__, METH_VARARGS, "vector_pair_double_t___getslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j) -> vector_pair_double_t"},
+	 { "vector_pair_double_t___setslice__", _wrap_vector_pair_double_t___setslice__, METH_VARARGS, "\n"
+		"vector_pair_double_t___setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)\n"
 		"vector_pair_double_t___setslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j, vector_pair_double_t v)\n"
 		""},
-	 { (char *)"vector_pair_double_t___delslice__", _wrap_vector_pair_double_t___delslice__, METH_VARARGS, (char *)"vector_pair_double_t___delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"},
-	 { (char *)"vector_pair_double_t___delitem__", _wrap_vector_pair_double_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::pair< double,double > >::difference_type i)\n"
+	 { "vector_pair_double_t___delslice__", _wrap_vector_pair_double_t___delslice__, METH_VARARGS, "vector_pair_double_t___delslice__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, std::vector< std::pair< double,double > >::difference_type j)"},
+	 { "vector_pair_double_t___delitem__", _wrap_vector_pair_double_t___delitem__, METH_VARARGS, "\n"
+		"vector_pair_double_t___delitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i)\n"
 		"vector_pair_double_t___delitem__(vector_pair_double_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_pair_double_t___getitem__", _wrap_vector_pair_double_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_pair_double_t\n"
+	 { "vector_pair_double_t___getitem__", _wrap_vector_pair_double_t___getitem__, METH_VARARGS, "\n"
+		"vector_pair_double_t___getitem__(vector_pair_double_t self, PySliceObject * slice) -> vector_pair_double_t\n"
 		"vector_pair_double_t___getitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i) -> pair_double_t\n"
 		""},
-	 { (char *)"vector_pair_double_t___setitem__", _wrap_vector_pair_double_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_pair_double_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_pair_double_t___setitem__", _wrap_vector_pair_double_t___setitem__, METH_VARARGS, "\n"
+		"vector_pair_double_t___setitem__(vector_pair_double_t self, PySliceObject * slice, vector_pair_double_t v)\n"
+		"vector_pair_double_t___setitem__(vector_pair_double_t self, PySliceObject * slice)\n"
 		"vector_pair_double_t___setitem__(vector_pair_double_t self, std::vector< std::pair< double,double > >::difference_type i, pair_double_t x)\n"
 		""},
-	 { (char *)"vector_pair_double_t_pop", _wrap_vector_pair_double_t_pop, METH_VARARGS, (char *)"vector_pair_double_t_pop(vector_pair_double_t self) -> pair_double_t"},
-	 { (char *)"vector_pair_double_t_append", _wrap_vector_pair_double_t_append, METH_VARARGS, (char *)"vector_pair_double_t_append(vector_pair_double_t self, pair_double_t x)"},
-	 { (char *)"vector_pair_double_t_empty", _wrap_vector_pair_double_t_empty, METH_VARARGS, (char *)"vector_pair_double_t_empty(vector_pair_double_t self) -> bool"},
-	 { (char *)"vector_pair_double_t_size", _wrap_vector_pair_double_t_size, METH_VARARGS, (char *)"vector_pair_double_t_size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
-	 { (char *)"vector_pair_double_t_swap", _wrap_vector_pair_double_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_pair_double_t_pop", _wrap_vector_pair_double_t_pop, METH_O, "vector_pair_double_t_pop(vector_pair_double_t self) -> pair_double_t"},
+	 { "vector_pair_double_t_append", _wrap_vector_pair_double_t_append, METH_VARARGS, "vector_pair_double_t_append(vector_pair_double_t self, pair_double_t x)"},
+	 { "vector_pair_double_t_empty", _wrap_vector_pair_double_t_empty, METH_O, "vector_pair_double_t_empty(vector_pair_double_t self) -> bool"},
+	 { "vector_pair_double_t_size", _wrap_vector_pair_double_t_size, METH_O, "vector_pair_double_t_size(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+	 { "vector_pair_double_t_swap", _wrap_vector_pair_double_t_swap, METH_VARARGS, "\n"
 		"vector_pair_double_t_swap(vector_pair_double_t self, vector_pair_double_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_pair_double_t_begin", _wrap_vector_pair_double_t_begin, METH_VARARGS, (char *)"vector_pair_double_t_begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
-	 { (char *)"vector_pair_double_t_end", _wrap_vector_pair_double_t_end, METH_VARARGS, (char *)"vector_pair_double_t_end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
-	 { (char *)"vector_pair_double_t_rbegin", _wrap_vector_pair_double_t_rbegin, METH_VARARGS, (char *)"vector_pair_double_t_rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
-	 { (char *)"vector_pair_double_t_rend", _wrap_vector_pair_double_t_rend, METH_VARARGS, (char *)"vector_pair_double_t_rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
-	 { (char *)"vector_pair_double_t_clear", _wrap_vector_pair_double_t_clear, METH_VARARGS, (char *)"vector_pair_double_t_clear(vector_pair_double_t self)"},
-	 { (char *)"vector_pair_double_t_get_allocator", _wrap_vector_pair_double_t_get_allocator, METH_VARARGS, (char *)"vector_pair_double_t_get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"},
-	 { (char *)"vector_pair_double_t_pop_back", _wrap_vector_pair_double_t_pop_back, METH_VARARGS, (char *)"vector_pair_double_t_pop_back(vector_pair_double_t self)"},
-	 { (char *)"vector_pair_double_t_erase", _wrap_vector_pair_double_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator\n"
+	 { "vector_pair_double_t_begin", _wrap_vector_pair_double_t_begin, METH_O, "vector_pair_double_t_begin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
+	 { "vector_pair_double_t_end", _wrap_vector_pair_double_t_end, METH_O, "vector_pair_double_t_end(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::iterator"},
+	 { "vector_pair_double_t_rbegin", _wrap_vector_pair_double_t_rbegin, METH_O, "vector_pair_double_t_rbegin(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
+	 { "vector_pair_double_t_rend", _wrap_vector_pair_double_t_rend, METH_O, "vector_pair_double_t_rend(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::reverse_iterator"},
+	 { "vector_pair_double_t_clear", _wrap_vector_pair_double_t_clear, METH_O, "vector_pair_double_t_clear(vector_pair_double_t self)"},
+	 { "vector_pair_double_t_get_allocator", _wrap_vector_pair_double_t_get_allocator, METH_O, "vector_pair_double_t_get_allocator(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::allocator_type"},
+	 { "vector_pair_double_t_pop_back", _wrap_vector_pair_double_t_pop_back, METH_O, "vector_pair_double_t_pop_back(vector_pair_double_t self)"},
+	 { "vector_pair_double_t_erase", _wrap_vector_pair_double_t_erase, METH_VARARGS, "\n"
+		"vector_pair_double_t_erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos) -> std::vector< std::pair< double,double > >::iterator\n"
 		"vector_pair_double_t_erase(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator first, std::vector< std::pair< double,double > >::iterator last) -> std::vector< std::pair< double,double > >::iterator\n"
 		""},
-	 { (char *)"new_vector_pair_double_t", _wrap_new_vector_pair_double_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_pair_double_t", _wrap_new_vector_pair_double_t, METH_VARARGS, "\n"
 		"vector_pair_double_t()\n"
-		"vector_pair_double_t(vector_pair_double_t arg2)\n"
+		"vector_pair_double_t(vector_pair_double_t other)\n"
 		"vector_pair_double_t(std::vector< std::pair< double,double > >::size_type size)\n"
 		"new_vector_pair_double_t(std::vector< std::pair< double,double > >::size_type size, pair_double_t value) -> vector_pair_double_t\n"
 		""},
-	 { (char *)"vector_pair_double_t_push_back", _wrap_vector_pair_double_t_push_back, METH_VARARGS, (char *)"vector_pair_double_t_push_back(vector_pair_double_t self, pair_double_t x)"},
-	 { (char *)"vector_pair_double_t_front", _wrap_vector_pair_double_t_front, METH_VARARGS, (char *)"vector_pair_double_t_front(vector_pair_double_t self) -> pair_double_t"},
-	 { (char *)"vector_pair_double_t_back", _wrap_vector_pair_double_t_back, METH_VARARGS, (char *)"vector_pair_double_t_back(vector_pair_double_t self) -> pair_double_t"},
-	 { (char *)"vector_pair_double_t_assign", _wrap_vector_pair_double_t_assign, METH_VARARGS, (char *)"vector_pair_double_t_assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"},
-	 { (char *)"vector_pair_double_t_resize", _wrap_vector_pair_double_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::pair< double,double > >::size_type new_size)\n"
+	 { "vector_pair_double_t_push_back", _wrap_vector_pair_double_t_push_back, METH_VARARGS, "vector_pair_double_t_push_back(vector_pair_double_t self, pair_double_t x)"},
+	 { "vector_pair_double_t_front", _wrap_vector_pair_double_t_front, METH_O, "vector_pair_double_t_front(vector_pair_double_t self) -> pair_double_t"},
+	 { "vector_pair_double_t_back", _wrap_vector_pair_double_t_back, METH_O, "vector_pair_double_t_back(vector_pair_double_t self) -> pair_double_t"},
+	 { "vector_pair_double_t_assign", _wrap_vector_pair_double_t_assign, METH_VARARGS, "vector_pair_double_t_assign(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)"},
+	 { "vector_pair_double_t_resize", _wrap_vector_pair_double_t_resize, METH_VARARGS, "\n"
+		"vector_pair_double_t_resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size)\n"
 		"vector_pair_double_t_resize(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type new_size, pair_double_t x)\n"
 		""},
-	 { (char *)"vector_pair_double_t_insert", _wrap_vector_pair_double_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::pair< double,double > >::iterator pos, pair_double_t x) -> std::vector< std::pair< double,double > >::iterator\n"
+	 { "vector_pair_double_t_insert", _wrap_vector_pair_double_t_insert, METH_VARARGS, "\n"
+		"vector_pair_double_t_insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, pair_double_t x) -> std::vector< std::pair< double,double > >::iterator\n"
 		"vector_pair_double_t_insert(vector_pair_double_t self, std::vector< std::pair< double,double > >::iterator pos, std::vector< std::pair< double,double > >::size_type n, pair_double_t x)\n"
 		""},
-	 { (char *)"vector_pair_double_t_reserve", _wrap_vector_pair_double_t_reserve, METH_VARARGS, (char *)"vector_pair_double_t_reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"},
-	 { (char *)"vector_pair_double_t_capacity", _wrap_vector_pair_double_t_capacity, METH_VARARGS, (char *)"vector_pair_double_t_capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
-	 { (char *)"delete_vector_pair_double_t", _wrap_delete_vector_pair_double_t, METH_VARARGS, (char *)"delete_vector_pair_double_t(vector_pair_double_t self)"},
-	 { (char *)"vector_pair_double_t_swigregister", vector_pair_double_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GetMajorVersionNumber", _wrap_GetMajorVersionNumber, METH_VARARGS, (char *)"GetMajorVersionNumber() -> int"},
-	 { (char *)"GetMinorVersionNumber", _wrap_GetMinorVersionNumber, METH_VARARGS, (char *)"GetMinorVersionNumber() -> int"},
-	 { (char *)"GetPatchVersionNumber", _wrap_GetPatchVersionNumber, METH_VARARGS, (char *)"GetPatchVersionNumber() -> int"},
-	 { (char *)"GetName", _wrap_GetName, METH_VARARGS, (char *)"GetName() -> std::string"},
-	 { (char *)"GetVersionNumber", _wrap_GetVersionNumber, METH_VARARGS, (char *)"GetVersionNumber() -> std::string"},
-	 { (char *)"vecOfLambdaAlphaPhi", _wrap_vecOfLambdaAlphaPhi, METH_VARARGS, (char *)"\n"
+	 { "vector_pair_double_t_reserve", _wrap_vector_pair_double_t_reserve, METH_VARARGS, "vector_pair_double_t_reserve(vector_pair_double_t self, std::vector< std::pair< double,double > >::size_type n)"},
+	 { "vector_pair_double_t_capacity", _wrap_vector_pair_double_t_capacity, METH_O, "vector_pair_double_t_capacity(vector_pair_double_t self) -> std::vector< std::pair< double,double > >::size_type"},
+	 { "delete_vector_pair_double_t", _wrap_delete_vector_pair_double_t, METH_O, "delete_vector_pair_double_t(vector_pair_double_t self)"},
+	 { "vector_pair_double_t_swigregister", vector_pair_double_t_swigregister, METH_O, NULL},
+	 { "vector_pair_double_t_swiginit", vector_pair_double_t_swiginit, METH_VARARGS, NULL},
+	 { "GetMajorVersionNumber", _wrap_GetMajorVersionNumber, METH_NOARGS, "GetMajorVersionNumber() -> int"},
+	 { "GetMinorVersionNumber", _wrap_GetMinorVersionNumber, METH_NOARGS, "GetMinorVersionNumber() -> int"},
+	 { "GetPatchVersionNumber", _wrap_GetPatchVersionNumber, METH_NOARGS, "GetPatchVersionNumber() -> int"},
+	 { "GetName", _wrap_GetName, METH_NOARGS, "GetName() -> std::string"},
+	 { "GetVersionNumber", _wrap_GetVersionNumber, METH_NOARGS, "GetVersionNumber() -> std::string"},
+	 { "vecOfLambdaAlphaPhi", _wrap_vecOfLambdaAlphaPhi, METH_VARARGS, "\n"
 		"vecOfLambdaAlphaPhi(double _lambda, double _alpha, double _phi) -> kvector_t\n"
-		"\n"
 		"BA_CORE_API_ BasicVector3D<double> vecOfLambdaAlphaPhi(double _lambda, double _alpha, double _phi)\n"
 		"\n"
 		"Creates a vector<double> as a wavevector with given wavelength and angles. Specifically needed for grazing-incidence scattering. \n"
 		"\n"
 		""},
-	 { (char *)"delete_ICloneable", _wrap_delete_ICloneable, METH_VARARGS, (char *)"\n"
+	 { "delete_ICloneable", _wrap_delete_ICloneable, METH_O, "\n"
 		"delete_ICloneable(ICloneable self)\n"
-		"\n"
 		"ICloneable::~ICloneable()\n"
 		"\n"
 		""},
-	 { (char *)"ICloneable_clone", _wrap_ICloneable_clone, METH_VARARGS, (char *)"\n"
+	 { "ICloneable_clone", _wrap_ICloneable_clone, METH_O, "\n"
 		"ICloneable_clone(ICloneable self) -> ICloneable\n"
-		"\n"
 		"virtual ICloneable* ICloneable::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"ICloneable_transferToCPP", _wrap_ICloneable_transferToCPP, METH_VARARGS, (char *)"ICloneable_transferToCPP(ICloneable self)"},
-	 { (char *)"ICloneable_swigregister", ICloneable_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_INamed", _wrap_new_INamed, METH_VARARGS, (char *)"\n"
+	 { "ICloneable_transferToCPP", _wrap_ICloneable_transferToCPP, METH_O, "ICloneable_transferToCPP(ICloneable self)"},
+	 { "ICloneable_swigregister", ICloneable_swigregister, METH_O, NULL},
+	 { "new_INamed", _wrap_new_INamed, METH_VARARGS, "\n"
 		"INamed()\n"
-		"new_INamed(PyObject * arg2, std::string const & name) -> INamed\n"
-		"\n"
+		"new_INamed(PyObject * _self, std::string const & name) -> INamed\n"
 		"INamed::INamed(const std::string &name)\n"
 		"\n"
 		""},
-	 { (char *)"delete_INamed", _wrap_delete_INamed, METH_VARARGS, (char *)"\n"
+	 { "delete_INamed", _wrap_delete_INamed, METH_O, "\n"
 		"delete_INamed(INamed self)\n"
-		"\n"
 		"INamed::~INamed()\n"
 		"\n"
 		""},
-	 { (char *)"INamed_getName", _wrap_INamed_getName, METH_VARARGS, (char *)"\n"
+	 { "INamed_getName", _wrap_INamed_getName, METH_O, "\n"
 		"INamed_getName(INamed self) -> std::string\n"
-		"\n"
 		"std::string INamed::getName() const\n"
 		"\n"
 		""},
-	 { (char *)"disown_INamed", _wrap_disown_INamed, METH_VARARGS, NULL},
-	 { (char *)"INamed_swigregister", INamed_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IParameterized", _wrap_new_IParameterized, METH_VARARGS, (char *)"\n"
-		"IParameterized(std::string const & name)\n"
-		"IParameterized()\n"
-		"new_IParameterized(PyObject * arg2, IParameterized other) -> IParameterized\n"
-		"\n"
+	 { "disown_INamed", _wrap_disown_INamed, METH_O, NULL},
+	 { "INamed_swigregister", INamed_swigregister, METH_O, NULL},
+	 { "INamed_swiginit", INamed_swiginit, METH_VARARGS, NULL},
+	 { "new_IParameterized", _wrap_new_IParameterized, METH_VARARGS, "\n"
+		"IParameterized(std::string const & name=\"\")\n"
+		"new_IParameterized(PyObject * _self, IParameterized other) -> IParameterized\n"
 		"IParameterized::IParameterized(const IParameterized &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IParameterized", _wrap_delete_IParameterized, METH_VARARGS, (char *)"\n"
+	 { "delete_IParameterized", _wrap_delete_IParameterized, METH_O, "\n"
 		"delete_IParameterized(IParameterized self)\n"
-		"\n"
 		"IParameterized::~IParameterized()\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_parameterPool", _wrap_IParameterized_parameterPool, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_parameterPool", _wrap_IParameterized_parameterPool, METH_O, "\n"
 		"IParameterized_parameterPool(IParameterized self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool* IParameterized::parameterPool() const\n"
 		"\n"
 		"Returns pointer to the parameter pool. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_createParameterTree", _wrap_IParameterized_createParameterTree, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_createParameterTree", _wrap_IParameterized_createParameterTree, METH_O, "\n"
 		"IParameterized_createParameterTree(IParameterized self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool * IParameterized::createParameterTree() const\n"
 		"\n"
 		"Creates new parameter pool, with all local parameters and those of its children. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_parametersToString", _wrap_IParameterized_parametersToString, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_parametersToString", _wrap_IParameterized_parametersToString, METH_O, "\n"
 		"IParameterized_parametersToString(IParameterized self) -> std::string\n"
-		"\n"
 		"std::string IParameterized::parametersToString() const\n"
 		"\n"
 		"Returns multiline string representing available parameters. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_registerParameter", _wrap_IParameterized_registerParameter, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_registerParameter", _wrap_IParameterized_registerParameter, METH_VARARGS, "\n"
 		"IParameterized_registerParameter(IParameterized self, std::string const & name, double * parpointer) -> RealParameter\n"
-		"\n"
 		"RealParameter & IParameterized::registerParameter(const std::string &name, double *parpointer)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_registerVector", _wrap_IParameterized_registerVector, METH_VARARGS, (char *)"\n"
-		"registerVector(std::string const & base_name, kvector_t p_vec, std::string const & units)\n"
-		"IParameterized_registerVector(IParameterized self, std::string const & base_name, kvector_t p_vec)\n"
-		"\n"
+	 { "IParameterized_registerVector", _wrap_IParameterized_registerVector, METH_VARARGS, "\n"
+		"IParameterized_registerVector(IParameterized self, std::string const & base_name, kvector_t p_vec, std::string const & units=BornAgain::UnitsNm)\n"
 		"void IParameterized::registerVector(const std::string &base_name, kvector_t *p_vec, const std::string &units=BornAgain::UnitsNm)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_setParameterValue", _wrap_IParameterized_setParameterValue, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_setParameterValue", _wrap_IParameterized_setParameterValue, METH_VARARGS, "\n"
 		"IParameterized_setParameterValue(IParameterized self, std::string const & name, double value)\n"
-		"\n"
 		"void IParameterized::setParameterValue(const std::string &name, double value)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_setVectorValue", _wrap_IParameterized_setVectorValue, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_setVectorValue", _wrap_IParameterized_setVectorValue, METH_VARARGS, "\n"
 		"IParameterized_setVectorValue(IParameterized self, std::string const & base_name, kvector_t value)\n"
-		"\n"
 		"void IParameterized::setVectorValue(const std::string &base_name, kvector_t value)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_parameter", _wrap_IParameterized_parameter, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_parameter", _wrap_IParameterized_parameter, METH_VARARGS, "\n"
 		"IParameterized_parameter(IParameterized self, std::string const & name) -> RealParameter\n"
-		"\n"
 		"RealParameter * IParameterized::parameter(const std::string &name) const\n"
 		"\n"
 		"Returns parameter with given 'name'. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_onChange", _wrap_IParameterized_onChange, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_onChange", _wrap_IParameterized_onChange, METH_O, "\n"
 		"IParameterized_onChange(IParameterized self)\n"
-		"\n"
 		"virtual void IParameterized::onChange()\n"
 		"\n"
 		"Action to be taken in inherited class when a parameter has changed. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_removeParameter", _wrap_IParameterized_removeParameter, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_removeParameter", _wrap_IParameterized_removeParameter, METH_VARARGS, "\n"
 		"IParameterized_removeParameter(IParameterized self, std::string const & name)\n"
-		"\n"
 		"void IParameterized::removeParameter(const std::string &name)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_removeVector", _wrap_IParameterized_removeVector, METH_VARARGS, (char *)"\n"
+	 { "IParameterized_removeVector", _wrap_IParameterized_removeVector, METH_VARARGS, "\n"
 		"IParameterized_removeVector(IParameterized self, std::string const & base_name)\n"
-		"\n"
 		"void IParameterized::removeVector(const std::string &base_name)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterized_XComponentName", _wrap_IParameterized_XComponentName, METH_VARARGS, (char *)"IParameterized_XComponentName(std::string const & base_name) -> std::string"},
-	 { (char *)"IParameterized_YComponentName", _wrap_IParameterized_YComponentName, METH_VARARGS, (char *)"IParameterized_YComponentName(std::string const & base_name) -> std::string"},
-	 { (char *)"IParameterized_ZComponentName", _wrap_IParameterized_ZComponentName, METH_VARARGS, (char *)"IParameterized_ZComponentName(std::string const & base_name) -> std::string"},
-	 { (char *)"disown_IParameterized", _wrap_disown_IParameterized, METH_VARARGS, NULL},
-	 { (char *)"IParameterized_swigregister", IParameterized_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_INode", _wrap_new_INode, METH_VARARGS, (char *)"\n"
-		"new_INode(PyObject * arg2) -> INode\n"
-		"\n"
+	 { "IParameterized_XComponentName", _wrap_IParameterized_XComponentName, METH_O, "IParameterized_XComponentName(std::string const & base_name) -> std::string"},
+	 { "IParameterized_YComponentName", _wrap_IParameterized_YComponentName, METH_O, "IParameterized_YComponentName(std::string const & base_name) -> std::string"},
+	 { "IParameterized_ZComponentName", _wrap_IParameterized_ZComponentName, METH_O, "IParameterized_ZComponentName(std::string const & base_name) -> std::string"},
+	 { "disown_IParameterized", _wrap_disown_IParameterized, METH_O, NULL},
+	 { "IParameterized_swigregister", IParameterized_swigregister, METH_O, NULL},
+	 { "IParameterized_swiginit", IParameterized_swiginit, METH_VARARGS, NULL},
+	 { "new_INode", _wrap_new_INode, METH_O, "\n"
+		"new_INode(PyObject * _self) -> INode\n"
 		"INode::INode()\n"
 		"\n"
 		""},
-	 { (char *)"delete_INode", _wrap_delete_INode, METH_VARARGS, (char *)"\n"
+	 { "delete_INode", _wrap_delete_INode, METH_O, "\n"
 		"delete_INode(INode self)\n"
-		"\n"
 		"virtual INode::~INode()\n"
 		"\n"
 		""},
-	 { (char *)"INode_accept", _wrap_INode_accept, METH_VARARGS, (char *)"\n"
+	 { "INode_accept", _wrap_INode_accept, METH_VARARGS, "\n"
 		"INode_accept(INode self, INodeVisitor visitor)\n"
-		"\n"
 		"virtual void INode::accept(INodeVisitor *visitor) const =0\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"INode_treeToString", _wrap_INode_treeToString, METH_VARARGS, (char *)"\n"
+	 { "INode_treeToString", _wrap_INode_treeToString, METH_O, "\n"
 		"INode_treeToString(INode self) -> std::string\n"
-		"\n"
 		"std::string INode::treeToString() const\n"
 		"\n"
 		"Returns multiline string representing tree structure below the node. \n"
 		"\n"
 		""},
-	 { (char *)"INode_registerChild", _wrap_INode_registerChild, METH_VARARGS, (char *)"\n"
+	 { "INode_registerChild", _wrap_INode_registerChild, METH_VARARGS, "\n"
 		"INode_registerChild(INode self, INode node)\n"
-		"\n"
 		"void INode::registerChild(INode *node)\n"
 		"\n"
 		""},
-	 { (char *)"INode_getChildren", _wrap_INode_getChildren, METH_VARARGS, (char *)"\n"
+	 { "INode_getChildren", _wrap_INode_getChildren, METH_O, "\n"
 		"INode_getChildren(INode self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > INode::getChildren() const\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"INode_setParent", _wrap_INode_setParent, METH_VARARGS, (char *)"\n"
+	 { "INode_setParent", _wrap_INode_setParent, METH_VARARGS, "\n"
 		"INode_setParent(INode self, INode newParent)\n"
-		"\n"
 		"void INode::setParent(const INode *newParent)\n"
 		"\n"
 		""},
-	 { (char *)"INode_parent", _wrap_INode_parent, METH_VARARGS, (char *)"\n"
-		"parent() -> INode\n"
+	 { "INode_parent", _wrap_INode_parent, METH_VARARGS, "\n"
+		"INode_parent(INode self) -> INode\n"
 		"INode_parent(INode self) -> INode\n"
-		"\n"
 		"INode* INode::parent()\n"
 		"\n"
 		""},
-	 { (char *)"INode_copyNumber", _wrap_INode_copyNumber, METH_VARARGS, (char *)"\n"
+	 { "INode_copyNumber", _wrap_INode_copyNumber, METH_VARARGS, "\n"
 		"INode_copyNumber(INode self, INode node) -> int\n"
-		"\n"
 		"int INode::copyNumber(const INode *node) const\n"
 		"\n"
 		"Returns copyNumber of child, which takes into account existence of children with same name. \n"
 		"\n"
 		""},
-	 { (char *)"INode_displayName", _wrap_INode_displayName, METH_VARARGS, (char *)"\n"
+	 { "INode_displayName", _wrap_INode_displayName, METH_O, "\n"
 		"INode_displayName(INode self) -> std::string\n"
-		"\n"
 		"std::string INode::displayName() const\n"
 		"\n"
 		"Returns display name, composed from the name of node and it's copy number. \n"
 		"\n"
 		""},
-	 { (char *)"INode_createParameterTree", _wrap_INode_createParameterTree, METH_VARARGS, (char *)"\n"
+	 { "INode_createParameterTree", _wrap_INode_createParameterTree, METH_O, "\n"
 		"INode_createParameterTree(INode self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool * INode::createParameterTree() const\n"
 		"\n"
 		"Creates new parameter pool, with all local parameters and those of its children. \n"
 		"\n"
 		""},
-	 { (char *)"disown_INode", _wrap_disown_INode, METH_VARARGS, NULL},
-	 { (char *)"INode_swigregister", INode_swigregister, METH_VARARGS, NULL},
-	 { (char *)"swig_dummy_type_inode_vector_iterator", _wrap_swig_dummy_type_inode_vector_iterator, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_iterator(swig_dummy_type_inode_vector self) -> SwigPyIterator"},
-	 { (char *)"swig_dummy_type_inode_vector___nonzero__", _wrap_swig_dummy_type_inode_vector___nonzero__, METH_VARARGS, (char *)"swig_dummy_type_inode_vector___nonzero__(swig_dummy_type_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_inode_vector___bool__", _wrap_swig_dummy_type_inode_vector___bool__, METH_VARARGS, (char *)"swig_dummy_type_inode_vector___bool__(swig_dummy_type_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_inode_vector___len__", _wrap_swig_dummy_type_inode_vector___len__, METH_VARARGS, (char *)"swig_dummy_type_inode_vector___len__(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
-	 { (char *)"swig_dummy_type_inode_vector___getslice__", _wrap_swig_dummy_type_inode_vector___getslice__, METH_VARARGS, (char *)"swig_dummy_type_inode_vector___getslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j) -> swig_dummy_type_inode_vector"},
-	 { (char *)"swig_dummy_type_inode_vector___setslice__", _wrap_swig_dummy_type_inode_vector___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)\n"
+	 { "disown_INode", _wrap_disown_INode, METH_O, NULL},
+	 { "INode_swigregister", INode_swigregister, METH_O, NULL},
+	 { "INode_swiginit", INode_swiginit, METH_VARARGS, NULL},
+	 { "swig_dummy_type_inode_vector_iterator", _wrap_swig_dummy_type_inode_vector_iterator, METH_O, "swig_dummy_type_inode_vector_iterator(swig_dummy_type_inode_vector self) -> SwigPyIterator"},
+	 { "swig_dummy_type_inode_vector___nonzero__", _wrap_swig_dummy_type_inode_vector___nonzero__, METH_O, "swig_dummy_type_inode_vector___nonzero__(swig_dummy_type_inode_vector self) -> bool"},
+	 { "swig_dummy_type_inode_vector___bool__", _wrap_swig_dummy_type_inode_vector___bool__, METH_O, "swig_dummy_type_inode_vector___bool__(swig_dummy_type_inode_vector self) -> bool"},
+	 { "swig_dummy_type_inode_vector___len__", _wrap_swig_dummy_type_inode_vector___len__, METH_O, "swig_dummy_type_inode_vector___len__(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
+	 { "swig_dummy_type_inode_vector___getslice__", _wrap_swig_dummy_type_inode_vector___getslice__, METH_VARARGS, "swig_dummy_type_inode_vector___getslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j) -> swig_dummy_type_inode_vector"},
+	 { "swig_dummy_type_inode_vector___setslice__", _wrap_swig_dummy_type_inode_vector___setslice__, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector___setslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)\n"
 		"swig_dummy_type_inode_vector___setslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j, swig_dummy_type_inode_vector v)\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector___delslice__", _wrap_swig_dummy_type_inode_vector___delslice__, METH_VARARGS, (char *)"swig_dummy_type_inode_vector___delslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)"},
-	 { (char *)"swig_dummy_type_inode_vector___delitem__", _wrap_swig_dummy_type_inode_vector___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< INode * >::difference_type i)\n"
+	 { "swig_dummy_type_inode_vector___delslice__", _wrap_swig_dummy_type_inode_vector___delslice__, METH_VARARGS, "swig_dummy_type_inode_vector___delslice__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, std::vector< INode * >::difference_type j)"},
+	 { "swig_dummy_type_inode_vector___delitem__", _wrap_swig_dummy_type_inode_vector___delitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector___delitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i)\n"
 		"swig_dummy_type_inode_vector___delitem__(swig_dummy_type_inode_vector self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector___getitem__", _wrap_swig_dummy_type_inode_vector___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> swig_dummy_type_inode_vector\n"
+	 { "swig_dummy_type_inode_vector___getitem__", _wrap_swig_dummy_type_inode_vector___getitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector___getitem__(swig_dummy_type_inode_vector self, PySliceObject * slice) -> swig_dummy_type_inode_vector\n"
 		"swig_dummy_type_inode_vector___getitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i) -> INode\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector___setitem__", _wrap_swig_dummy_type_inode_vector___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, swig_dummy_type_inode_vector v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "swig_dummy_type_inode_vector___setitem__", _wrap_swig_dummy_type_inode_vector___setitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector___setitem__(swig_dummy_type_inode_vector self, PySliceObject * slice, swig_dummy_type_inode_vector v)\n"
+		"swig_dummy_type_inode_vector___setitem__(swig_dummy_type_inode_vector self, PySliceObject * slice)\n"
 		"swig_dummy_type_inode_vector___setitem__(swig_dummy_type_inode_vector self, std::vector< INode * >::difference_type i, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector_pop", _wrap_swig_dummy_type_inode_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_pop(swig_dummy_type_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_inode_vector_append", _wrap_swig_dummy_type_inode_vector_append, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_append(swig_dummy_type_inode_vector self, INode x)"},
-	 { (char *)"swig_dummy_type_inode_vector_empty", _wrap_swig_dummy_type_inode_vector_empty, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_empty(swig_dummy_type_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_inode_vector_size", _wrap_swig_dummy_type_inode_vector_size, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_size(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
-	 { (char *)"swig_dummy_type_inode_vector_swap", _wrap_swig_dummy_type_inode_vector_swap, METH_VARARGS, (char *)"\n"
+	 { "swig_dummy_type_inode_vector_pop", _wrap_swig_dummy_type_inode_vector_pop, METH_O, "swig_dummy_type_inode_vector_pop(swig_dummy_type_inode_vector self) -> INode"},
+	 { "swig_dummy_type_inode_vector_append", _wrap_swig_dummy_type_inode_vector_append, METH_VARARGS, "swig_dummy_type_inode_vector_append(swig_dummy_type_inode_vector self, INode x)"},
+	 { "swig_dummy_type_inode_vector_empty", _wrap_swig_dummy_type_inode_vector_empty, METH_O, "swig_dummy_type_inode_vector_empty(swig_dummy_type_inode_vector self) -> bool"},
+	 { "swig_dummy_type_inode_vector_size", _wrap_swig_dummy_type_inode_vector_size, METH_O, "swig_dummy_type_inode_vector_size(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
+	 { "swig_dummy_type_inode_vector_swap", _wrap_swig_dummy_type_inode_vector_swap, METH_VARARGS, "\n"
 		"swig_dummy_type_inode_vector_swap(swig_dummy_type_inode_vector self, swig_dummy_type_inode_vector v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector_begin", _wrap_swig_dummy_type_inode_vector_begin, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_begin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"},
-	 { (char *)"swig_dummy_type_inode_vector_end", _wrap_swig_dummy_type_inode_vector_end, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_end(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"},
-	 { (char *)"swig_dummy_type_inode_vector_rbegin", _wrap_swig_dummy_type_inode_vector_rbegin, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_rbegin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_inode_vector_rend", _wrap_swig_dummy_type_inode_vector_rend, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_rend(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_inode_vector_clear", _wrap_swig_dummy_type_inode_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_clear(swig_dummy_type_inode_vector self)"},
-	 { (char *)"swig_dummy_type_inode_vector_get_allocator", _wrap_swig_dummy_type_inode_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_get_allocator(swig_dummy_type_inode_vector self) -> std::vector< INode * >::allocator_type"},
-	 { (char *)"swig_dummy_type_inode_vector_pop_back", _wrap_swig_dummy_type_inode_vector_pop_back, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_pop_back(swig_dummy_type_inode_vector self)"},
-	 { (char *)"swig_dummy_type_inode_vector_erase", _wrap_swig_dummy_type_inode_vector_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< INode * >::iterator pos) -> std::vector< INode * >::iterator\n"
+	 { "swig_dummy_type_inode_vector_begin", _wrap_swig_dummy_type_inode_vector_begin, METH_O, "swig_dummy_type_inode_vector_begin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"},
+	 { "swig_dummy_type_inode_vector_end", _wrap_swig_dummy_type_inode_vector_end, METH_O, "swig_dummy_type_inode_vector_end(swig_dummy_type_inode_vector self) -> std::vector< INode * >::iterator"},
+	 { "swig_dummy_type_inode_vector_rbegin", _wrap_swig_dummy_type_inode_vector_rbegin, METH_O, "swig_dummy_type_inode_vector_rbegin(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"},
+	 { "swig_dummy_type_inode_vector_rend", _wrap_swig_dummy_type_inode_vector_rend, METH_O, "swig_dummy_type_inode_vector_rend(swig_dummy_type_inode_vector self) -> std::vector< INode * >::reverse_iterator"},
+	 { "swig_dummy_type_inode_vector_clear", _wrap_swig_dummy_type_inode_vector_clear, METH_O, "swig_dummy_type_inode_vector_clear(swig_dummy_type_inode_vector self)"},
+	 { "swig_dummy_type_inode_vector_get_allocator", _wrap_swig_dummy_type_inode_vector_get_allocator, METH_O, "swig_dummy_type_inode_vector_get_allocator(swig_dummy_type_inode_vector self) -> std::vector< INode * >::allocator_type"},
+	 { "swig_dummy_type_inode_vector_pop_back", _wrap_swig_dummy_type_inode_vector_pop_back, METH_O, "swig_dummy_type_inode_vector_pop_back(swig_dummy_type_inode_vector self)"},
+	 { "swig_dummy_type_inode_vector_erase", _wrap_swig_dummy_type_inode_vector_erase, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector_erase(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos) -> std::vector< INode * >::iterator\n"
 		"swig_dummy_type_inode_vector_erase(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator first, std::vector< INode * >::iterator last) -> std::vector< INode * >::iterator\n"
 		""},
-	 { (char *)"new_swig_dummy_type_inode_vector", _wrap_new_swig_dummy_type_inode_vector, METH_VARARGS, (char *)"\n"
+	 { "new_swig_dummy_type_inode_vector", _wrap_new_swig_dummy_type_inode_vector, METH_VARARGS, "\n"
 		"swig_dummy_type_inode_vector()\n"
-		"swig_dummy_type_inode_vector(swig_dummy_type_inode_vector arg2)\n"
+		"swig_dummy_type_inode_vector(swig_dummy_type_inode_vector other)\n"
 		"swig_dummy_type_inode_vector(std::vector< INode * >::size_type size)\n"
 		"new_swig_dummy_type_inode_vector(std::vector< INode * >::size_type size, INode value) -> swig_dummy_type_inode_vector\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector_push_back", _wrap_swig_dummy_type_inode_vector_push_back, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_push_back(swig_dummy_type_inode_vector self, INode x)"},
-	 { (char *)"swig_dummy_type_inode_vector_front", _wrap_swig_dummy_type_inode_vector_front, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_front(swig_dummy_type_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_inode_vector_back", _wrap_swig_dummy_type_inode_vector_back, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_back(swig_dummy_type_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_inode_vector_assign", _wrap_swig_dummy_type_inode_vector_assign, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_assign(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n, INode x)"},
-	 { (char *)"swig_dummy_type_inode_vector_resize", _wrap_swig_dummy_type_inode_vector_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< INode * >::size_type new_size)\n"
+	 { "swig_dummy_type_inode_vector_push_back", _wrap_swig_dummy_type_inode_vector_push_back, METH_VARARGS, "swig_dummy_type_inode_vector_push_back(swig_dummy_type_inode_vector self, INode x)"},
+	 { "swig_dummy_type_inode_vector_front", _wrap_swig_dummy_type_inode_vector_front, METH_O, "swig_dummy_type_inode_vector_front(swig_dummy_type_inode_vector self) -> INode"},
+	 { "swig_dummy_type_inode_vector_back", _wrap_swig_dummy_type_inode_vector_back, METH_O, "swig_dummy_type_inode_vector_back(swig_dummy_type_inode_vector self) -> INode"},
+	 { "swig_dummy_type_inode_vector_assign", _wrap_swig_dummy_type_inode_vector_assign, METH_VARARGS, "swig_dummy_type_inode_vector_assign(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n, INode x)"},
+	 { "swig_dummy_type_inode_vector_resize", _wrap_swig_dummy_type_inode_vector_resize, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector_resize(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type new_size)\n"
 		"swig_dummy_type_inode_vector_resize(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type new_size, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector_insert", _wrap_swig_dummy_type_inode_vector_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< INode * >::iterator pos, INode x) -> std::vector< INode * >::iterator\n"
+	 { "swig_dummy_type_inode_vector_insert", _wrap_swig_dummy_type_inode_vector_insert, METH_VARARGS, "\n"
+		"swig_dummy_type_inode_vector_insert(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos, INode x) -> std::vector< INode * >::iterator\n"
 		"swig_dummy_type_inode_vector_insert(swig_dummy_type_inode_vector self, std::vector< INode * >::iterator pos, std::vector< INode * >::size_type n, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_inode_vector_reserve", _wrap_swig_dummy_type_inode_vector_reserve, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_reserve(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n)"},
-	 { (char *)"swig_dummy_type_inode_vector_capacity", _wrap_swig_dummy_type_inode_vector_capacity, METH_VARARGS, (char *)"swig_dummy_type_inode_vector_capacity(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
-	 { (char *)"delete_swig_dummy_type_inode_vector", _wrap_delete_swig_dummy_type_inode_vector, METH_VARARGS, (char *)"delete_swig_dummy_type_inode_vector(swig_dummy_type_inode_vector self)"},
-	 { (char *)"swig_dummy_type_inode_vector_swigregister", swig_dummy_type_inode_vector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"swig_dummy_type_const_inode_vector_iterator", _wrap_swig_dummy_type_const_inode_vector_iterator, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_iterator(swig_dummy_type_const_inode_vector self) -> SwigPyIterator"},
-	 { (char *)"swig_dummy_type_const_inode_vector___nonzero__", _wrap_swig_dummy_type_const_inode_vector___nonzero__, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector___nonzero__(swig_dummy_type_const_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_const_inode_vector___bool__", _wrap_swig_dummy_type_const_inode_vector___bool__, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector___bool__(swig_dummy_type_const_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_const_inode_vector___len__", _wrap_swig_dummy_type_const_inode_vector___len__, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector___len__(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
-	 { (char *)"swig_dummy_type_const_inode_vector___getslice__", _wrap_swig_dummy_type_const_inode_vector___getslice__, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector___getslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j) -> swig_dummy_type_const_inode_vector"},
-	 { (char *)"swig_dummy_type_const_inode_vector___setslice__", _wrap_swig_dummy_type_const_inode_vector___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)\n"
+	 { "swig_dummy_type_inode_vector_reserve", _wrap_swig_dummy_type_inode_vector_reserve, METH_VARARGS, "swig_dummy_type_inode_vector_reserve(swig_dummy_type_inode_vector self, std::vector< INode * >::size_type n)"},
+	 { "swig_dummy_type_inode_vector_capacity", _wrap_swig_dummy_type_inode_vector_capacity, METH_O, "swig_dummy_type_inode_vector_capacity(swig_dummy_type_inode_vector self) -> std::vector< INode * >::size_type"},
+	 { "delete_swig_dummy_type_inode_vector", _wrap_delete_swig_dummy_type_inode_vector, METH_O, "delete_swig_dummy_type_inode_vector(swig_dummy_type_inode_vector self)"},
+	 { "swig_dummy_type_inode_vector_swigregister", swig_dummy_type_inode_vector_swigregister, METH_O, NULL},
+	 { "swig_dummy_type_inode_vector_swiginit", swig_dummy_type_inode_vector_swiginit, METH_VARARGS, NULL},
+	 { "swig_dummy_type_const_inode_vector_iterator", _wrap_swig_dummy_type_const_inode_vector_iterator, METH_O, "swig_dummy_type_const_inode_vector_iterator(swig_dummy_type_const_inode_vector self) -> SwigPyIterator"},
+	 { "swig_dummy_type_const_inode_vector___nonzero__", _wrap_swig_dummy_type_const_inode_vector___nonzero__, METH_O, "swig_dummy_type_const_inode_vector___nonzero__(swig_dummy_type_const_inode_vector self) -> bool"},
+	 { "swig_dummy_type_const_inode_vector___bool__", _wrap_swig_dummy_type_const_inode_vector___bool__, METH_O, "swig_dummy_type_const_inode_vector___bool__(swig_dummy_type_const_inode_vector self) -> bool"},
+	 { "swig_dummy_type_const_inode_vector___len__", _wrap_swig_dummy_type_const_inode_vector___len__, METH_O, "swig_dummy_type_const_inode_vector___len__(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
+	 { "swig_dummy_type_const_inode_vector___getslice__", _wrap_swig_dummy_type_const_inode_vector___getslice__, METH_VARARGS, "swig_dummy_type_const_inode_vector___getslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j) -> swig_dummy_type_const_inode_vector"},
+	 { "swig_dummy_type_const_inode_vector___setslice__", _wrap_swig_dummy_type_const_inode_vector___setslice__, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector___setslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)\n"
 		"swig_dummy_type_const_inode_vector___setslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j, swig_dummy_type_const_inode_vector v)\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector___delslice__", _wrap_swig_dummy_type_const_inode_vector___delslice__, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector___delslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)"},
-	 { (char *)"swig_dummy_type_const_inode_vector___delitem__", _wrap_swig_dummy_type_const_inode_vector___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< INode const * >::difference_type i)\n"
+	 { "swig_dummy_type_const_inode_vector___delslice__", _wrap_swig_dummy_type_const_inode_vector___delslice__, METH_VARARGS, "swig_dummy_type_const_inode_vector___delslice__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, std::vector< INode const * >::difference_type j)"},
+	 { "swig_dummy_type_const_inode_vector___delitem__", _wrap_swig_dummy_type_const_inode_vector___delitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector___delitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i)\n"
 		"swig_dummy_type_const_inode_vector___delitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector___getitem__", _wrap_swig_dummy_type_const_inode_vector___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> swig_dummy_type_const_inode_vector\n"
+	 { "swig_dummy_type_const_inode_vector___getitem__", _wrap_swig_dummy_type_const_inode_vector___getitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector___getitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice) -> swig_dummy_type_const_inode_vector\n"
 		"swig_dummy_type_const_inode_vector___getitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i) -> INode\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector___setitem__", _wrap_swig_dummy_type_const_inode_vector___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, swig_dummy_type_const_inode_vector v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "swig_dummy_type_const_inode_vector___setitem__", _wrap_swig_dummy_type_const_inode_vector___setitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector___setitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice, swig_dummy_type_const_inode_vector v)\n"
+		"swig_dummy_type_const_inode_vector___setitem__(swig_dummy_type_const_inode_vector self, PySliceObject * slice)\n"
 		"swig_dummy_type_const_inode_vector___setitem__(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::difference_type i, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector_pop", _wrap_swig_dummy_type_const_inode_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_pop(swig_dummy_type_const_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_const_inode_vector_append", _wrap_swig_dummy_type_const_inode_vector_append, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_append(swig_dummy_type_const_inode_vector self, INode x)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_empty", _wrap_swig_dummy_type_const_inode_vector_empty, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_empty(swig_dummy_type_const_inode_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_const_inode_vector_size", _wrap_swig_dummy_type_const_inode_vector_size, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_size(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
-	 { (char *)"swig_dummy_type_const_inode_vector_swap", _wrap_swig_dummy_type_const_inode_vector_swap, METH_VARARGS, (char *)"\n"
+	 { "swig_dummy_type_const_inode_vector_pop", _wrap_swig_dummy_type_const_inode_vector_pop, METH_O, "swig_dummy_type_const_inode_vector_pop(swig_dummy_type_const_inode_vector self) -> INode"},
+	 { "swig_dummy_type_const_inode_vector_append", _wrap_swig_dummy_type_const_inode_vector_append, METH_VARARGS, "swig_dummy_type_const_inode_vector_append(swig_dummy_type_const_inode_vector self, INode x)"},
+	 { "swig_dummy_type_const_inode_vector_empty", _wrap_swig_dummy_type_const_inode_vector_empty, METH_O, "swig_dummy_type_const_inode_vector_empty(swig_dummy_type_const_inode_vector self) -> bool"},
+	 { "swig_dummy_type_const_inode_vector_size", _wrap_swig_dummy_type_const_inode_vector_size, METH_O, "swig_dummy_type_const_inode_vector_size(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
+	 { "swig_dummy_type_const_inode_vector_swap", _wrap_swig_dummy_type_const_inode_vector_swap, METH_VARARGS, "\n"
 		"swig_dummy_type_const_inode_vector_swap(swig_dummy_type_const_inode_vector self, swig_dummy_type_const_inode_vector v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector_begin", _wrap_swig_dummy_type_const_inode_vector_begin, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_begin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"},
-	 { (char *)"swig_dummy_type_const_inode_vector_end", _wrap_swig_dummy_type_const_inode_vector_end, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_end(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"},
-	 { (char *)"swig_dummy_type_const_inode_vector_rbegin", _wrap_swig_dummy_type_const_inode_vector_rbegin, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_rbegin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_const_inode_vector_rend", _wrap_swig_dummy_type_const_inode_vector_rend, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_rend(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_const_inode_vector_clear", _wrap_swig_dummy_type_const_inode_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_clear(swig_dummy_type_const_inode_vector self)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_get_allocator", _wrap_swig_dummy_type_const_inode_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_get_allocator(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::allocator_type"},
-	 { (char *)"swig_dummy_type_const_inode_vector_pop_back", _wrap_swig_dummy_type_const_inode_vector_pop_back, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_pop_back(swig_dummy_type_const_inode_vector self)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_erase", _wrap_swig_dummy_type_const_inode_vector_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< INode const * >::iterator pos) -> std::vector< INode const * >::iterator\n"
+	 { "swig_dummy_type_const_inode_vector_begin", _wrap_swig_dummy_type_const_inode_vector_begin, METH_O, "swig_dummy_type_const_inode_vector_begin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"},
+	 { "swig_dummy_type_const_inode_vector_end", _wrap_swig_dummy_type_const_inode_vector_end, METH_O, "swig_dummy_type_const_inode_vector_end(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::iterator"},
+	 { "swig_dummy_type_const_inode_vector_rbegin", _wrap_swig_dummy_type_const_inode_vector_rbegin, METH_O, "swig_dummy_type_const_inode_vector_rbegin(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"},
+	 { "swig_dummy_type_const_inode_vector_rend", _wrap_swig_dummy_type_const_inode_vector_rend, METH_O, "swig_dummy_type_const_inode_vector_rend(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::reverse_iterator"},
+	 { "swig_dummy_type_const_inode_vector_clear", _wrap_swig_dummy_type_const_inode_vector_clear, METH_O, "swig_dummy_type_const_inode_vector_clear(swig_dummy_type_const_inode_vector self)"},
+	 { "swig_dummy_type_const_inode_vector_get_allocator", _wrap_swig_dummy_type_const_inode_vector_get_allocator, METH_O, "swig_dummy_type_const_inode_vector_get_allocator(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::allocator_type"},
+	 { "swig_dummy_type_const_inode_vector_pop_back", _wrap_swig_dummy_type_const_inode_vector_pop_back, METH_O, "swig_dummy_type_const_inode_vector_pop_back(swig_dummy_type_const_inode_vector self)"},
+	 { "swig_dummy_type_const_inode_vector_erase", _wrap_swig_dummy_type_const_inode_vector_erase, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector_erase(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos) -> std::vector< INode const * >::iterator\n"
 		"swig_dummy_type_const_inode_vector_erase(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator first, std::vector< INode const * >::iterator last) -> std::vector< INode const * >::iterator\n"
 		""},
-	 { (char *)"new_swig_dummy_type_const_inode_vector", _wrap_new_swig_dummy_type_const_inode_vector, METH_VARARGS, (char *)"\n"
+	 { "new_swig_dummy_type_const_inode_vector", _wrap_new_swig_dummy_type_const_inode_vector, METH_VARARGS, "\n"
 		"swig_dummy_type_const_inode_vector()\n"
-		"swig_dummy_type_const_inode_vector(swig_dummy_type_const_inode_vector arg2)\n"
+		"swig_dummy_type_const_inode_vector(swig_dummy_type_const_inode_vector other)\n"
 		"swig_dummy_type_const_inode_vector(std::vector< INode const * >::size_type size)\n"
 		"new_swig_dummy_type_const_inode_vector(std::vector< INode const * >::size_type size, INode value) -> swig_dummy_type_const_inode_vector\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector_push_back", _wrap_swig_dummy_type_const_inode_vector_push_back, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_push_back(swig_dummy_type_const_inode_vector self, INode x)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_front", _wrap_swig_dummy_type_const_inode_vector_front, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_front(swig_dummy_type_const_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_const_inode_vector_back", _wrap_swig_dummy_type_const_inode_vector_back, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_back(swig_dummy_type_const_inode_vector self) -> INode"},
-	 { (char *)"swig_dummy_type_const_inode_vector_assign", _wrap_swig_dummy_type_const_inode_vector_assign, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_assign(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n, INode x)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_resize", _wrap_swig_dummy_type_const_inode_vector_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< INode const * >::size_type new_size)\n"
+	 { "swig_dummy_type_const_inode_vector_push_back", _wrap_swig_dummy_type_const_inode_vector_push_back, METH_VARARGS, "swig_dummy_type_const_inode_vector_push_back(swig_dummy_type_const_inode_vector self, INode x)"},
+	 { "swig_dummy_type_const_inode_vector_front", _wrap_swig_dummy_type_const_inode_vector_front, METH_O, "swig_dummy_type_const_inode_vector_front(swig_dummy_type_const_inode_vector self) -> INode"},
+	 { "swig_dummy_type_const_inode_vector_back", _wrap_swig_dummy_type_const_inode_vector_back, METH_O, "swig_dummy_type_const_inode_vector_back(swig_dummy_type_const_inode_vector self) -> INode"},
+	 { "swig_dummy_type_const_inode_vector_assign", _wrap_swig_dummy_type_const_inode_vector_assign, METH_VARARGS, "swig_dummy_type_const_inode_vector_assign(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n, INode x)"},
+	 { "swig_dummy_type_const_inode_vector_resize", _wrap_swig_dummy_type_const_inode_vector_resize, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector_resize(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type new_size)\n"
 		"swig_dummy_type_const_inode_vector_resize(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type new_size, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector_insert", _wrap_swig_dummy_type_const_inode_vector_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< INode const * >::iterator pos, INode x) -> std::vector< INode const * >::iterator\n"
+	 { "swig_dummy_type_const_inode_vector_insert", _wrap_swig_dummy_type_const_inode_vector_insert, METH_VARARGS, "\n"
+		"swig_dummy_type_const_inode_vector_insert(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos, INode x) -> std::vector< INode const * >::iterator\n"
 		"swig_dummy_type_const_inode_vector_insert(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::iterator pos, std::vector< INode const * >::size_type n, INode x)\n"
 		""},
-	 { (char *)"swig_dummy_type_const_inode_vector_reserve", _wrap_swig_dummy_type_const_inode_vector_reserve, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_reserve(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_capacity", _wrap_swig_dummy_type_const_inode_vector_capacity, METH_VARARGS, (char *)"swig_dummy_type_const_inode_vector_capacity(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
-	 { (char *)"delete_swig_dummy_type_const_inode_vector", _wrap_delete_swig_dummy_type_const_inode_vector, METH_VARARGS, (char *)"delete_swig_dummy_type_const_inode_vector(swig_dummy_type_const_inode_vector self)"},
-	 { (char *)"swig_dummy_type_const_inode_vector_swigregister", swig_dummy_type_const_inode_vector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"swig_dummy_type_axisinfo_vector_iterator", _wrap_swig_dummy_type_axisinfo_vector_iterator, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_iterator(swig_dummy_type_axisinfo_vector self) -> SwigPyIterator"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___nonzero__", _wrap_swig_dummy_type_axisinfo_vector___nonzero__, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector___nonzero__(swig_dummy_type_axisinfo_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___bool__", _wrap_swig_dummy_type_axisinfo_vector___bool__, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector___bool__(swig_dummy_type_axisinfo_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___len__", _wrap_swig_dummy_type_axisinfo_vector___len__, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector___len__(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___getslice__", _wrap_swig_dummy_type_axisinfo_vector___getslice__, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector___getslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j) -> swig_dummy_type_axisinfo_vector"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___setslice__", _wrap_swig_dummy_type_axisinfo_vector___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)\n"
+	 { "swig_dummy_type_const_inode_vector_reserve", _wrap_swig_dummy_type_const_inode_vector_reserve, METH_VARARGS, "swig_dummy_type_const_inode_vector_reserve(swig_dummy_type_const_inode_vector self, std::vector< INode const * >::size_type n)"},
+	 { "swig_dummy_type_const_inode_vector_capacity", _wrap_swig_dummy_type_const_inode_vector_capacity, METH_O, "swig_dummy_type_const_inode_vector_capacity(swig_dummy_type_const_inode_vector self) -> std::vector< INode const * >::size_type"},
+	 { "delete_swig_dummy_type_const_inode_vector", _wrap_delete_swig_dummy_type_const_inode_vector, METH_O, "delete_swig_dummy_type_const_inode_vector(swig_dummy_type_const_inode_vector self)"},
+	 { "swig_dummy_type_const_inode_vector_swigregister", swig_dummy_type_const_inode_vector_swigregister, METH_O, NULL},
+	 { "swig_dummy_type_const_inode_vector_swiginit", swig_dummy_type_const_inode_vector_swiginit, METH_VARARGS, NULL},
+	 { "swig_dummy_type_axisinfo_vector_iterator", _wrap_swig_dummy_type_axisinfo_vector_iterator, METH_O, "swig_dummy_type_axisinfo_vector_iterator(swig_dummy_type_axisinfo_vector self) -> SwigPyIterator"},
+	 { "swig_dummy_type_axisinfo_vector___nonzero__", _wrap_swig_dummy_type_axisinfo_vector___nonzero__, METH_O, "swig_dummy_type_axisinfo_vector___nonzero__(swig_dummy_type_axisinfo_vector self) -> bool"},
+	 { "swig_dummy_type_axisinfo_vector___bool__", _wrap_swig_dummy_type_axisinfo_vector___bool__, METH_O, "swig_dummy_type_axisinfo_vector___bool__(swig_dummy_type_axisinfo_vector self) -> bool"},
+	 { "swig_dummy_type_axisinfo_vector___len__", _wrap_swig_dummy_type_axisinfo_vector___len__, METH_O, "swig_dummy_type_axisinfo_vector___len__(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
+	 { "swig_dummy_type_axisinfo_vector___getslice__", _wrap_swig_dummy_type_axisinfo_vector___getslice__, METH_VARARGS, "swig_dummy_type_axisinfo_vector___getslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j) -> swig_dummy_type_axisinfo_vector"},
+	 { "swig_dummy_type_axisinfo_vector___setslice__", _wrap_swig_dummy_type_axisinfo_vector___setslice__, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector___setslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)\n"
 		"swig_dummy_type_axisinfo_vector___setslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j, swig_dummy_type_axisinfo_vector v)\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector___delslice__", _wrap_swig_dummy_type_axisinfo_vector___delslice__, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector___delslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector___delitem__", _wrap_swig_dummy_type_axisinfo_vector___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< AxisInfo >::difference_type i)\n"
+	 { "swig_dummy_type_axisinfo_vector___delslice__", _wrap_swig_dummy_type_axisinfo_vector___delslice__, METH_VARARGS, "swig_dummy_type_axisinfo_vector___delslice__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, std::vector< AxisInfo >::difference_type j)"},
+	 { "swig_dummy_type_axisinfo_vector___delitem__", _wrap_swig_dummy_type_axisinfo_vector___delitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector___delitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i)\n"
 		"swig_dummy_type_axisinfo_vector___delitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector___getitem__", _wrap_swig_dummy_type_axisinfo_vector___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> swig_dummy_type_axisinfo_vector\n"
+	 { "swig_dummy_type_axisinfo_vector___getitem__", _wrap_swig_dummy_type_axisinfo_vector___getitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector___getitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice) -> swig_dummy_type_axisinfo_vector\n"
 		"swig_dummy_type_axisinfo_vector___getitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i) -> AxisInfo\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector___setitem__", _wrap_swig_dummy_type_axisinfo_vector___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, swig_dummy_type_axisinfo_vector v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "swig_dummy_type_axisinfo_vector___setitem__", _wrap_swig_dummy_type_axisinfo_vector___setitem__, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector___setitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice, swig_dummy_type_axisinfo_vector v)\n"
+		"swig_dummy_type_axisinfo_vector___setitem__(swig_dummy_type_axisinfo_vector self, PySliceObject * slice)\n"
 		"swig_dummy_type_axisinfo_vector___setitem__(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::difference_type i, AxisInfo x)\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector_pop", _wrap_swig_dummy_type_axisinfo_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_pop(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_append", _wrap_swig_dummy_type_axisinfo_vector_append, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_append(swig_dummy_type_axisinfo_vector self, AxisInfo x)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_empty", _wrap_swig_dummy_type_axisinfo_vector_empty, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_empty(swig_dummy_type_axisinfo_vector self) -> bool"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_size", _wrap_swig_dummy_type_axisinfo_vector_size, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_size(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_swap", _wrap_swig_dummy_type_axisinfo_vector_swap, METH_VARARGS, (char *)"\n"
+	 { "swig_dummy_type_axisinfo_vector_pop", _wrap_swig_dummy_type_axisinfo_vector_pop, METH_O, "swig_dummy_type_axisinfo_vector_pop(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
+	 { "swig_dummy_type_axisinfo_vector_append", _wrap_swig_dummy_type_axisinfo_vector_append, METH_VARARGS, "swig_dummy_type_axisinfo_vector_append(swig_dummy_type_axisinfo_vector self, AxisInfo x)"},
+	 { "swig_dummy_type_axisinfo_vector_empty", _wrap_swig_dummy_type_axisinfo_vector_empty, METH_O, "swig_dummy_type_axisinfo_vector_empty(swig_dummy_type_axisinfo_vector self) -> bool"},
+	 { "swig_dummy_type_axisinfo_vector_size", _wrap_swig_dummy_type_axisinfo_vector_size, METH_O, "swig_dummy_type_axisinfo_vector_size(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
+	 { "swig_dummy_type_axisinfo_vector_swap", _wrap_swig_dummy_type_axisinfo_vector_swap, METH_VARARGS, "\n"
 		"swig_dummy_type_axisinfo_vector_swap(swig_dummy_type_axisinfo_vector self, swig_dummy_type_axisinfo_vector v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector_begin", _wrap_swig_dummy_type_axisinfo_vector_begin, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_begin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_end", _wrap_swig_dummy_type_axisinfo_vector_end, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_end(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_rbegin", _wrap_swig_dummy_type_axisinfo_vector_rbegin, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_rbegin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_rend", _wrap_swig_dummy_type_axisinfo_vector_rend, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_rend(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_clear", _wrap_swig_dummy_type_axisinfo_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_clear(swig_dummy_type_axisinfo_vector self)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_get_allocator", _wrap_swig_dummy_type_axisinfo_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_get_allocator(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::allocator_type"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_pop_back", _wrap_swig_dummy_type_axisinfo_vector_pop_back, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_pop_back(swig_dummy_type_axisinfo_vector self)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_erase", _wrap_swig_dummy_type_axisinfo_vector_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< AxisInfo >::iterator pos) -> std::vector< AxisInfo >::iterator\n"
+	 { "swig_dummy_type_axisinfo_vector_begin", _wrap_swig_dummy_type_axisinfo_vector_begin, METH_O, "swig_dummy_type_axisinfo_vector_begin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"},
+	 { "swig_dummy_type_axisinfo_vector_end", _wrap_swig_dummy_type_axisinfo_vector_end, METH_O, "swig_dummy_type_axisinfo_vector_end(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::iterator"},
+	 { "swig_dummy_type_axisinfo_vector_rbegin", _wrap_swig_dummy_type_axisinfo_vector_rbegin, METH_O, "swig_dummy_type_axisinfo_vector_rbegin(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"},
+	 { "swig_dummy_type_axisinfo_vector_rend", _wrap_swig_dummy_type_axisinfo_vector_rend, METH_O, "swig_dummy_type_axisinfo_vector_rend(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::reverse_iterator"},
+	 { "swig_dummy_type_axisinfo_vector_clear", _wrap_swig_dummy_type_axisinfo_vector_clear, METH_O, "swig_dummy_type_axisinfo_vector_clear(swig_dummy_type_axisinfo_vector self)"},
+	 { "swig_dummy_type_axisinfo_vector_get_allocator", _wrap_swig_dummy_type_axisinfo_vector_get_allocator, METH_O, "swig_dummy_type_axisinfo_vector_get_allocator(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::allocator_type"},
+	 { "swig_dummy_type_axisinfo_vector_pop_back", _wrap_swig_dummy_type_axisinfo_vector_pop_back, METH_O, "swig_dummy_type_axisinfo_vector_pop_back(swig_dummy_type_axisinfo_vector self)"},
+	 { "swig_dummy_type_axisinfo_vector_erase", _wrap_swig_dummy_type_axisinfo_vector_erase, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector_erase(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos) -> std::vector< AxisInfo >::iterator\n"
 		"swig_dummy_type_axisinfo_vector_erase(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator first, std::vector< AxisInfo >::iterator last) -> std::vector< AxisInfo >::iterator\n"
 		""},
-	 { (char *)"new_swig_dummy_type_axisinfo_vector", _wrap_new_swig_dummy_type_axisinfo_vector, METH_VARARGS, (char *)"\n"
+	 { "new_swig_dummy_type_axisinfo_vector", _wrap_new_swig_dummy_type_axisinfo_vector, METH_VARARGS, "\n"
 		"swig_dummy_type_axisinfo_vector()\n"
-		"swig_dummy_type_axisinfo_vector(swig_dummy_type_axisinfo_vector arg2)\n"
+		"swig_dummy_type_axisinfo_vector(swig_dummy_type_axisinfo_vector other)\n"
 		"swig_dummy_type_axisinfo_vector(std::vector< AxisInfo >::size_type size)\n"
 		"new_swig_dummy_type_axisinfo_vector(std::vector< AxisInfo >::size_type size, AxisInfo value) -> swig_dummy_type_axisinfo_vector\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector_push_back", _wrap_swig_dummy_type_axisinfo_vector_push_back, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_push_back(swig_dummy_type_axisinfo_vector self, AxisInfo x)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_front", _wrap_swig_dummy_type_axisinfo_vector_front, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_front(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_back", _wrap_swig_dummy_type_axisinfo_vector_back, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_back(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_assign", _wrap_swig_dummy_type_axisinfo_vector_assign, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_assign(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n, AxisInfo x)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_resize", _wrap_swig_dummy_type_axisinfo_vector_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< AxisInfo >::size_type new_size)\n"
+	 { "swig_dummy_type_axisinfo_vector_push_back", _wrap_swig_dummy_type_axisinfo_vector_push_back, METH_VARARGS, "swig_dummy_type_axisinfo_vector_push_back(swig_dummy_type_axisinfo_vector self, AxisInfo x)"},
+	 { "swig_dummy_type_axisinfo_vector_front", _wrap_swig_dummy_type_axisinfo_vector_front, METH_O, "swig_dummy_type_axisinfo_vector_front(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
+	 { "swig_dummy_type_axisinfo_vector_back", _wrap_swig_dummy_type_axisinfo_vector_back, METH_O, "swig_dummy_type_axisinfo_vector_back(swig_dummy_type_axisinfo_vector self) -> AxisInfo"},
+	 { "swig_dummy_type_axisinfo_vector_assign", _wrap_swig_dummy_type_axisinfo_vector_assign, METH_VARARGS, "swig_dummy_type_axisinfo_vector_assign(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n, AxisInfo x)"},
+	 { "swig_dummy_type_axisinfo_vector_resize", _wrap_swig_dummy_type_axisinfo_vector_resize, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector_resize(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type new_size)\n"
 		"swig_dummy_type_axisinfo_vector_resize(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type new_size, AxisInfo x)\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector_insert", _wrap_swig_dummy_type_axisinfo_vector_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< AxisInfo >::iterator pos, AxisInfo x) -> std::vector< AxisInfo >::iterator\n"
+	 { "swig_dummy_type_axisinfo_vector_insert", _wrap_swig_dummy_type_axisinfo_vector_insert, METH_VARARGS, "\n"
+		"swig_dummy_type_axisinfo_vector_insert(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos, AxisInfo x) -> std::vector< AxisInfo >::iterator\n"
 		"swig_dummy_type_axisinfo_vector_insert(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::iterator pos, std::vector< AxisInfo >::size_type n, AxisInfo x)\n"
 		""},
-	 { (char *)"swig_dummy_type_axisinfo_vector_reserve", _wrap_swig_dummy_type_axisinfo_vector_reserve, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_reserve(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_capacity", _wrap_swig_dummy_type_axisinfo_vector_capacity, METH_VARARGS, (char *)"swig_dummy_type_axisinfo_vector_capacity(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
-	 { (char *)"delete_swig_dummy_type_axisinfo_vector", _wrap_delete_swig_dummy_type_axisinfo_vector, METH_VARARGS, (char *)"delete_swig_dummy_type_axisinfo_vector(swig_dummy_type_axisinfo_vector self)"},
-	 { (char *)"swig_dummy_type_axisinfo_vector_swigregister", swig_dummy_type_axisinfo_vector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_kvector_t", _wrap_new_kvector_t, METH_VARARGS, (char *)"\n"
+	 { "swig_dummy_type_axisinfo_vector_reserve", _wrap_swig_dummy_type_axisinfo_vector_reserve, METH_VARARGS, "swig_dummy_type_axisinfo_vector_reserve(swig_dummy_type_axisinfo_vector self, std::vector< AxisInfo >::size_type n)"},
+	 { "swig_dummy_type_axisinfo_vector_capacity", _wrap_swig_dummy_type_axisinfo_vector_capacity, METH_O, "swig_dummy_type_axisinfo_vector_capacity(swig_dummy_type_axisinfo_vector self) -> std::vector< AxisInfo >::size_type"},
+	 { "delete_swig_dummy_type_axisinfo_vector", _wrap_delete_swig_dummy_type_axisinfo_vector, METH_O, "delete_swig_dummy_type_axisinfo_vector(swig_dummy_type_axisinfo_vector self)"},
+	 { "swig_dummy_type_axisinfo_vector_swigregister", swig_dummy_type_axisinfo_vector_swigregister, METH_O, NULL},
+	 { "swig_dummy_type_axisinfo_vector_swiginit", swig_dummy_type_axisinfo_vector_swiginit, METH_VARARGS, NULL},
+	 { "new_kvector_t", _wrap_new_kvector_t, METH_VARARGS, "\n"
 		"kvector_t()\n"
 		"new_kvector_t(double const x1, double const y1, double const z1) -> kvector_t\n"
-		"\n"
 		"BasicVector3D< T >::BasicVector3D(const T x1, const T y1, const T z1)\n"
 		"\n"
 		"Constructor from cartesian components. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_x", _wrap_kvector_t_x, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_x", _wrap_kvector_t_x, METH_O, "\n"
 		"kvector_t_x(kvector_t self) -> double\n"
-		"\n"
 		"T BasicVector3D< T >::x() const\n"
 		"\n"
 		"Returns x-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_y", _wrap_kvector_t_y, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_y", _wrap_kvector_t_y, METH_O, "\n"
 		"kvector_t_y(kvector_t self) -> double\n"
-		"\n"
 		"T BasicVector3D< T >::y() const\n"
 		"\n"
 		"Returns y-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_z", _wrap_kvector_t_z, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_z", _wrap_kvector_t_z, METH_O, "\n"
 		"kvector_t_z(kvector_t self) -> double\n"
-		"\n"
 		"T BasicVector3D< T >::z() const\n"
 		"\n"
 		"Returns z-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_setX", _wrap_kvector_t_setX, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_setX", _wrap_kvector_t_setX, METH_VARARGS, "\n"
 		"kvector_t_setX(kvector_t self, double const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setX(const T &a)\n"
 		"\n"
 		"Sets x-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_setY", _wrap_kvector_t_setY, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_setY", _wrap_kvector_t_setY, METH_VARARGS, "\n"
 		"kvector_t_setY(kvector_t self, double const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setY(const T &a)\n"
 		"\n"
 		"Sets y-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_setZ", _wrap_kvector_t_setZ, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_setZ", _wrap_kvector_t_setZ, METH_VARARGS, "\n"
 		"kvector_t_setZ(kvector_t self, double const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setZ(const T &a)\n"
 		"\n"
 		"Sets z-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t___iadd__", _wrap_kvector_t___iadd__, METH_VARARGS, (char *)"kvector_t___iadd__(kvector_t self, kvector_t v) -> kvector_t"},
-	 { (char *)"kvector_t___isub__", _wrap_kvector_t___isub__, METH_VARARGS, (char *)"kvector_t___isub__(kvector_t self, kvector_t v) -> kvector_t"},
-	 { (char *)"kvector_t_conj", _wrap_kvector_t_conj, METH_VARARGS, (char *)"\n"
+	 { "kvector_t___iadd__", _wrap_kvector_t___iadd__, METH_VARARGS, "kvector_t___iadd__(kvector_t self, kvector_t v) -> kvector_t"},
+	 { "kvector_t___isub__", _wrap_kvector_t___isub__, METH_VARARGS, "kvector_t___isub__(kvector_t self, kvector_t v) -> kvector_t"},
+	 { "kvector_t_conj", _wrap_kvector_t_conj, METH_O, "\n"
 		"kvector_t_conj(kvector_t self) -> kvector_t\n"
-		"\n"
 		"BasicVector3D< complex_t > BasicVector3D< complex_t >::conj() const\n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_mag2", _wrap_kvector_t_mag2, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_mag2", _wrap_kvector_t_mag2, METH_O, "\n"
 		"kvector_t_mag2(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::mag2() const\n"
 		"\n"
 		"Returns magnitude squared of the vector. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_mag", _wrap_kvector_t_mag, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_mag", _wrap_kvector_t_mag, METH_O, "\n"
 		"kvector_t_mag(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::mag() const\n"
 		"\n"
 		"Returns magnitude of the vector. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_magxy2", _wrap_kvector_t_magxy2, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_magxy2", _wrap_kvector_t_magxy2, METH_O, "\n"
 		"kvector_t_magxy2(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::magxy2() const\n"
 		"\n"
 		"Returns squared distance from z axis. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_magxy", _wrap_kvector_t_magxy, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_magxy", _wrap_kvector_t_magxy, METH_O, "\n"
 		"kvector_t_magxy(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::magxy() const\n"
 		"\n"
 		"Returns distance from z axis. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_phi", _wrap_kvector_t_phi, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_phi", _wrap_kvector_t_phi, METH_O, "\n"
 		"kvector_t_phi(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::phi() const\n"
 		"\n"
 		"Returns azimuth angle. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_theta", _wrap_kvector_t_theta, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_theta", _wrap_kvector_t_theta, METH_O, "\n"
 		"kvector_t_theta(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::theta() const\n"
 		"\n"
 		"Returns polar angle. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_cosTheta", _wrap_kvector_t_cosTheta, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_cosTheta", _wrap_kvector_t_cosTheta, METH_O, "\n"
 		"kvector_t_cosTheta(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::cosTheta() const\n"
 		"\n"
 		"Returns cosine of polar angle. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_sin2Theta", _wrap_kvector_t_sin2Theta, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_sin2Theta", _wrap_kvector_t_sin2Theta, METH_O, "\n"
 		"kvector_t_sin2Theta(kvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::sin2Theta() const\n"
 		"\n"
 		"Returns squared sine of polar angle. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_unit", _wrap_kvector_t_unit, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_unit", _wrap_kvector_t_unit, METH_O, "\n"
 		"kvector_t_unit(kvector_t self) -> kvector_t\n"
-		"\n"
 		"BasicVector3D< complex_t > BasicVector3D< complex_t >::unit() const\n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_complex", _wrap_kvector_t_complex, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_complex", _wrap_kvector_t_complex, METH_O, "\n"
 		"kvector_t_complex(kvector_t self) -> cvector_t\n"
-		"\n"
 		"BasicVector3D<std::complex<double> > BasicVector3D< T >::complex() const\n"
 		"\n"
 		"Returns this, trivially converted to complex type. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_real", _wrap_kvector_t_real, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_real", _wrap_kvector_t_real, METH_O, "\n"
 		"kvector_t_real(kvector_t self) -> kvector_t\n"
-		"\n"
 		"BasicVector3D< double > BasicVector3D< complex_t >::real() const\n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_angle", _wrap_kvector_t_angle, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_angle", _wrap_kvector_t_angle, METH_VARARGS, "\n"
 		"kvector_t_angle(kvector_t self, kvector_t v) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::angle(const BasicVector3D< T > &v) const\n"
 		"\n"
 		"Returns angle with respect to another vector. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t_project", _wrap_kvector_t_project, METH_VARARGS, (char *)"\n"
+	 { "kvector_t_project", _wrap_kvector_t_project, METH_VARARGS, "\n"
 		"kvector_t_project(kvector_t self, kvector_t v) -> kvector_t\n"
-		"\n"
 		"BasicVector3D<T> BasicVector3D< T >::project(const BasicVector3D< T > &v) const\n"
 		"\n"
 		"Returns projection of this onto other vector: (this*v)*v/|v|^2. \n"
 		"\n"
 		""},
-	 { (char *)"kvector_t___add__", _wrap_kvector_t___add__, METH_VARARGS, (char *)"kvector_t___add__(kvector_t self, kvector_t rhs) -> kvector_t"},
-	 { (char *)"kvector_t___mul__", _wrap_kvector_t___mul__, METH_VARARGS, (char *)"kvector_t___mul__(kvector_t self, double c) -> kvector_t"},
-	 { (char *)"kvector_t___rmul__", _wrap_kvector_t___rmul__, METH_VARARGS, (char *)"kvector_t___rmul__(kvector_t self, double c) -> kvector_t"},
-	 { (char *)"kvector_t___neg__", _wrap_kvector_t___neg__, METH_VARARGS, (char *)"kvector_t___neg__(kvector_t self) -> kvector_t"},
-	 { (char *)"delete_kvector_t", _wrap_delete_kvector_t, METH_VARARGS, (char *)"delete_kvector_t(kvector_t self)"},
-	 { (char *)"kvector_t_swigregister", kvector_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_kvector_t_iterator", _wrap_vector_kvector_t_iterator, METH_VARARGS, (char *)"vector_kvector_t_iterator(vector_kvector_t self) -> SwigPyIterator"},
-	 { (char *)"vector_kvector_t___nonzero__", _wrap_vector_kvector_t___nonzero__, METH_VARARGS, (char *)"vector_kvector_t___nonzero__(vector_kvector_t self) -> bool"},
-	 { (char *)"vector_kvector_t___bool__", _wrap_vector_kvector_t___bool__, METH_VARARGS, (char *)"vector_kvector_t___bool__(vector_kvector_t self) -> bool"},
-	 { (char *)"vector_kvector_t___len__", _wrap_vector_kvector_t___len__, METH_VARARGS, (char *)"vector_kvector_t___len__(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
-	 { (char *)"vector_kvector_t___getslice__", _wrap_vector_kvector_t___getslice__, METH_VARARGS, (char *)"vector_kvector_t___getslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j) -> vector_kvector_t"},
-	 { (char *)"vector_kvector_t___setslice__", _wrap_vector_kvector_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)\n"
+	 { "kvector_t___add__", _wrap_kvector_t___add__, METH_VARARGS, "kvector_t___add__(kvector_t self, kvector_t rhs) -> kvector_t"},
+	 { "kvector_t___mul__", _wrap_kvector_t___mul__, METH_VARARGS, "kvector_t___mul__(kvector_t self, double c) -> kvector_t"},
+	 { "kvector_t___rmul__", _wrap_kvector_t___rmul__, METH_VARARGS, "kvector_t___rmul__(kvector_t self, double c) -> kvector_t"},
+	 { "kvector_t___neg__", _wrap_kvector_t___neg__, METH_O, "kvector_t___neg__(kvector_t self) -> kvector_t"},
+	 { "delete_kvector_t", _wrap_delete_kvector_t, METH_O, "delete_kvector_t(kvector_t self)"},
+	 { "kvector_t_swigregister", kvector_t_swigregister, METH_O, NULL},
+	 { "kvector_t_swiginit", kvector_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_kvector_t_iterator", _wrap_vector_kvector_t_iterator, METH_O, "vector_kvector_t_iterator(vector_kvector_t self) -> SwigPyIterator"},
+	 { "vector_kvector_t___nonzero__", _wrap_vector_kvector_t___nonzero__, METH_O, "vector_kvector_t___nonzero__(vector_kvector_t self) -> bool"},
+	 { "vector_kvector_t___bool__", _wrap_vector_kvector_t___bool__, METH_O, "vector_kvector_t___bool__(vector_kvector_t self) -> bool"},
+	 { "vector_kvector_t___len__", _wrap_vector_kvector_t___len__, METH_O, "vector_kvector_t___len__(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
+	 { "vector_kvector_t___getslice__", _wrap_vector_kvector_t___getslice__, METH_VARARGS, "vector_kvector_t___getslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j) -> vector_kvector_t"},
+	 { "vector_kvector_t___setslice__", _wrap_vector_kvector_t___setslice__, METH_VARARGS, "\n"
+		"vector_kvector_t___setslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)\n"
 		"vector_kvector_t___setslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j, vector_kvector_t v)\n"
 		""},
-	 { (char *)"vector_kvector_t___delslice__", _wrap_vector_kvector_t___delslice__, METH_VARARGS, (char *)"vector_kvector_t___delslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)"},
-	 { (char *)"vector_kvector_t___delitem__", _wrap_vector_kvector_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< BasicVector3D< double > >::difference_type i)\n"
+	 { "vector_kvector_t___delslice__", _wrap_vector_kvector_t___delslice__, METH_VARARGS, "vector_kvector_t___delslice__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, std::vector< BasicVector3D< double > >::difference_type j)"},
+	 { "vector_kvector_t___delitem__", _wrap_vector_kvector_t___delitem__, METH_VARARGS, "\n"
+		"vector_kvector_t___delitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i)\n"
 		"vector_kvector_t___delitem__(vector_kvector_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_kvector_t___getitem__", _wrap_vector_kvector_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_kvector_t\n"
+	 { "vector_kvector_t___getitem__", _wrap_vector_kvector_t___getitem__, METH_VARARGS, "\n"
+		"vector_kvector_t___getitem__(vector_kvector_t self, PySliceObject * slice) -> vector_kvector_t\n"
 		"vector_kvector_t___getitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i) -> kvector_t\n"
 		""},
-	 { (char *)"vector_kvector_t___setitem__", _wrap_vector_kvector_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_kvector_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_kvector_t___setitem__", _wrap_vector_kvector_t___setitem__, METH_VARARGS, "\n"
+		"vector_kvector_t___setitem__(vector_kvector_t self, PySliceObject * slice, vector_kvector_t v)\n"
+		"vector_kvector_t___setitem__(vector_kvector_t self, PySliceObject * slice)\n"
 		"vector_kvector_t___setitem__(vector_kvector_t self, std::vector< BasicVector3D< double > >::difference_type i, kvector_t x)\n"
 		""},
-	 { (char *)"vector_kvector_t_pop", _wrap_vector_kvector_t_pop, METH_VARARGS, (char *)"vector_kvector_t_pop(vector_kvector_t self) -> kvector_t"},
-	 { (char *)"vector_kvector_t_append", _wrap_vector_kvector_t_append, METH_VARARGS, (char *)"vector_kvector_t_append(vector_kvector_t self, kvector_t x)"},
-	 { (char *)"vector_kvector_t_empty", _wrap_vector_kvector_t_empty, METH_VARARGS, (char *)"vector_kvector_t_empty(vector_kvector_t self) -> bool"},
-	 { (char *)"vector_kvector_t_size", _wrap_vector_kvector_t_size, METH_VARARGS, (char *)"vector_kvector_t_size(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
-	 { (char *)"vector_kvector_t_swap", _wrap_vector_kvector_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_kvector_t_pop", _wrap_vector_kvector_t_pop, METH_O, "vector_kvector_t_pop(vector_kvector_t self) -> kvector_t"},
+	 { "vector_kvector_t_append", _wrap_vector_kvector_t_append, METH_VARARGS, "vector_kvector_t_append(vector_kvector_t self, kvector_t x)"},
+	 { "vector_kvector_t_empty", _wrap_vector_kvector_t_empty, METH_O, "vector_kvector_t_empty(vector_kvector_t self) -> bool"},
+	 { "vector_kvector_t_size", _wrap_vector_kvector_t_size, METH_O, "vector_kvector_t_size(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
+	 { "vector_kvector_t_swap", _wrap_vector_kvector_t_swap, METH_VARARGS, "\n"
 		"vector_kvector_t_swap(vector_kvector_t self, vector_kvector_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_kvector_t_begin", _wrap_vector_kvector_t_begin, METH_VARARGS, (char *)"vector_kvector_t_begin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"},
-	 { (char *)"vector_kvector_t_end", _wrap_vector_kvector_t_end, METH_VARARGS, (char *)"vector_kvector_t_end(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"},
-	 { (char *)"vector_kvector_t_rbegin", _wrap_vector_kvector_t_rbegin, METH_VARARGS, (char *)"vector_kvector_t_rbegin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"},
-	 { (char *)"vector_kvector_t_rend", _wrap_vector_kvector_t_rend, METH_VARARGS, (char *)"vector_kvector_t_rend(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"},
-	 { (char *)"vector_kvector_t_clear", _wrap_vector_kvector_t_clear, METH_VARARGS, (char *)"vector_kvector_t_clear(vector_kvector_t self)"},
-	 { (char *)"vector_kvector_t_get_allocator", _wrap_vector_kvector_t_get_allocator, METH_VARARGS, (char *)"vector_kvector_t_get_allocator(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::allocator_type"},
-	 { (char *)"vector_kvector_t_pop_back", _wrap_vector_kvector_t_pop_back, METH_VARARGS, (char *)"vector_kvector_t_pop_back(vector_kvector_t self)"},
-	 { (char *)"vector_kvector_t_erase", _wrap_vector_kvector_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< BasicVector3D< double > >::iterator pos) -> std::vector< BasicVector3D< double > >::iterator\n"
+	 { "vector_kvector_t_begin", _wrap_vector_kvector_t_begin, METH_O, "vector_kvector_t_begin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"},
+	 { "vector_kvector_t_end", _wrap_vector_kvector_t_end, METH_O, "vector_kvector_t_end(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::iterator"},
+	 { "vector_kvector_t_rbegin", _wrap_vector_kvector_t_rbegin, METH_O, "vector_kvector_t_rbegin(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"},
+	 { "vector_kvector_t_rend", _wrap_vector_kvector_t_rend, METH_O, "vector_kvector_t_rend(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::reverse_iterator"},
+	 { "vector_kvector_t_clear", _wrap_vector_kvector_t_clear, METH_O, "vector_kvector_t_clear(vector_kvector_t self)"},
+	 { "vector_kvector_t_get_allocator", _wrap_vector_kvector_t_get_allocator, METH_O, "vector_kvector_t_get_allocator(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::allocator_type"},
+	 { "vector_kvector_t_pop_back", _wrap_vector_kvector_t_pop_back, METH_O, "vector_kvector_t_pop_back(vector_kvector_t self)"},
+	 { "vector_kvector_t_erase", _wrap_vector_kvector_t_erase, METH_VARARGS, "\n"
+		"vector_kvector_t_erase(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos) -> std::vector< BasicVector3D< double > >::iterator\n"
 		"vector_kvector_t_erase(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator first, std::vector< BasicVector3D< double > >::iterator last) -> std::vector< BasicVector3D< double > >::iterator\n"
 		""},
-	 { (char *)"new_vector_kvector_t", _wrap_new_vector_kvector_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_kvector_t", _wrap_new_vector_kvector_t, METH_VARARGS, "\n"
 		"vector_kvector_t()\n"
-		"vector_kvector_t(vector_kvector_t arg2)\n"
+		"vector_kvector_t(vector_kvector_t other)\n"
 		"vector_kvector_t(std::vector< BasicVector3D< double > >::size_type size)\n"
 		"new_vector_kvector_t(std::vector< BasicVector3D< double > >::size_type size, kvector_t value) -> vector_kvector_t\n"
 		""},
-	 { (char *)"vector_kvector_t_push_back", _wrap_vector_kvector_t_push_back, METH_VARARGS, (char *)"vector_kvector_t_push_back(vector_kvector_t self, kvector_t x)"},
-	 { (char *)"vector_kvector_t_front", _wrap_vector_kvector_t_front, METH_VARARGS, (char *)"vector_kvector_t_front(vector_kvector_t self) -> kvector_t"},
-	 { (char *)"vector_kvector_t_back", _wrap_vector_kvector_t_back, METH_VARARGS, (char *)"vector_kvector_t_back(vector_kvector_t self) -> kvector_t"},
-	 { (char *)"vector_kvector_t_assign", _wrap_vector_kvector_t_assign, METH_VARARGS, (char *)"vector_kvector_t_assign(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)"},
-	 { (char *)"vector_kvector_t_resize", _wrap_vector_kvector_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< BasicVector3D< double > >::size_type new_size)\n"
+	 { "vector_kvector_t_push_back", _wrap_vector_kvector_t_push_back, METH_VARARGS, "vector_kvector_t_push_back(vector_kvector_t self, kvector_t x)"},
+	 { "vector_kvector_t_front", _wrap_vector_kvector_t_front, METH_O, "vector_kvector_t_front(vector_kvector_t self) -> kvector_t"},
+	 { "vector_kvector_t_back", _wrap_vector_kvector_t_back, METH_O, "vector_kvector_t_back(vector_kvector_t self) -> kvector_t"},
+	 { "vector_kvector_t_assign", _wrap_vector_kvector_t_assign, METH_VARARGS, "vector_kvector_t_assign(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)"},
+	 { "vector_kvector_t_resize", _wrap_vector_kvector_t_resize, METH_VARARGS, "\n"
+		"vector_kvector_t_resize(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type new_size)\n"
 		"vector_kvector_t_resize(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type new_size, kvector_t x)\n"
 		""},
-	 { (char *)"vector_kvector_t_insert", _wrap_vector_kvector_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< BasicVector3D< double > >::iterator pos, kvector_t x) -> std::vector< BasicVector3D< double > >::iterator\n"
+	 { "vector_kvector_t_insert", _wrap_vector_kvector_t_insert, METH_VARARGS, "\n"
+		"vector_kvector_t_insert(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos, kvector_t x) -> std::vector< BasicVector3D< double > >::iterator\n"
 		"vector_kvector_t_insert(vector_kvector_t self, std::vector< BasicVector3D< double > >::iterator pos, std::vector< BasicVector3D< double > >::size_type n, kvector_t x)\n"
 		""},
-	 { (char *)"vector_kvector_t_reserve", _wrap_vector_kvector_t_reserve, METH_VARARGS, (char *)"vector_kvector_t_reserve(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n)"},
-	 { (char *)"vector_kvector_t_capacity", _wrap_vector_kvector_t_capacity, METH_VARARGS, (char *)"vector_kvector_t_capacity(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
-	 { (char *)"delete_vector_kvector_t", _wrap_delete_vector_kvector_t, METH_VARARGS, (char *)"delete_vector_kvector_t(vector_kvector_t self)"},
-	 { (char *)"vector_kvector_t_swigregister", vector_kvector_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_cvector_t", _wrap_new_cvector_t, METH_VARARGS, (char *)"\n"
+	 { "vector_kvector_t_reserve", _wrap_vector_kvector_t_reserve, METH_VARARGS, "vector_kvector_t_reserve(vector_kvector_t self, std::vector< BasicVector3D< double > >::size_type n)"},
+	 { "vector_kvector_t_capacity", _wrap_vector_kvector_t_capacity, METH_O, "vector_kvector_t_capacity(vector_kvector_t self) -> std::vector< BasicVector3D< double > >::size_type"},
+	 { "delete_vector_kvector_t", _wrap_delete_vector_kvector_t, METH_O, "delete_vector_kvector_t(vector_kvector_t self)"},
+	 { "vector_kvector_t_swigregister", vector_kvector_t_swigregister, METH_O, NULL},
+	 { "vector_kvector_t_swiginit", vector_kvector_t_swiginit, METH_VARARGS, NULL},
+	 { "new_cvector_t", _wrap_new_cvector_t, METH_VARARGS, "\n"
 		"cvector_t()\n"
 		"new_cvector_t(std::complex< double > const x1, std::complex< double > const y1, std::complex< double > const z1) -> cvector_t\n"
-		"\n"
 		"BasicVector3D< T >::BasicVector3D(const T x1, const T y1, const T z1)\n"
 		"\n"
 		"Constructor from cartesian components. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_x", _wrap_cvector_t_x, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_x", _wrap_cvector_t_x, METH_O, "\n"
 		"cvector_t_x(cvector_t self) -> std::complex< double >\n"
-		"\n"
 		"T BasicVector3D< T >::x() const\n"
 		"\n"
 		"Returns x-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_y", _wrap_cvector_t_y, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_y", _wrap_cvector_t_y, METH_O, "\n"
 		"cvector_t_y(cvector_t self) -> std::complex< double >\n"
-		"\n"
 		"T BasicVector3D< T >::y() const\n"
 		"\n"
 		"Returns y-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_z", _wrap_cvector_t_z, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_z", _wrap_cvector_t_z, METH_O, "\n"
 		"cvector_t_z(cvector_t self) -> std::complex< double >\n"
-		"\n"
 		"T BasicVector3D< T >::z() const\n"
 		"\n"
 		"Returns z-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_setX", _wrap_cvector_t_setX, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_setX", _wrap_cvector_t_setX, METH_VARARGS, "\n"
 		"cvector_t_setX(cvector_t self, std::complex< double > const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setX(const T &a)\n"
 		"\n"
 		"Sets x-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_setY", _wrap_cvector_t_setY, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_setY", _wrap_cvector_t_setY, METH_VARARGS, "\n"
 		"cvector_t_setY(cvector_t self, std::complex< double > const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setY(const T &a)\n"
 		"\n"
 		"Sets y-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_setZ", _wrap_cvector_t_setZ, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_setZ", _wrap_cvector_t_setZ, METH_VARARGS, "\n"
 		"cvector_t_setZ(cvector_t self, std::complex< double > const & a)\n"
-		"\n"
 		"void BasicVector3D< T >::setZ(const T &a)\n"
 		"\n"
 		"Sets z-component in cartesian coordinate system. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t___iadd__", _wrap_cvector_t___iadd__, METH_VARARGS, (char *)"cvector_t___iadd__(cvector_t self, cvector_t v) -> cvector_t"},
-	 { (char *)"cvector_t___isub__", _wrap_cvector_t___isub__, METH_VARARGS, (char *)"cvector_t___isub__(cvector_t self, cvector_t v) -> cvector_t"},
-	 { (char *)"cvector_t_conj", _wrap_cvector_t_conj, METH_VARARGS, (char *)"\n"
+	 { "cvector_t___iadd__", _wrap_cvector_t___iadd__, METH_VARARGS, "cvector_t___iadd__(cvector_t self, cvector_t v) -> cvector_t"},
+	 { "cvector_t___isub__", _wrap_cvector_t___isub__, METH_VARARGS, "cvector_t___isub__(cvector_t self, cvector_t v) -> cvector_t"},
+	 { "cvector_t_conj", _wrap_cvector_t_conj, METH_O, "\n"
 		"cvector_t_conj(cvector_t self) -> cvector_t\n"
-		"\n"
 		"BasicVector3D< complex_t > BasicVector3D< complex_t >::conj() const\n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_mag2", _wrap_cvector_t_mag2, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_mag2", _wrap_cvector_t_mag2, METH_O, "\n"
 		"cvector_t_mag2(cvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::mag2() const\n"
 		"\n"
 		"Returns magnitude squared of the vector. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_mag", _wrap_cvector_t_mag, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_mag", _wrap_cvector_t_mag, METH_O, "\n"
 		"cvector_t_mag(cvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::mag() const\n"
 		"\n"
 		"Returns magnitude of the vector. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_magxy2", _wrap_cvector_t_magxy2, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_magxy2", _wrap_cvector_t_magxy2, METH_O, "\n"
 		"cvector_t_magxy2(cvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::magxy2() const\n"
 		"\n"
 		"Returns squared distance from z axis. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_magxy", _wrap_cvector_t_magxy, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_magxy", _wrap_cvector_t_magxy, METH_O, "\n"
 		"cvector_t_magxy(cvector_t self) -> double\n"
-		"\n"
 		"double BasicVector3D< T >::magxy() const\n"
 		"\n"
 		"Returns distance from z axis. \n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_unit", _wrap_cvector_t_unit, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_unit", _wrap_cvector_t_unit, METH_O, "\n"
 		"cvector_t_unit(cvector_t self) -> cvector_t\n"
-		"\n"
 		"BasicVector3D< complex_t > BasicVector3D< complex_t >::unit() const\n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_real", _wrap_cvector_t_real, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_real", _wrap_cvector_t_real, METH_O, "\n"
 		"cvector_t_real(cvector_t self) -> kvector_t\n"
-		"\n"
 		"BasicVector3D< double > BasicVector3D< complex_t >::real() const\n"
 		"\n"
 		""},
-	 { (char *)"cvector_t_project", _wrap_cvector_t_project, METH_VARARGS, (char *)"\n"
+	 { "cvector_t_project", _wrap_cvector_t_project, METH_VARARGS, "\n"
 		"cvector_t_project(cvector_t self, cvector_t v) -> cvector_t\n"
-		"\n"
 		"BasicVector3D<T> BasicVector3D< T >::project(const BasicVector3D< T > &v) const\n"
 		"\n"
 		"Returns projection of this onto other vector: (this*v)*v/|v|^2. \n"
 		"\n"
 		""},
-	 { (char *)"delete_cvector_t", _wrap_delete_cvector_t, METH_VARARGS, (char *)"delete_cvector_t(cvector_t self)"},
-	 { (char *)"cvector_t_swigregister", cvector_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_cvector_t_iterator", _wrap_vector_cvector_t_iterator, METH_VARARGS, (char *)"vector_cvector_t_iterator(vector_cvector_t self) -> SwigPyIterator"},
-	 { (char *)"vector_cvector_t___nonzero__", _wrap_vector_cvector_t___nonzero__, METH_VARARGS, (char *)"vector_cvector_t___nonzero__(vector_cvector_t self) -> bool"},
-	 { (char *)"vector_cvector_t___bool__", _wrap_vector_cvector_t___bool__, METH_VARARGS, (char *)"vector_cvector_t___bool__(vector_cvector_t self) -> bool"},
-	 { (char *)"vector_cvector_t___len__", _wrap_vector_cvector_t___len__, METH_VARARGS, (char *)"vector_cvector_t___len__(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
-	 { (char *)"vector_cvector_t___getslice__", _wrap_vector_cvector_t___getslice__, METH_VARARGS, (char *)"vector_cvector_t___getslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t"},
-	 { (char *)"vector_cvector_t___setslice__", _wrap_vector_cvector_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)\n"
+	 { "delete_cvector_t", _wrap_delete_cvector_t, METH_O, "delete_cvector_t(cvector_t self)"},
+	 { "cvector_t_swigregister", cvector_t_swigregister, METH_O, NULL},
+	 { "cvector_t_swiginit", cvector_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_cvector_t_iterator", _wrap_vector_cvector_t_iterator, METH_O, "vector_cvector_t_iterator(vector_cvector_t self) -> SwigPyIterator"},
+	 { "vector_cvector_t___nonzero__", _wrap_vector_cvector_t___nonzero__, METH_O, "vector_cvector_t___nonzero__(vector_cvector_t self) -> bool"},
+	 { "vector_cvector_t___bool__", _wrap_vector_cvector_t___bool__, METH_O, "vector_cvector_t___bool__(vector_cvector_t self) -> bool"},
+	 { "vector_cvector_t___len__", _wrap_vector_cvector_t___len__, METH_O, "vector_cvector_t___len__(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
+	 { "vector_cvector_t___getslice__", _wrap_vector_cvector_t___getslice__, METH_VARARGS, "vector_cvector_t___getslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t"},
+	 { "vector_cvector_t___setslice__", _wrap_vector_cvector_t___setslice__, METH_VARARGS, "\n"
+		"vector_cvector_t___setslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)\n"
 		"vector_cvector_t___setslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v)\n"
 		""},
-	 { (char *)"vector_cvector_t___delslice__", _wrap_vector_cvector_t___delslice__, METH_VARARGS, (char *)"vector_cvector_t___delslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)"},
-	 { (char *)"vector_cvector_t___delitem__", _wrap_vector_cvector_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< BasicVector3D< std::complex< double > > >::difference_type i)\n"
+	 { "vector_cvector_t___delslice__", _wrap_vector_cvector_t___delslice__, METH_VARARGS, "vector_cvector_t___delslice__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, std::vector< BasicVector3D< std::complex< double > > >::difference_type j)"},
+	 { "vector_cvector_t___delitem__", _wrap_vector_cvector_t___delitem__, METH_VARARGS, "\n"
+		"vector_cvector_t___delitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i)\n"
 		"vector_cvector_t___delitem__(vector_cvector_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_cvector_t___getitem__", _wrap_vector_cvector_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_cvector_t\n"
+	 { "vector_cvector_t___getitem__", _wrap_vector_cvector_t___getitem__, METH_VARARGS, "\n"
+		"vector_cvector_t___getitem__(vector_cvector_t self, PySliceObject * slice) -> vector_cvector_t\n"
 		"vector_cvector_t___getitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i) -> cvector_t\n"
 		""},
-	 { (char *)"vector_cvector_t___setitem__", _wrap_vector_cvector_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_cvector_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_cvector_t___setitem__", _wrap_vector_cvector_t___setitem__, METH_VARARGS, "\n"
+		"vector_cvector_t___setitem__(vector_cvector_t self, PySliceObject * slice, vector_cvector_t v)\n"
+		"vector_cvector_t___setitem__(vector_cvector_t self, PySliceObject * slice)\n"
 		"vector_cvector_t___setitem__(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::difference_type i, cvector_t x)\n"
 		""},
-	 { (char *)"vector_cvector_t_pop", _wrap_vector_cvector_t_pop, METH_VARARGS, (char *)"vector_cvector_t_pop(vector_cvector_t self) -> cvector_t"},
-	 { (char *)"vector_cvector_t_append", _wrap_vector_cvector_t_append, METH_VARARGS, (char *)"vector_cvector_t_append(vector_cvector_t self, cvector_t x)"},
-	 { (char *)"vector_cvector_t_empty", _wrap_vector_cvector_t_empty, METH_VARARGS, (char *)"vector_cvector_t_empty(vector_cvector_t self) -> bool"},
-	 { (char *)"vector_cvector_t_size", _wrap_vector_cvector_t_size, METH_VARARGS, (char *)"vector_cvector_t_size(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
-	 { (char *)"vector_cvector_t_swap", _wrap_vector_cvector_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_cvector_t_pop", _wrap_vector_cvector_t_pop, METH_O, "vector_cvector_t_pop(vector_cvector_t self) -> cvector_t"},
+	 { "vector_cvector_t_append", _wrap_vector_cvector_t_append, METH_VARARGS, "vector_cvector_t_append(vector_cvector_t self, cvector_t x)"},
+	 { "vector_cvector_t_empty", _wrap_vector_cvector_t_empty, METH_O, "vector_cvector_t_empty(vector_cvector_t self) -> bool"},
+	 { "vector_cvector_t_size", _wrap_vector_cvector_t_size, METH_O, "vector_cvector_t_size(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
+	 { "vector_cvector_t_swap", _wrap_vector_cvector_t_swap, METH_VARARGS, "\n"
 		"vector_cvector_t_swap(vector_cvector_t self, vector_cvector_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_cvector_t_begin", _wrap_vector_cvector_t_begin, METH_VARARGS, (char *)"vector_cvector_t_begin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"},
-	 { (char *)"vector_cvector_t_end", _wrap_vector_cvector_t_end, METH_VARARGS, (char *)"vector_cvector_t_end(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"},
-	 { (char *)"vector_cvector_t_rbegin", _wrap_vector_cvector_t_rbegin, METH_VARARGS, (char *)"vector_cvector_t_rbegin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"},
-	 { (char *)"vector_cvector_t_rend", _wrap_vector_cvector_t_rend, METH_VARARGS, (char *)"vector_cvector_t_rend(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"},
-	 { (char *)"vector_cvector_t_clear", _wrap_vector_cvector_t_clear, METH_VARARGS, (char *)"vector_cvector_t_clear(vector_cvector_t self)"},
-	 { (char *)"vector_cvector_t_get_allocator", _wrap_vector_cvector_t_get_allocator, METH_VARARGS, (char *)"vector_cvector_t_get_allocator(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::allocator_type"},
-	 { (char *)"vector_cvector_t_pop_back", _wrap_vector_cvector_t_pop_back, METH_VARARGS, (char *)"vector_cvector_t_pop_back(vector_cvector_t self)"},
-	 { (char *)"vector_cvector_t_erase", _wrap_vector_cvector_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< BasicVector3D< std::complex< double > > >::iterator pos) -> std::vector< BasicVector3D< std::complex< double > > >::iterator\n"
+	 { "vector_cvector_t_begin", _wrap_vector_cvector_t_begin, METH_O, "vector_cvector_t_begin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"},
+	 { "vector_cvector_t_end", _wrap_vector_cvector_t_end, METH_O, "vector_cvector_t_end(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::iterator"},
+	 { "vector_cvector_t_rbegin", _wrap_vector_cvector_t_rbegin, METH_O, "vector_cvector_t_rbegin(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"},
+	 { "vector_cvector_t_rend", _wrap_vector_cvector_t_rend, METH_O, "vector_cvector_t_rend(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::reverse_iterator"},
+	 { "vector_cvector_t_clear", _wrap_vector_cvector_t_clear, METH_O, "vector_cvector_t_clear(vector_cvector_t self)"},
+	 { "vector_cvector_t_get_allocator", _wrap_vector_cvector_t_get_allocator, METH_O, "vector_cvector_t_get_allocator(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::allocator_type"},
+	 { "vector_cvector_t_pop_back", _wrap_vector_cvector_t_pop_back, METH_O, "vector_cvector_t_pop_back(vector_cvector_t self)"},
+	 { "vector_cvector_t_erase", _wrap_vector_cvector_t_erase, METH_VARARGS, "\n"
+		"vector_cvector_t_erase(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos) -> std::vector< BasicVector3D< std::complex< double > > >::iterator\n"
 		"vector_cvector_t_erase(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator first, std::vector< BasicVector3D< std::complex< double > > >::iterator last) -> std::vector< BasicVector3D< std::complex< double > > >::iterator\n"
 		""},
-	 { (char *)"new_vector_cvector_t", _wrap_new_vector_cvector_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_cvector_t", _wrap_new_vector_cvector_t, METH_VARARGS, "\n"
 		"vector_cvector_t()\n"
-		"vector_cvector_t(vector_cvector_t arg2)\n"
+		"vector_cvector_t(vector_cvector_t other)\n"
 		"vector_cvector_t(std::vector< BasicVector3D< std::complex< double > > >::size_type size)\n"
 		"new_vector_cvector_t(std::vector< BasicVector3D< std::complex< double > > >::size_type size, cvector_t value) -> vector_cvector_t\n"
 		""},
-	 { (char *)"vector_cvector_t_push_back", _wrap_vector_cvector_t_push_back, METH_VARARGS, (char *)"vector_cvector_t_push_back(vector_cvector_t self, cvector_t x)"},
-	 { (char *)"vector_cvector_t_front", _wrap_vector_cvector_t_front, METH_VARARGS, (char *)"vector_cvector_t_front(vector_cvector_t self) -> cvector_t"},
-	 { (char *)"vector_cvector_t_back", _wrap_vector_cvector_t_back, METH_VARARGS, (char *)"vector_cvector_t_back(vector_cvector_t self) -> cvector_t"},
-	 { (char *)"vector_cvector_t_assign", _wrap_vector_cvector_t_assign, METH_VARARGS, (char *)"vector_cvector_t_assign(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)"},
-	 { (char *)"vector_cvector_t_resize", _wrap_vector_cvector_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< BasicVector3D< std::complex< double > > >::size_type new_size)\n"
+	 { "vector_cvector_t_push_back", _wrap_vector_cvector_t_push_back, METH_VARARGS, "vector_cvector_t_push_back(vector_cvector_t self, cvector_t x)"},
+	 { "vector_cvector_t_front", _wrap_vector_cvector_t_front, METH_O, "vector_cvector_t_front(vector_cvector_t self) -> cvector_t"},
+	 { "vector_cvector_t_back", _wrap_vector_cvector_t_back, METH_O, "vector_cvector_t_back(vector_cvector_t self) -> cvector_t"},
+	 { "vector_cvector_t_assign", _wrap_vector_cvector_t_assign, METH_VARARGS, "vector_cvector_t_assign(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)"},
+	 { "vector_cvector_t_resize", _wrap_vector_cvector_t_resize, METH_VARARGS, "\n"
+		"vector_cvector_t_resize(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type new_size)\n"
 		"vector_cvector_t_resize(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type new_size, cvector_t x)\n"
 		""},
-	 { (char *)"vector_cvector_t_insert", _wrap_vector_cvector_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< BasicVector3D< std::complex< double > > >::iterator pos, cvector_t x) -> std::vector< BasicVector3D< std::complex< double > > >::iterator\n"
+	 { "vector_cvector_t_insert", _wrap_vector_cvector_t_insert, METH_VARARGS, "\n"
+		"vector_cvector_t_insert(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos, cvector_t x) -> std::vector< BasicVector3D< std::complex< double > > >::iterator\n"
 		"vector_cvector_t_insert(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::iterator pos, std::vector< BasicVector3D< std::complex< double > > >::size_type n, cvector_t x)\n"
 		""},
-	 { (char *)"vector_cvector_t_reserve", _wrap_vector_cvector_t_reserve, METH_VARARGS, (char *)"vector_cvector_t_reserve(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n)"},
-	 { (char *)"vector_cvector_t_capacity", _wrap_vector_cvector_t_capacity, METH_VARARGS, (char *)"vector_cvector_t_capacity(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
-	 { (char *)"delete_vector_cvector_t", _wrap_delete_vector_cvector_t, METH_VARARGS, (char *)"delete_vector_cvector_t(vector_cvector_t self)"},
-	 { (char *)"vector_cvector_t_swigregister", vector_cvector_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"mul_I", _wrap_mul_I, METH_VARARGS, (char *)"\n"
+	 { "vector_cvector_t_reserve", _wrap_vector_cvector_t_reserve, METH_VARARGS, "vector_cvector_t_reserve(vector_cvector_t self, std::vector< BasicVector3D< std::complex< double > > >::size_type n)"},
+	 { "vector_cvector_t_capacity", _wrap_vector_cvector_t_capacity, METH_O, "vector_cvector_t_capacity(vector_cvector_t self) -> std::vector< BasicVector3D< std::complex< double > > >::size_type"},
+	 { "delete_vector_cvector_t", _wrap_delete_vector_cvector_t, METH_O, "delete_vector_cvector_t(vector_cvector_t self)"},
+	 { "vector_cvector_t_swigregister", vector_cvector_t_swigregister, METH_O, NULL},
+	 { "vector_cvector_t_swiginit", vector_cvector_t_swiginit, METH_VARARGS, NULL},
+	 { "mul_I", _wrap_mul_I, METH_O, "\n"
 		"mul_I(complex_t z) -> complex_t\n"
-		"\n"
 		"complex_t mul_I(complex_t z)\n"
 		"\n"
 		"Returns product I*z, where I is the imaginary unit. \n"
 		"\n"
 		""},
-	 { (char *)"exp_I", _wrap_exp_I, METH_VARARGS, (char *)"\n"
+	 { "exp_I", _wrap_exp_I, METH_O, "\n"
 		"exp_I(complex_t z) -> complex_t\n"
-		"\n"
 		"complex_t exp_I(complex_t z)\n"
 		"\n"
 		"Returns exp(I*z), where I is the imaginary unit. \n"
 		"\n"
 		""},
-	 { (char *)"rad2deg", _wrap_rad2deg, METH_VARARGS, (char *)"\n"
+	 { "rad2deg", _wrap_rad2deg, METH_O, "\n"
 		"rad2deg(double angle) -> double\n"
-		"\n"
 		"double Units::rad2deg(double angle)\n"
 		"\n"
 		""},
-	 { (char *)"deg2rad", _wrap_deg2rad, METH_VARARGS, (char *)"\n"
+	 { "deg2rad", _wrap_deg2rad, METH_O, "\n"
 		"deg2rad(double angle) -> double\n"
-		"\n"
 		"double Units::deg2rad(double angle)\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_GetZeroQ", _wrap_WavevectorInfo_GetZeroQ, METH_VARARGS, (char *)"WavevectorInfo_GetZeroQ() -> WavevectorInfo"},
-	 { (char *)"new_WavevectorInfo", _wrap_new_WavevectorInfo, METH_VARARGS, (char *)"\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"
 		"new_WavevectorInfo(kvector_t ki, kvector_t kf, double wavelength) -> WavevectorInfo\n"
-		"\n"
 		"WavevectorInfo::WavevectorInfo(kvector_t ki, kvector_t kf, double wavelength)\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_transformed", _wrap_WavevectorInfo_transformed, METH_VARARGS, (char *)"\n"
+	 { "WavevectorInfo_transformed", _wrap_WavevectorInfo_transformed, METH_VARARGS, "\n"
 		"WavevectorInfo_transformed(WavevectorInfo self, Transform3D const & transform) -> WavevectorInfo\n"
-		"\n"
 		"WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_getKi", _wrap_WavevectorInfo_getKi, METH_VARARGS, (char *)"\n"
+	 { "WavevectorInfo_getKi", _wrap_WavevectorInfo_getKi, METH_O, "\n"
 		"WavevectorInfo_getKi(WavevectorInfo self) -> cvector_t\n"
-		"\n"
 		"cvector_t WavevectorInfo::getKi() const\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_getKf", _wrap_WavevectorInfo_getKf, METH_VARARGS, (char *)"\n"
+	 { "WavevectorInfo_getKf", _wrap_WavevectorInfo_getKf, METH_O, "\n"
 		"WavevectorInfo_getKf(WavevectorInfo self) -> cvector_t\n"
-		"\n"
 		"cvector_t WavevectorInfo::getKf() const\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_getQ", _wrap_WavevectorInfo_getQ, METH_VARARGS, (char *)"\n"
+	 { "WavevectorInfo_getQ", _wrap_WavevectorInfo_getQ, METH_O, "\n"
 		"WavevectorInfo_getQ(WavevectorInfo self) -> cvector_t\n"
-		"\n"
 		"cvector_t WavevectorInfo::getQ() const\n"
 		"\n"
 		""},
-	 { (char *)"WavevectorInfo_getWavelength", _wrap_WavevectorInfo_getWavelength, METH_VARARGS, (char *)"\n"
+	 { "WavevectorInfo_getWavelength", _wrap_WavevectorInfo_getWavelength, METH_O, "\n"
 		"WavevectorInfo_getWavelength(WavevectorInfo self) -> double\n"
-		"\n"
 		"double WavevectorInfo::getWavelength() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_WavevectorInfo", _wrap_delete_WavevectorInfo, METH_VARARGS, (char *)"delete_WavevectorInfo(WavevectorInfo self)"},
-	 { (char *)"WavevectorInfo_swigregister", WavevectorInfo_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Beam", _wrap_new_Beam, METH_VARARGS, (char *)"\n"
+	 { "delete_WavevectorInfo", _wrap_delete_WavevectorInfo, METH_O, "delete_WavevectorInfo(WavevectorInfo self)"},
+	 { "WavevectorInfo_swigregister", WavevectorInfo_swigregister, METH_O, NULL},
+	 { "WavevectorInfo_swiginit", WavevectorInfo_swiginit, METH_VARARGS, NULL},
+	 { "new_Beam", _wrap_new_Beam, METH_VARARGS, "\n"
 		"Beam()\n"
 		"new_Beam(Beam other) -> Beam\n"
-		"\n"
 		"Beam::Beam(const Beam &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Beam", _wrap_delete_Beam, METH_VARARGS, (char *)"\n"
+	 { "delete_Beam", _wrap_delete_Beam, METH_O, "\n"
 		"delete_Beam(Beam self)\n"
-		"\n"
 		"Beam::~Beam()\n"
 		"\n"
 		""},
-	 { (char *)"Beam_getCentralK", _wrap_Beam_getCentralK, METH_VARARGS, (char *)"\n"
+	 { "Beam_getCentralK", _wrap_Beam_getCentralK, METH_O, "\n"
 		"Beam_getCentralK(Beam self) -> kvector_t\n"
-		"\n"
 		"kvector_t Beam::getCentralK() const\n"
 		"\n"
 		"Returns the wavevector. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_setCentralK", _wrap_Beam_setCentralK, METH_VARARGS, (char *)"\n"
+	 { "Beam_setCentralK", _wrap_Beam_setCentralK, METH_VARARGS, "\n"
 		"Beam_setCentralK(Beam self, double wavelength, double alpha_i, double phi_i)\n"
-		"\n"
 		"void Beam::setCentralK(double wavelength, double alpha_i, double phi_i)\n"
 		"\n"
 		"Sets the wavevector in terms of wavelength and incoming angles. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_getIntensity", _wrap_Beam_getIntensity, METH_VARARGS, (char *)"\n"
+	 { "Beam_getIntensity", _wrap_Beam_getIntensity, METH_O, "\n"
 		"Beam_getIntensity(Beam self) -> double\n"
-		"\n"
 		"double Beam::getIntensity() const\n"
 		"\n"
 		"Returns the beam intensity in neutrons/sec. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_setIntensity", _wrap_Beam_setIntensity, METH_VARARGS, (char *)"\n"
+	 { "Beam_setIntensity", _wrap_Beam_setIntensity, METH_VARARGS, "\n"
 		"Beam_setIntensity(Beam self, double intensity)\n"
-		"\n"
 		"void Beam::setIntensity(double intensity)\n"
 		"\n"
 		"Sets the beam intensity in neutrons/sec. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_footprintFactor", _wrap_Beam_footprintFactor, METH_VARARGS, (char *)"\n"
+	 { "Beam_footprintFactor", _wrap_Beam_footprintFactor, METH_O, "\n"
 		"Beam_footprintFactor(Beam self) -> IFootprintFactor\n"
-		"\n"
 		"const IFootprintFactor * Beam::footprintFactor() const\n"
 		"\n"
 		"Returns footprint factor. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_setFootprintFactor", _wrap_Beam_setFootprintFactor, METH_VARARGS, (char *)"\n"
+	 { "Beam_setFootprintFactor", _wrap_Beam_setFootprintFactor, METH_VARARGS, "\n"
 		"Beam_setFootprintFactor(Beam self, IFootprintFactor shape_factor)\n"
-		"\n"
 		"void Beam::setFootprintFactor(const IFootprintFactor &shape_factor)\n"
 		"\n"
 		"Sets footprint factor to the beam. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_setWidthRatio", _wrap_Beam_setWidthRatio, METH_VARARGS, (char *)"\n"
+	 { "Beam_setWidthRatio", _wrap_Beam_setWidthRatio, METH_VARARGS, "\n"
 		"Beam_setWidthRatio(Beam self, double width_ratio)\n"
-		"\n"
 		"void Beam::setWidthRatio(double width_ratio)\n"
 		"\n"
 		"Sets beam to sample width ratio in footprint factor. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_setPolarization", _wrap_Beam_setPolarization, METH_VARARGS, (char *)"\n"
+	 { "Beam_setPolarization", _wrap_Beam_setPolarization, METH_VARARGS, "\n"
 		"Beam_setPolarization(Beam self, kvector_t bloch_vector)\n"
-		"\n"
 		"void Beam::setPolarization(const kvector_t bloch_vector)\n"
 		"\n"
 		"Sets the polarization density matrix according to the given Bloch vector. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_getBlochVector", _wrap_Beam_getBlochVector, METH_VARARGS, (char *)"\n"
+	 { "Beam_getBlochVector", _wrap_Beam_getBlochVector, METH_O, "\n"
 		"Beam_getBlochVector(Beam self) -> kvector_t\n"
-		"\n"
 		"kvector_t Beam::getBlochVector() const\n"
 		"\n"
 		""},
-	 { (char *)"Beam_getWavelength", _wrap_Beam_getWavelength, METH_VARARGS, (char *)"\n"
+	 { "Beam_getWavelength", _wrap_Beam_getWavelength, METH_O, "\n"
 		"Beam_getWavelength(Beam self) -> double\n"
-		"\n"
 		"double Beam::getWavelength() const\n"
 		"\n"
 		""},
-	 { (char *)"Beam_getAlpha", _wrap_Beam_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "Beam_getAlpha", _wrap_Beam_getAlpha, METH_O, "\n"
 		"Beam_getAlpha(Beam self) -> double\n"
-		"\n"
 		"double Beam::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"Beam_getPhi", _wrap_Beam_getPhi, METH_VARARGS, (char *)"\n"
+	 { "Beam_getPhi", _wrap_Beam_getPhi, METH_O, "\n"
 		"Beam_getPhi(Beam self) -> double\n"
-		"\n"
 		"double Beam::getPhi() const\n"
 		"\n"
 		""},
-	 { (char *)"Beam_accept", _wrap_Beam_accept, METH_VARARGS, (char *)"\n"
+	 { "Beam_accept", _wrap_Beam_accept, METH_VARARGS, "\n"
 		"Beam_accept(Beam self, INodeVisitor visitor)\n"
-		"\n"
 		"void Beam::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Beam_getChildren", _wrap_Beam_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Beam_getChildren", _wrap_Beam_getChildren, METH_O, "\n"
 		"Beam_getChildren(Beam self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Beam::getChildren() const override\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"Beam_swigregister", Beam_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Bin1D", _wrap_new_Bin1D, METH_VARARGS, (char *)"\n"
+	 { "Beam_swigregister", Beam_swigregister, METH_O, NULL},
+	 { "Beam_swiginit", Beam_swiginit, METH_VARARGS, NULL},
+	 { "new_Bin1D", _wrap_new_Bin1D, METH_VARARGS, "\n"
 		"Bin1D()\n"
 		"new_Bin1D(double lower, double upper) -> Bin1D\n"
-		"\n"
 		"Bin1D::Bin1D(double lower, double upper)\n"
 		"\n"
 		""},
-	 { (char *)"Bin1D_m_lower_set", _wrap_Bin1D_m_lower_set, METH_VARARGS, (char *)"Bin1D_m_lower_set(Bin1D self, double m_lower)"},
-	 { (char *)"Bin1D_m_lower_get", _wrap_Bin1D_m_lower_get, METH_VARARGS, (char *)"Bin1D_m_lower_get(Bin1D self) -> double"},
-	 { (char *)"Bin1D_m_upper_set", _wrap_Bin1D_m_upper_set, METH_VARARGS, (char *)"Bin1D_m_upper_set(Bin1D self, double m_upper)"},
-	 { (char *)"Bin1D_m_upper_get", _wrap_Bin1D_m_upper_get, METH_VARARGS, (char *)"Bin1D_m_upper_get(Bin1D self) -> double"},
-	 { (char *)"Bin1D_getMidPoint", _wrap_Bin1D_getMidPoint, METH_VARARGS, (char *)"\n"
+	 { "Bin1D_m_lower_set", _wrap_Bin1D_m_lower_set, METH_VARARGS, "Bin1D_m_lower_set(Bin1D self, double m_lower)"},
+	 { "Bin1D_m_lower_get", _wrap_Bin1D_m_lower_get, METH_O, "Bin1D_m_lower_get(Bin1D self) -> double"},
+	 { "Bin1D_m_upper_set", _wrap_Bin1D_m_upper_set, METH_VARARGS, "Bin1D_m_upper_set(Bin1D self, double m_upper)"},
+	 { "Bin1D_m_upper_get", _wrap_Bin1D_m_upper_get, METH_O, "Bin1D_m_upper_get(Bin1D self) -> double"},
+	 { "Bin1D_getMidPoint", _wrap_Bin1D_getMidPoint, METH_O, "\n"
 		"Bin1D_getMidPoint(Bin1D self) -> double\n"
-		"\n"
 		"double Bin1D::getMidPoint() const\n"
 		"\n"
 		""},
-	 { (char *)"Bin1D_getBinSize", _wrap_Bin1D_getBinSize, METH_VARARGS, (char *)"\n"
+	 { "Bin1D_getBinSize", _wrap_Bin1D_getBinSize, METH_O, "\n"
 		"Bin1D_getBinSize(Bin1D self) -> double\n"
-		"\n"
 		"double Bin1D::getBinSize() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_Bin1D", _wrap_delete_Bin1D, METH_VARARGS, (char *)"delete_Bin1D(Bin1D self)"},
-	 { (char *)"Bin1D_swigregister", Bin1D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"BinContains", _wrap_BinContains, METH_VARARGS, (char *)"\n"
+	 { "delete_Bin1D", _wrap_delete_Bin1D, METH_O, "delete_Bin1D(Bin1D self)"},
+	 { "Bin1D_swigregister", Bin1D_swigregister, METH_O, NULL},
+	 { "Bin1D_swiginit", Bin1D_swiginit, METH_VARARGS, NULL},
+	 { "BinContains", _wrap_BinContains, METH_VARARGS, "\n"
 		"BinContains(Bin1D bin, double value) -> bool\n"
-		"\n"
 		"bool BinContains(const Bin1D &bin, double value)\n"
 		"\n"
 		"Checks if value is contained in bin: value in [m_lower, m_upper) \n"
 		"\n"
 		""},
-	 { (char *)"new_Bin1DKVector", _wrap_new_Bin1DKVector, METH_VARARGS, (char *)"\n"
+	 { "new_Bin1DKVector", _wrap_new_Bin1DKVector, METH_VARARGS, "\n"
 		"Bin1DKVector()\n"
 		"Bin1DKVector(kvector_t lower, kvector_t upper)\n"
 		"new_Bin1DKVector(double wavelength, Bin1D alpha_bin, Bin1D phi_bin) -> Bin1DKVector\n"
-		"\n"
 		"Bin1DKVector::Bin1DKVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin)\n"
 		"\n"
 		"creation on  Bin1DKVector from alpha and phi bins \n"
 		"\n"
 		""},
-	 { (char *)"Bin1DKVector_getMidPoint", _wrap_Bin1DKVector_getMidPoint, METH_VARARGS, (char *)"\n"
+	 { "Bin1DKVector_getMidPoint", _wrap_Bin1DKVector_getMidPoint, METH_O, "\n"
 		"Bin1DKVector_getMidPoint(Bin1DKVector self) -> kvector_t\n"
-		"\n"
 		"kvector_t Bin1DKVector::getMidPoint() const\n"
 		"\n"
 		""},
-	 { (char *)"Bin1DKVector_getDelta", _wrap_Bin1DKVector_getDelta, METH_VARARGS, (char *)"\n"
+	 { "Bin1DKVector_getDelta", _wrap_Bin1DKVector_getDelta, METH_O, "\n"
 		"Bin1DKVector_getDelta(Bin1DKVector self) -> kvector_t\n"
-		"\n"
 		"kvector_t Bin1DKVector::getDelta() const\n"
 		"\n"
 		""},
-	 { (char *)"Bin1DKVector_m_q_lower_set", _wrap_Bin1DKVector_m_q_lower_set, METH_VARARGS, (char *)"Bin1DKVector_m_q_lower_set(Bin1DKVector self, kvector_t m_q_lower)"},
-	 { (char *)"Bin1DKVector_m_q_lower_get", _wrap_Bin1DKVector_m_q_lower_get, METH_VARARGS, (char *)"Bin1DKVector_m_q_lower_get(Bin1DKVector self) -> kvector_t"},
-	 { (char *)"Bin1DKVector_m_q_upper_set", _wrap_Bin1DKVector_m_q_upper_set, METH_VARARGS, (char *)"Bin1DKVector_m_q_upper_set(Bin1DKVector self, kvector_t m_q_upper)"},
-	 { (char *)"Bin1DKVector_m_q_upper_get", _wrap_Bin1DKVector_m_q_upper_get, METH_VARARGS, (char *)"Bin1DKVector_m_q_upper_get(Bin1DKVector self) -> kvector_t"},
-	 { (char *)"delete_Bin1DKVector", _wrap_delete_Bin1DKVector, METH_VARARGS, (char *)"delete_Bin1DKVector(Bin1DKVector self)"},
-	 { (char *)"Bin1DKVector_swigregister", Bin1DKVector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Bin1DCVector", _wrap_new_Bin1DCVector, METH_VARARGS, (char *)"\n"
+	 { "Bin1DKVector_m_q_lower_set", _wrap_Bin1DKVector_m_q_lower_set, METH_VARARGS, "Bin1DKVector_m_q_lower_set(Bin1DKVector self, kvector_t m_q_lower)"},
+	 { "Bin1DKVector_m_q_lower_get", _wrap_Bin1DKVector_m_q_lower_get, METH_O, "Bin1DKVector_m_q_lower_get(Bin1DKVector self) -> kvector_t"},
+	 { "Bin1DKVector_m_q_upper_set", _wrap_Bin1DKVector_m_q_upper_set, METH_VARARGS, "Bin1DKVector_m_q_upper_set(Bin1DKVector self, kvector_t m_q_upper)"},
+	 { "Bin1DKVector_m_q_upper_get", _wrap_Bin1DKVector_m_q_upper_get, METH_O, "Bin1DKVector_m_q_upper_get(Bin1DKVector self) -> kvector_t"},
+	 { "delete_Bin1DKVector", _wrap_delete_Bin1DKVector, METH_O, "delete_Bin1DKVector(Bin1DKVector self)"},
+	 { "Bin1DKVector_swigregister", Bin1DKVector_swigregister, METH_O, NULL},
+	 { "Bin1DKVector_swiginit", Bin1DKVector_swiginit, METH_VARARGS, NULL},
+	 { "new_Bin1DCVector", _wrap_new_Bin1DCVector, METH_VARARGS, "\n"
 		"Bin1DCVector()\n"
 		"Bin1DCVector(cvector_t lower, cvector_t upper)\n"
 		"new_Bin1DCVector(double wavelength, Bin1D alpha_bin, Bin1D phi_bin) -> Bin1DCVector\n"
-		"\n"
 		"Bin1DCVector::Bin1DCVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin)\n"
 		"\n"
 		"creation on  Bin1DCVector from alpha and phi bins \n"
 		"\n"
 		""},
-	 { (char *)"Bin1DCVector_getMidPoint", _wrap_Bin1DCVector_getMidPoint, METH_VARARGS, (char *)"\n"
+	 { "Bin1DCVector_getMidPoint", _wrap_Bin1DCVector_getMidPoint, METH_O, "\n"
 		"Bin1DCVector_getMidPoint(Bin1DCVector self) -> cvector_t\n"
-		"\n"
 		"cvector_t Bin1DCVector::getMidPoint() const\n"
 		"\n"
 		""},
-	 { (char *)"Bin1DCVector_getDelta", _wrap_Bin1DCVector_getDelta, METH_VARARGS, (char *)"\n"
+	 { "Bin1DCVector_getDelta", _wrap_Bin1DCVector_getDelta, METH_O, "\n"
 		"Bin1DCVector_getDelta(Bin1DCVector self) -> cvector_t\n"
-		"\n"
 		"cvector_t Bin1DCVector::getDelta() const\n"
 		"\n"
 		""},
-	 { (char *)"Bin1DCVector_m_q_lower_set", _wrap_Bin1DCVector_m_q_lower_set, METH_VARARGS, (char *)"Bin1DCVector_m_q_lower_set(Bin1DCVector self, cvector_t m_q_lower)"},
-	 { (char *)"Bin1DCVector_m_q_lower_get", _wrap_Bin1DCVector_m_q_lower_get, METH_VARARGS, (char *)"Bin1DCVector_m_q_lower_get(Bin1DCVector self) -> cvector_t"},
-	 { (char *)"Bin1DCVector_m_q_upper_set", _wrap_Bin1DCVector_m_q_upper_set, METH_VARARGS, (char *)"Bin1DCVector_m_q_upper_set(Bin1DCVector self, cvector_t m_q_upper)"},
-	 { (char *)"Bin1DCVector_m_q_upper_get", _wrap_Bin1DCVector_m_q_upper_get, METH_VARARGS, (char *)"Bin1DCVector_m_q_upper_get(Bin1DCVector self) -> cvector_t"},
-	 { (char *)"delete_Bin1DCVector", _wrap_delete_Bin1DCVector, METH_VARARGS, (char *)"delete_Bin1DCVector(Bin1DCVector self)"},
-	 { (char *)"Bin1DCVector_swigregister", Bin1DCVector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IAxis_clone", _wrap_IAxis_clone, METH_VARARGS, (char *)"\n"
+	 { "Bin1DCVector_m_q_lower_set", _wrap_Bin1DCVector_m_q_lower_set, METH_VARARGS, "Bin1DCVector_m_q_lower_set(Bin1DCVector self, cvector_t m_q_lower)"},
+	 { "Bin1DCVector_m_q_lower_get", _wrap_Bin1DCVector_m_q_lower_get, METH_O, "Bin1DCVector_m_q_lower_get(Bin1DCVector self) -> cvector_t"},
+	 { "Bin1DCVector_m_q_upper_set", _wrap_Bin1DCVector_m_q_upper_set, METH_VARARGS, "Bin1DCVector_m_q_upper_set(Bin1DCVector self, cvector_t m_q_upper)"},
+	 { "Bin1DCVector_m_q_upper_get", _wrap_Bin1DCVector_m_q_upper_get, METH_O, "Bin1DCVector_m_q_upper_get(Bin1DCVector self) -> cvector_t"},
+	 { "delete_Bin1DCVector", _wrap_delete_Bin1DCVector, METH_O, "delete_Bin1DCVector(Bin1DCVector self)"},
+	 { "Bin1DCVector_swigregister", Bin1DCVector_swigregister, METH_O, NULL},
+	 { "Bin1DCVector_swiginit", Bin1DCVector_swiginit, METH_VARARGS, NULL},
+	 { "IAxis_clone", _wrap_IAxis_clone, METH_O, "\n"
 		"IAxis_clone(IAxis self) -> IAxis\n"
-		"\n"
 		"virtual IAxis* IAxis::clone() const =0\n"
 		"\n"
 		"clone function \n"
 		"\n"
 		""},
-	 { (char *)"delete_IAxis", _wrap_delete_IAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_IAxis", _wrap_delete_IAxis, METH_O, "\n"
 		"delete_IAxis(IAxis self)\n"
-		"\n"
 		"virtual IAxis::~IAxis()\n"
 		"\n"
 		"destructor \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_size", _wrap_IAxis_size, METH_VARARGS, (char *)"\n"
+	 { "IAxis_size", _wrap_IAxis_size, METH_O, "\n"
 		"IAxis_size(IAxis self) -> size_t\n"
-		"\n"
 		"virtual size_t IAxis::size() const =0\n"
 		"\n"
 		"retrieve the number of bins \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getName", _wrap_IAxis_getName, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getName", _wrap_IAxis_getName, METH_O, "\n"
 		"IAxis_getName(IAxis self) -> std::string\n"
-		"\n"
 		"std::string IAxis::getName() const\n"
 		"\n"
 		"retrieve the label of the axis \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_setName", _wrap_IAxis_setName, METH_VARARGS, (char *)"\n"
+	 { "IAxis_setName", _wrap_IAxis_setName, METH_VARARGS, "\n"
 		"IAxis_setName(IAxis self, std::string name)\n"
-		"\n"
 		"void IAxis::setName(std::string name)\n"
 		"\n"
 		"Sets the axis label. \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getBin", _wrap_IAxis_getBin, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getBin", _wrap_IAxis_getBin, METH_VARARGS, "\n"
 		"IAxis_getBin(IAxis self, size_t index) -> Bin1D\n"
-		"\n"
 		"virtual Bin1D IAxis::getBin(size_t index) const =0\n"
 		"\n"
 		"retrieve a 1d bin for the given index \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getMin", _wrap_IAxis_getMin, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getMin", _wrap_IAxis_getMin, METH_O, "\n"
 		"IAxis_getMin(IAxis self) -> double\n"
-		"\n"
 		"virtual double IAxis::getMin() const =0\n"
 		"\n"
 		"Returns value of first point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getMax", _wrap_IAxis_getMax, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getMax", _wrap_IAxis_getMax, METH_O, "\n"
 		"IAxis_getMax(IAxis self) -> double\n"
-		"\n"
 		"virtual double IAxis::getMax() const =0\n"
 		"\n"
 		"Returns value of last point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getBinCenter", _wrap_IAxis_getBinCenter, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getBinCenter", _wrap_IAxis_getBinCenter, METH_VARARGS, "\n"
 		"IAxis_getBinCenter(IAxis self, size_t index) -> double\n"
-		"\n"
 		"virtual double IAxis::getBinCenter(size_t index) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IAxis_findClosestIndex", _wrap_IAxis_findClosestIndex, METH_VARARGS, (char *)"\n"
+	 { "IAxis_findClosestIndex", _wrap_IAxis_findClosestIndex, METH_VARARGS, "\n"
 		"IAxis_findClosestIndex(IAxis self, double value) -> size_t\n"
-		"\n"
 		"virtual size_t IAxis::findClosestIndex(double value) const =0\n"
 		"\n"
 		"find bin index which is best match for given value \n"
 		"\n"
 		""},
-	 { (char *)"IAxis___eq__", _wrap_IAxis___eq__, METH_VARARGS, (char *)"IAxis___eq__(IAxis self, IAxis right) -> bool"},
-	 { (char *)"IAxis___ne__", _wrap_IAxis___ne__, METH_VARARGS, (char *)"IAxis___ne__(IAxis self, IAxis right) -> bool"},
-	 { (char *)"IAxis_getBinCenters", _wrap_IAxis_getBinCenters, METH_VARARGS, (char *)"\n"
+	 { "IAxis___eq__", _wrap_IAxis___eq__, METH_VARARGS, "IAxis___eq__(IAxis self, IAxis right) -> bool"},
+	 { "IAxis___ne__", _wrap_IAxis___ne__, METH_VARARGS, "IAxis___ne__(IAxis self, IAxis right) -> bool"},
+	 { "IAxis_getBinCenters", _wrap_IAxis_getBinCenters, METH_O, "\n"
 		"IAxis_getBinCenters(IAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > IAxis::getBinCenters() const\n"
 		"\n"
 		""},
-	 { (char *)"IAxis_getBinBoundaries", _wrap_IAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
+	 { "IAxis_getBinBoundaries", _wrap_IAxis_getBinBoundaries, METH_O, "\n"
 		"IAxis_getBinBoundaries(IAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > IAxis::getBinBoundaries() const\n"
 		"\n"
 		""},
-	 { (char *)"IAxis_createClippedAxis", _wrap_IAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
+	 { "IAxis_createClippedAxis", _wrap_IAxis_createClippedAxis, METH_VARARGS, "\n"
 		"IAxis_createClippedAxis(IAxis self, double left, double right) -> IAxis\n"
-		"\n"
 		"IAxis * IAxis::createClippedAxis(double left, double right) const\n"
 		"\n"
 		"Creates a new clipped axis. \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_contains", _wrap_IAxis_contains, METH_VARARGS, (char *)"\n"
+	 { "IAxis_contains", _wrap_IAxis_contains, METH_VARARGS, "\n"
 		"IAxis_contains(IAxis self, double value) -> bool\n"
-		"\n"
 		"bool IAxis::contains(double value) const\n"
 		"\n"
 		"Returns true if axis contains given point. \n"
 		"\n"
 		""},
-	 { (char *)"IAxis_swigregister", IAxis_swigregister, METH_VARARGS, NULL},
-	 { (char *)"HaveSameNameAndShape", _wrap_HaveSameNameAndShape, METH_VARARGS, (char *)"\n"
+	 { "IAxis_swigregister", IAxis_swigregister, METH_O, NULL},
+	 { "HaveSameNameAndShape", _wrap_HaveSameNameAndShape, METH_VARARGS, "\n"
 		"HaveSameNameAndShape(IAxis left, IAxis right) -> bool\n"
-		"\n"
 		"bool HaveSameNameAndShape(const IAxis &left, const IAxis &right)\n"
 		"\n"
 		"global helper function for comparison of axes \n"
 		"\n"
 		""},
-	 { (char *)"new_VariableBinAxis", _wrap_new_VariableBinAxis, METH_VARARGS, (char *)"\n"
+	 { "new_VariableBinAxis", _wrap_new_VariableBinAxis, METH_VARARGS, "\n"
 		"new_VariableBinAxis(std::string const & name, size_t nbins, vdouble1d_t bin_boundaries) -> VariableBinAxis\n"
-		"\n"
 		"VariableBinAxis::VariableBinAxis(const std::string &name, size_t nbins, const std::vector< double > &bin_boundaries)\n"
 		"\n"
 		"VariableBinAxis constructor.\n"
@@ -126403,91 +123678,80 @@ static PyMethodDef SwigMethods[] = {
 		"Array of size nbins+1 containing low-edges for each bin and upper edge of last bin. \n"
 		"\n"
 		""},
-	 { (char *)"delete_VariableBinAxis", _wrap_delete_VariableBinAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_VariableBinAxis", _wrap_delete_VariableBinAxis, METH_O, "\n"
 		"delete_VariableBinAxis(VariableBinAxis self)\n"
-		"\n"
 		"virtual VariableBinAxis::~VariableBinAxis()\n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_clone", _wrap_VariableBinAxis_clone, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_clone", _wrap_VariableBinAxis_clone, METH_O, "\n"
 		"VariableBinAxis_clone(VariableBinAxis self) -> VariableBinAxis\n"
-		"\n"
 		"VariableBinAxis * VariableBinAxis::clone() const\n"
 		"\n"
 		"clone function \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_size", _wrap_VariableBinAxis_size, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_size", _wrap_VariableBinAxis_size, METH_O, "\n"
 		"VariableBinAxis_size(VariableBinAxis self) -> size_t\n"
-		"\n"
 		"size_t VariableBinAxis::size() const\n"
 		"\n"
 		"retrieve the number of bins \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getBin", _wrap_VariableBinAxis_getBin, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getBin", _wrap_VariableBinAxis_getBin, METH_VARARGS, "\n"
 		"VariableBinAxis_getBin(VariableBinAxis self, size_t index) -> Bin1D\n"
-		"\n"
 		"Bin1D VariableBinAxis::getBin(size_t index) const\n"
 		"\n"
 		"retrieve a 1d bin for the given index \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getMin", _wrap_VariableBinAxis_getMin, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getMin", _wrap_VariableBinAxis_getMin, METH_O, "\n"
 		"VariableBinAxis_getMin(VariableBinAxis self) -> double\n"
-		"\n"
 		"double VariableBinAxis::getMin() const\n"
 		"\n"
 		"Returns value of first point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getMax", _wrap_VariableBinAxis_getMax, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getMax", _wrap_VariableBinAxis_getMax, METH_O, "\n"
 		"VariableBinAxis_getMax(VariableBinAxis self) -> double\n"
-		"\n"
 		"double VariableBinAxis::getMax() const\n"
 		"\n"
 		"Returns value of last point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getBinCenter", _wrap_VariableBinAxis_getBinCenter, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getBinCenter", _wrap_VariableBinAxis_getBinCenter, METH_VARARGS, "\n"
 		"VariableBinAxis_getBinCenter(VariableBinAxis self, size_t index) -> double\n"
-		"\n"
 		"double VariableBinAxis::getBinCenter(size_t index) const\n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_findClosestIndex", _wrap_VariableBinAxis_findClosestIndex, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_findClosestIndex", _wrap_VariableBinAxis_findClosestIndex, METH_VARARGS, "\n"
 		"VariableBinAxis_findClosestIndex(VariableBinAxis self, double value) -> size_t\n"
-		"\n"
 		"size_t VariableBinAxis::findClosestIndex(double value) const\n"
 		"\n"
 		"find bin index which is best match for given value \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getBinCenters", _wrap_VariableBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getBinCenters", _wrap_VariableBinAxis_getBinCenters, METH_O, "\n"
 		"VariableBinAxis_getBinCenters(VariableBinAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > VariableBinAxis::getBinCenters() const\n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_getBinBoundaries", _wrap_VariableBinAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_getBinBoundaries", _wrap_VariableBinAxis_getBinBoundaries, METH_O, "\n"
 		"VariableBinAxis_getBinBoundaries(VariableBinAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector<double> VariableBinAxis::getBinBoundaries() const\n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis_createClippedAxis", _wrap_VariableBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis_createClippedAxis", _wrap_VariableBinAxis_createClippedAxis, METH_VARARGS, "\n"
 		"VariableBinAxis_createClippedAxis(VariableBinAxis self, double left, double right) -> VariableBinAxis\n"
-		"\n"
 		"VariableBinAxis * VariableBinAxis::createClippedAxis(double left, double right) const\n"
 		"\n"
 		"Creates a new clipped axis. \n"
 		"\n"
 		""},
-	 { (char *)"VariableBinAxis___getitem__", _wrap_VariableBinAxis___getitem__, METH_VARARGS, (char *)"VariableBinAxis___getitem__(VariableBinAxis self, unsigned int i) -> double"},
-	 { (char *)"VariableBinAxis_swigregister", VariableBinAxis_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ConstKBinAxis", _wrap_new_ConstKBinAxis, METH_VARARGS, (char *)"\n"
+	 { "VariableBinAxis___getitem__", _wrap_VariableBinAxis___getitem__, METH_VARARGS, "VariableBinAxis___getitem__(VariableBinAxis self, unsigned int i) -> double"},
+	 { "VariableBinAxis_swigregister", VariableBinAxis_swigregister, METH_O, NULL},
+	 { "VariableBinAxis_swiginit", VariableBinAxis_swiginit, METH_VARARGS, NULL},
+	 { "new_ConstKBinAxis", _wrap_new_ConstKBinAxis, METH_VARARGS, "\n"
 		"new_ConstKBinAxis(std::string const & name, size_t nbins, double start, double end) -> ConstKBinAxis\n"
-		"\n"
 		"ConstKBinAxis::ConstKBinAxis(const std::string &name, size_t nbins, double start, double end)\n"
 		"\n"
 		"ConstKBinAxis constructor.\n"
@@ -126508,32 +123772,29 @@ static PyMethodDef SwigMethods[] = {
 		"upper edge of last bin \n"
 		"\n"
 		""},
-	 { (char *)"delete_ConstKBinAxis", _wrap_delete_ConstKBinAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_ConstKBinAxis", _wrap_delete_ConstKBinAxis, METH_O, "\n"
 		"delete_ConstKBinAxis(ConstKBinAxis self)\n"
-		"\n"
 		"ConstKBinAxis::~ConstKBinAxis() final\n"
 		"\n"
 		""},
-	 { (char *)"ConstKBinAxis_clone", _wrap_ConstKBinAxis_clone, METH_VARARGS, (char *)"\n"
+	 { "ConstKBinAxis_clone", _wrap_ConstKBinAxis_clone, METH_O, "\n"
 		"ConstKBinAxis_clone(ConstKBinAxis self) -> ConstKBinAxis\n"
-		"\n"
 		"ConstKBinAxis * ConstKBinAxis::clone() const final\n"
 		"\n"
 		"clone function \n"
 		"\n"
 		""},
-	 { (char *)"ConstKBinAxis_createClippedAxis", _wrap_ConstKBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
+	 { "ConstKBinAxis_createClippedAxis", _wrap_ConstKBinAxis_createClippedAxis, METH_VARARGS, "\n"
 		"ConstKBinAxis_createClippedAxis(ConstKBinAxis self, double left, double right) -> ConstKBinAxis\n"
-		"\n"
 		"ConstKBinAxis * ConstKBinAxis::createClippedAxis(double left, double right) const final\n"
 		"\n"
 		"Creates a new clipped axis. \n"
 		"\n"
 		""},
-	 { (char *)"ConstKBinAxis_swigregister", ConstKBinAxis_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_CustomBinAxis", _wrap_new_CustomBinAxis, METH_VARARGS, (char *)"\n"
+	 { "ConstKBinAxis_swigregister", ConstKBinAxis_swigregister, METH_O, NULL},
+	 { "ConstKBinAxis_swiginit", ConstKBinAxis_swiginit, METH_VARARGS, NULL},
+	 { "new_CustomBinAxis", _wrap_new_CustomBinAxis, METH_VARARGS, "\n"
 		"new_CustomBinAxis(std::string const & name, size_t nbins, double start, double end) -> CustomBinAxis\n"
-		"\n"
 		"CustomBinAxis::CustomBinAxis(const std::string &name, size_t nbins, double start, double end)\n"
 		"\n"
 		"CustomBinAxis constructor.\n"
@@ -126554,87 +123815,77 @@ static PyMethodDef SwigMethods[] = {
 		"center of last bin (IsGisaxs convention) \n"
 		"\n"
 		""},
-	 { (char *)"delete_CustomBinAxis", _wrap_delete_CustomBinAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_CustomBinAxis", _wrap_delete_CustomBinAxis, METH_O, "\n"
 		"delete_CustomBinAxis(CustomBinAxis self)\n"
-		"\n"
 		"virtual CustomBinAxis::~CustomBinAxis()\n"
 		"\n"
 		""},
-	 { (char *)"CustomBinAxis_clone", _wrap_CustomBinAxis_clone, METH_VARARGS, (char *)"\n"
+	 { "CustomBinAxis_clone", _wrap_CustomBinAxis_clone, METH_O, "\n"
 		"CustomBinAxis_clone(CustomBinAxis self) -> CustomBinAxis\n"
-		"\n"
 		"CustomBinAxis * CustomBinAxis::clone() const\n"
 		"\n"
 		"clone function \n"
 		"\n"
 		""},
-	 { (char *)"CustomBinAxis_getBin", _wrap_CustomBinAxis_getBin, METH_VARARGS, (char *)"\n"
+	 { "CustomBinAxis_getBin", _wrap_CustomBinAxis_getBin, METH_VARARGS, "\n"
 		"CustomBinAxis_getBin(CustomBinAxis self, size_t index) -> Bin1D\n"
-		"\n"
 		"Bin1D CustomBinAxis::getBin(size_t index) const\n"
 		"\n"
 		"retrieve a 1d bin for the given index \n"
 		"\n"
 		""},
-	 { (char *)"CustomBinAxis_getBinCenters", _wrap_CustomBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
+	 { "CustomBinAxis_getBinCenters", _wrap_CustomBinAxis_getBinCenters, METH_O, "\n"
 		"CustomBinAxis_getBinCenters(CustomBinAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > CustomBinAxis::getBinCenters() const\n"
 		"\n"
 		""},
-	 { (char *)"CustomBinAxis_createClippedAxis", _wrap_CustomBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
+	 { "CustomBinAxis_createClippedAxis", _wrap_CustomBinAxis_createClippedAxis, METH_VARARGS, "\n"
 		"CustomBinAxis_createClippedAxis(CustomBinAxis self, double left, double right) -> CustomBinAxis\n"
-		"\n"
 		"CustomBinAxis * CustomBinAxis::createClippedAxis(double left, double right) const\n"
 		"\n"
 		"Creates a new clipped axis. \n"
 		"\n"
 		""},
-	 { (char *)"CustomBinAxis_swigregister", CustomBinAxis_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IShape2D_clone", _wrap_IShape2D_clone, METH_VARARGS, (char *)"\n"
+	 { "CustomBinAxis_swigregister", CustomBinAxis_swigregister, METH_O, NULL},
+	 { "CustomBinAxis_swiginit", CustomBinAxis_swiginit, METH_VARARGS, NULL},
+	 { "IShape2D_clone", _wrap_IShape2D_clone, METH_O, "\n"
 		"IShape2D_clone(IShape2D self) -> IShape2D\n"
-		"\n"
 		"virtual IShape2D* IShape2D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IShape2D_contains", _wrap_IShape2D_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "IShape2D_contains", _wrap_IShape2D_contains, METH_VARARGS, "\n"
+		"IShape2D_contains(IShape2D self, double x, double y) -> bool\n"
 		"IShape2D_contains(IShape2D self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"virtual bool IShape2D::contains(const Bin1D &binx, const Bin1D &biny) const =0\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"delete_IShape2D", _wrap_delete_IShape2D, METH_VARARGS, (char *)"delete_IShape2D(IShape2D self)"},
-	 { (char *)"IShape2D_swigregister", IShape2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"ISample_clone", _wrap_ISample_clone, METH_VARARGS, (char *)"\n"
+	 { "delete_IShape2D", _wrap_delete_IShape2D, METH_O, "delete_IShape2D(IShape2D self)"},
+	 { "IShape2D_swigregister", IShape2D_swigregister, METH_O, NULL},
+	 { "ISample_clone", _wrap_ISample_clone, METH_O, "\n"
 		"ISample_clone(ISample self) -> ISample\n"
-		"\n"
 		"ISample* ISample::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ISample_material", _wrap_ISample_material, METH_VARARGS, (char *)"\n"
+	 { "ISample_material", _wrap_ISample_material, METH_O, "\n"
 		"ISample_material(ISample self) -> Material\n"
-		"\n"
 		"virtual const Material* ISample::material() const\n"
 		"\n"
 		"Returns nullptr, unless overwritten to return a specific material. \n"
 		"\n"
 		""},
-	 { (char *)"ISample_containedMaterials", _wrap_ISample_containedMaterials, METH_VARARGS, (char *)"\n"
+	 { "ISample_containedMaterials", _wrap_ISample_containedMaterials, METH_O, "\n"
 		"ISample_containedMaterials(ISample self) -> std::vector< Material const *,std::allocator< Material const * > >\n"
-		"\n"
 		"std::vector< const Material * > ISample::containedMaterials() const\n"
 		"\n"
 		"Returns set of unique materials contained in this  ISample. \n"
 		"\n"
 		""},
-	 { (char *)"new_ISample", _wrap_new_ISample, METH_VARARGS, (char *)"\n"
-		"new_ISample(PyObject * arg2) -> ISample\n"
-		"\n"
+	 { "new_ISample", _wrap_new_ISample, METH_O, "\n"
+		"new_ISample(PyObject * _self) -> ISample\n"
 		"\n"
 		"\n"
 		"Pure virtual base class for sample components and properties related to scattering.\n"
@@ -126642,539 +123893,468 @@ static PyMethodDef SwigMethods[] = {
 		"C++ includes: ISample.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_ISample", _wrap_delete_ISample, METH_VARARGS, (char *)"delete_ISample(ISample self)"},
-	 { (char *)"disown_ISample", _wrap_disown_ISample, METH_VARARGS, NULL},
-	 { (char *)"ISample_swigregister", ISample_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IChiSquaredModule", _wrap_delete_IChiSquaredModule, METH_VARARGS, (char *)"\n"
+	 { "delete_ISample", _wrap_delete_ISample, METH_O, "delete_ISample(ISample self)"},
+	 { "disown_ISample", _wrap_disown_ISample, METH_O, NULL},
+	 { "ISample_swigregister", ISample_swigregister, METH_O, NULL},
+	 { "ISample_swiginit", ISample_swiginit, METH_VARARGS, NULL},
+	 { "delete_IChiSquaredModule", _wrap_delete_IChiSquaredModule, METH_O, "\n"
 		"delete_IChiSquaredModule(IChiSquaredModule self)\n"
-		"\n"
 		"IChiSquaredModule::~IChiSquaredModule()\n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_clone", _wrap_IChiSquaredModule_clone, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_clone", _wrap_IChiSquaredModule_clone, METH_O, "\n"
 		"IChiSquaredModule_clone(IChiSquaredModule self) -> IChiSquaredModule\n"
-		"\n"
 		"virtual IChiSquaredModule* IChiSquaredModule::clone() const =0\n"
 		"\n"
 		"clone method \n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_varianceFunction", _wrap_IChiSquaredModule_varianceFunction, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_varianceFunction", _wrap_IChiSquaredModule_varianceFunction, METH_O, "\n"
 		"IChiSquaredModule_varianceFunction(IChiSquaredModule self) -> IVarianceFunction\n"
-		"\n"
 		"const IVarianceFunction * IChiSquaredModule::varianceFunction() const\n"
 		"\n"
 		"Returns squared function. \n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_setVarianceFunction", _wrap_IChiSquaredModule_setVarianceFunction, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_setVarianceFunction", _wrap_IChiSquaredModule_setVarianceFunction, METH_VARARGS, "\n"
 		"IChiSquaredModule_setVarianceFunction(IChiSquaredModule self, IVarianceFunction variance_function)\n"
-		"\n"
 		"void IChiSquaredModule::setVarianceFunction(const IVarianceFunction &variance_function)\n"
 		"\n"
 		"Sets squared function. \n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_getIntensityFunction", _wrap_IChiSquaredModule_getIntensityFunction, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_getIntensityFunction", _wrap_IChiSquaredModule_getIntensityFunction, METH_O, "\n"
 		"IChiSquaredModule_getIntensityFunction(IChiSquaredModule self) -> IIntensityFunction\n"
-		"\n"
 		"const IIntensityFunction * IChiSquaredModule::getIntensityFunction() const\n"
 		"\n"
 		"Returns data rescaler. \n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_setIntensityFunction", _wrap_IChiSquaredModule_setIntensityFunction, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_setIntensityFunction", _wrap_IChiSquaredModule_setIntensityFunction, METH_VARARGS, "\n"
 		"IChiSquaredModule_setIntensityFunction(IChiSquaredModule self, IIntensityFunction intensity_function)\n"
-		"\n"
 		"void IChiSquaredModule::setIntensityFunction(const IIntensityFunction &intensity_function)\n"
 		"\n"
 		"Sets data rescaler. \n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_residual", _wrap_IChiSquaredModule_residual, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_residual", _wrap_IChiSquaredModule_residual, METH_VARARGS, "\n"
 		"IChiSquaredModule_residual(IChiSquaredModule self, double a, double b, double weight) -> double\n"
-		"\n"
 		"virtual double IChiSquaredModule::residual(double a, double b, double weight)=0\n"
 		"\n"
 		""},
-	 { (char *)"IChiSquaredModule_swigregister", IChiSquaredModule_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IObserver", _wrap_delete_IObserver, METH_VARARGS, (char *)"\n"
+	 { "IChiSquaredModule_swigregister", IChiSquaredModule_swigregister, METH_O, NULL},
+	 { "delete_IObserver", _wrap_delete_IObserver, METH_O, "\n"
 		"delete_IObserver(IObserver self)\n"
-		"\n"
 		"IObserver::~IObserver()\n"
 		"\n"
 		""},
-	 { (char *)"IObserver_notify", _wrap_IObserver_notify, METH_VARARGS, (char *)"\n"
+	 { "IObserver_notify", _wrap_IObserver_notify, METH_VARARGS, "\n"
 		"IObserver_notify(IObserver self, IObservable subject)\n"
-		"\n"
 		"virtual void IObserver::notify(IObservable *subject)=0\n"
 		"\n"
 		"method which is used by observable subject to notify change in status \n"
 		"\n"
 		""},
-	 { (char *)"IObserver_swigregister", IObserver_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IObservable", _wrap_delete_IObservable, METH_VARARGS, (char *)"\n"
+	 { "IObserver_swigregister", IObserver_swigregister, METH_O, NULL},
+	 { "delete_IObservable", _wrap_delete_IObservable, METH_O, "\n"
 		"delete_IObservable(IObservable self)\n"
-		"\n"
 		"IObservable::~IObservable()\n"
 		"\n"
 		""},
-	 { (char *)"IObservable_attachObserver", _wrap_IObservable_attachObserver, METH_VARARGS, (char *)"\n"
+	 { "IObservable_attachObserver", _wrap_IObservable_attachObserver, METH_VARARGS, "\n"
 		"IObservable_attachObserver(IObservable self, IObservable::observer_t obj)\n"
-		"\n"
 		"void IObservable::attachObserver(observer_t obj)\n"
 		"\n"
 		"attach observer to the list of observers \n"
 		"\n"
 		""},
-	 { (char *)"IObservable_notifyObservers", _wrap_IObservable_notifyObservers, METH_VARARGS, (char *)"\n"
+	 { "IObservable_notifyObservers", _wrap_IObservable_notifyObservers, METH_O, "\n"
 		"IObservable_notifyObservers(IObservable self)\n"
-		"\n"
 		"void IObservable::notifyObservers()\n"
 		"\n"
 		"notify observers about change in status \n"
 		"\n"
 		""},
-	 { (char *)"new_IObservable", _wrap_new_IObservable, METH_VARARGS, (char *)"\n"
+	 { "new_IObservable", _wrap_new_IObservable, METH_NOARGS, "\n"
 		"new_IObservable() -> IObservable\n"
 		"\n"
 		"\n"
-		"\n"
 		"Observable interface from Observer pattern\n"
 		"\n"
 		"C++ includes: IObserver.h\n"
 		"\n"
 		""},
-	 { (char *)"IObservable_swigregister", IObservable_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IIntensityFunction", _wrap_delete_IIntensityFunction, METH_VARARGS, (char *)"\n"
+	 { "IObservable_swigregister", IObservable_swigregister, METH_O, NULL},
+	 { "IObservable_swiginit", IObservable_swiginit, METH_VARARGS, NULL},
+	 { "delete_IIntensityFunction", _wrap_delete_IIntensityFunction, METH_O, "\n"
 		"delete_IIntensityFunction(IIntensityFunction self)\n"
-		"\n"
 		"IIntensityFunction::~IIntensityFunction()\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityFunction_clone", _wrap_IIntensityFunction_clone, METH_VARARGS, (char *)"\n"
+	 { "IIntensityFunction_clone", _wrap_IIntensityFunction_clone, METH_O, "\n"
 		"IIntensityFunction_clone(IIntensityFunction self) -> IIntensityFunction\n"
-		"\n"
 		"virtual IIntensityFunction* IIntensityFunction::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityFunction_evaluate", _wrap_IIntensityFunction_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IIntensityFunction_evaluate", _wrap_IIntensityFunction_evaluate, METH_VARARGS, "\n"
 		"IIntensityFunction_evaluate(IIntensityFunction self, double value) -> double\n"
-		"\n"
 		"virtual double IIntensityFunction::evaluate(double value) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityFunction_swigregister", IIntensityFunction_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IntensityFunctionLog_clone", _wrap_IntensityFunctionLog_clone, METH_VARARGS, (char *)"\n"
+	 { "IIntensityFunction_swigregister", IIntensityFunction_swigregister, METH_O, NULL},
+	 { "IntensityFunctionLog_clone", _wrap_IntensityFunctionLog_clone, METH_O, "\n"
 		"IntensityFunctionLog_clone(IntensityFunctionLog self) -> IntensityFunctionLog\n"
-		"\n"
 		"IntensityFunctionLog * IntensityFunctionLog::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityFunctionLog_evaluate", _wrap_IntensityFunctionLog_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IntensityFunctionLog_evaluate", _wrap_IntensityFunctionLog_evaluate, METH_VARARGS, "\n"
 		"IntensityFunctionLog_evaluate(IntensityFunctionLog self, double value) -> double\n"
-		"\n"
 		"double IntensityFunctionLog::evaluate(double value) const\n"
 		"\n"
 		""},
-	 { (char *)"new_IntensityFunctionLog", _wrap_new_IntensityFunctionLog, METH_VARARGS, (char *)"\n"
+	 { "new_IntensityFunctionLog", _wrap_new_IntensityFunctionLog, METH_NOARGS, "\n"
 		"new_IntensityFunctionLog() -> IntensityFunctionLog\n"
 		"\n"
 		"\n"
-		"\n"
 		"Algorithm for applying log function to the measured intensity.\n"
 		"\n"
 		"C++ includes: IIntensityFunction.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityFunctionLog", _wrap_delete_IntensityFunctionLog, METH_VARARGS, (char *)"delete_IntensityFunctionLog(IntensityFunctionLog self)"},
-	 { (char *)"IntensityFunctionLog_swigregister", IntensityFunctionLog_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IntensityFunctionSqrt_clone", _wrap_IntensityFunctionSqrt_clone, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityFunctionLog", _wrap_delete_IntensityFunctionLog, METH_O, "delete_IntensityFunctionLog(IntensityFunctionLog self)"},
+	 { "IntensityFunctionLog_swigregister", IntensityFunctionLog_swigregister, METH_O, NULL},
+	 { "IntensityFunctionLog_swiginit", IntensityFunctionLog_swiginit, METH_VARARGS, NULL},
+	 { "IntensityFunctionSqrt_clone", _wrap_IntensityFunctionSqrt_clone, METH_O, "\n"
 		"IntensityFunctionSqrt_clone(IntensityFunctionSqrt self) -> IntensityFunctionSqrt\n"
-		"\n"
 		"IntensityFunctionSqrt * IntensityFunctionSqrt::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityFunctionSqrt_evaluate", _wrap_IntensityFunctionSqrt_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IntensityFunctionSqrt_evaluate", _wrap_IntensityFunctionSqrt_evaluate, METH_VARARGS, "\n"
 		"IntensityFunctionSqrt_evaluate(IntensityFunctionSqrt self, double value) -> double\n"
-		"\n"
 		"double IntensityFunctionSqrt::evaluate(double value) const\n"
 		"\n"
 		""},
-	 { (char *)"new_IntensityFunctionSqrt", _wrap_new_IntensityFunctionSqrt, METH_VARARGS, (char *)"\n"
+	 { "new_IntensityFunctionSqrt", _wrap_new_IntensityFunctionSqrt, METH_NOARGS, "\n"
 		"new_IntensityFunctionSqrt() -> IntensityFunctionSqrt\n"
 		"\n"
 		"\n"
-		"\n"
 		"Algorithm for applying sqrt function to the measured intensity.\n"
 		"\n"
 		"C++ includes: IIntensityFunction.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityFunctionSqrt", _wrap_delete_IntensityFunctionSqrt, METH_VARARGS, (char *)"delete_IntensityFunctionSqrt(IntensityFunctionSqrt self)"},
-	 { (char *)"IntensityFunctionSqrt_swigregister", IntensityFunctionSqrt_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IIntensityNormalizer", _wrap_delete_IIntensityNormalizer, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityFunctionSqrt", _wrap_delete_IntensityFunctionSqrt, METH_O, "delete_IntensityFunctionSqrt(IntensityFunctionSqrt self)"},
+	 { "IntensityFunctionSqrt_swigregister", IntensityFunctionSqrt_swigregister, METH_O, NULL},
+	 { "IntensityFunctionSqrt_swiginit", IntensityFunctionSqrt_swiginit, METH_VARARGS, NULL},
+	 { "delete_IIntensityNormalizer", _wrap_delete_IIntensityNormalizer, METH_O, "\n"
 		"delete_IIntensityNormalizer(IIntensityNormalizer self)\n"
-		"\n"
 		"virtual IIntensityNormalizer::~IIntensityNormalizer()\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityNormalizer_clone", _wrap_IIntensityNormalizer_clone, METH_VARARGS, (char *)"\n"
+	 { "IIntensityNormalizer_clone", _wrap_IIntensityNormalizer_clone, METH_O, "\n"
 		"IIntensityNormalizer_clone(IIntensityNormalizer self) -> IIntensityNormalizer\n"
-		"\n"
 		"virtual IIntensityNormalizer* IIntensityNormalizer::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityNormalizer_createNormalizedData", _wrap_IIntensityNormalizer_createNormalizedData, METH_VARARGS, (char *)"\n"
+	 { "IIntensityNormalizer_createNormalizedData", _wrap_IIntensityNormalizer_createNormalizedData, METH_VARARGS, "\n"
 		"IIntensityNormalizer_createNormalizedData(IIntensityNormalizer self, IntensityData data) -> IntensityData\n"
-		"\n"
 		"virtual OutputData<double>* IIntensityNormalizer::createNormalizedData(const OutputData< double > &data) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityNormalizer_apply", _wrap_IIntensityNormalizer_apply, METH_VARARGS, (char *)"\n"
+	 { "IIntensityNormalizer_apply", _wrap_IIntensityNormalizer_apply, METH_VARARGS, "\n"
 		"IIntensityNormalizer_apply(IIntensityNormalizer self, IntensityData data)\n"
-		"\n"
 		"virtual void IIntensityNormalizer::apply(OutputData< double > &data) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityNormalizer_setMaximumIntensity", _wrap_IIntensityNormalizer_setMaximumIntensity, METH_VARARGS, (char *)"\n"
-		"IIntensityNormalizer_setMaximumIntensity(IIntensityNormalizer self, double arg3)\n"
-		"\n"
+	 { "IIntensityNormalizer_setMaximumIntensity", _wrap_IIntensityNormalizer_setMaximumIntensity, METH_VARARGS, "\n"
+		"IIntensityNormalizer_setMaximumIntensity(IIntensityNormalizer self, double arg2)\n"
 		"virtual void IIntensityNormalizer::setMaximumIntensity(double)=0\n"
 		"\n"
 		""},
-	 { (char *)"IIntensityNormalizer_swigregister", IIntensityNormalizer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IntensityNormalizer", _wrap_new_IntensityNormalizer, METH_VARARGS, (char *)"\n"
+	 { "IIntensityNormalizer_swigregister", IIntensityNormalizer_swigregister, METH_O, NULL},
+	 { "new_IntensityNormalizer", _wrap_new_IntensityNormalizer, METH_VARARGS, "\n"
 		"IntensityNormalizer(double scale=1.0, double shift=0.0)\n"
-		"IntensityNormalizer(double scale=1.0)\n"
-		"new_IntensityNormalizer() -> IntensityNormalizer\n"
-		"\n"
 		"IntensityNormalizer::IntensityNormalizer(double scale=1.0, double shift=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityNormalizer", _wrap_delete_IntensityNormalizer, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityNormalizer", _wrap_delete_IntensityNormalizer, METH_O, "\n"
 		"delete_IntensityNormalizer(IntensityNormalizer self)\n"
-		"\n"
 		"virtual IntensityNormalizer::~IntensityNormalizer()\n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_clone", _wrap_IntensityNormalizer_clone, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_clone", _wrap_IntensityNormalizer_clone, METH_O, "\n"
 		"IntensityNormalizer_clone(IntensityNormalizer self) -> IntensityNormalizer\n"
-		"\n"
 		"IntensityNormalizer * IntensityNormalizer::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_accept", _wrap_IntensityNormalizer_accept, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_accept", _wrap_IntensityNormalizer_accept, METH_VARARGS, "\n"
 		"IntensityNormalizer_accept(IntensityNormalizer self, INodeVisitor visitor)\n"
-		"\n"
 		"void IntensityNormalizer::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_createNormalizedData", _wrap_IntensityNormalizer_createNormalizedData, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_createNormalizedData", _wrap_IntensityNormalizer_createNormalizedData, METH_VARARGS, "\n"
 		"IntensityNormalizer_createNormalizedData(IntensityNormalizer self, IntensityData data) -> IntensityData\n"
-		"\n"
 		"OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_apply", _wrap_IntensityNormalizer_apply, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_apply", _wrap_IntensityNormalizer_apply, METH_VARARGS, "\n"
 		"IntensityNormalizer_apply(IntensityNormalizer self, IntensityData data)\n"
-		"\n"
 		"void IntensityNormalizer::apply(OutputData< double > &data) const final\n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_setMaximumIntensity", _wrap_IntensityNormalizer_setMaximumIntensity, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_setMaximumIntensity", _wrap_IntensityNormalizer_setMaximumIntensity, METH_VARARGS, "\n"
 		"IntensityNormalizer_setMaximumIntensity(IntensityNormalizer self, double max_intensity)\n"
-		"\n"
 		"virtual void IntensityNormalizer::setMaximumIntensity(double max_intensity)\n"
 		"\n"
 		""},
-	 { (char *)"IntensityNormalizer_swigregister", IntensityNormalizer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IntensityScaleAndShiftNormalizer", _wrap_new_IntensityScaleAndShiftNormalizer, METH_VARARGS, (char *)"\n"
+	 { "IntensityNormalizer_swigregister", IntensityNormalizer_swigregister, METH_O, NULL},
+	 { "IntensityNormalizer_swiginit", IntensityNormalizer_swiginit, METH_VARARGS, NULL},
+	 { "new_IntensityScaleAndShiftNormalizer", _wrap_new_IntensityScaleAndShiftNormalizer, METH_VARARGS, "\n"
 		"IntensityScaleAndShiftNormalizer(double scale=1.0, double shift=0.0)\n"
-		"IntensityScaleAndShiftNormalizer(double scale=1.0)\n"
-		"new_IntensityScaleAndShiftNormalizer() -> IntensityScaleAndShiftNormalizer\n"
-		"\n"
 		"IntensityScaleAndShiftNormalizer::IntensityScaleAndShiftNormalizer(double scale=1.0, double shift=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityScaleAndShiftNormalizer", _wrap_delete_IntensityScaleAndShiftNormalizer, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityScaleAndShiftNormalizer", _wrap_delete_IntensityScaleAndShiftNormalizer, METH_O, "\n"
 		"delete_IntensityScaleAndShiftNormalizer(IntensityScaleAndShiftNormalizer self)\n"
-		"\n"
 		"IntensityScaleAndShiftNormalizer::~IntensityScaleAndShiftNormalizer() final\n"
 		"\n"
 		""},
-	 { (char *)"IntensityScaleAndShiftNormalizer_accept", _wrap_IntensityScaleAndShiftNormalizer_accept, METH_VARARGS, (char *)"\n"
+	 { "IntensityScaleAndShiftNormalizer_accept", _wrap_IntensityScaleAndShiftNormalizer_accept, METH_VARARGS, "\n"
 		"IntensityScaleAndShiftNormalizer_accept(IntensityScaleAndShiftNormalizer self, INodeVisitor visitor)\n"
-		"\n"
 		"void IntensityScaleAndShiftNormalizer::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityScaleAndShiftNormalizer_setMaximumIntensity", _wrap_IntensityScaleAndShiftNormalizer_setMaximumIntensity, METH_VARARGS, (char *)"\n"
-		"IntensityScaleAndShiftNormalizer_setMaximumIntensity(IntensityScaleAndShiftNormalizer self, double arg3)\n"
-		"\n"
+	 { "IntensityScaleAndShiftNormalizer_setMaximumIntensity", _wrap_IntensityScaleAndShiftNormalizer_setMaximumIntensity, METH_VARARGS, "\n"
+		"IntensityScaleAndShiftNormalizer_setMaximumIntensity(IntensityScaleAndShiftNormalizer self, double arg2)\n"
 		"void IntensityScaleAndShiftNormalizer::setMaximumIntensity(double) final\n"
 		"\n"
 		""},
-	 { (char *)"IntensityScaleAndShiftNormalizer_clone", _wrap_IntensityScaleAndShiftNormalizer_clone, METH_VARARGS, (char *)"\n"
+	 { "IntensityScaleAndShiftNormalizer_clone", _wrap_IntensityScaleAndShiftNormalizer_clone, METH_O, "\n"
 		"IntensityScaleAndShiftNormalizer_clone(IntensityScaleAndShiftNormalizer self) -> IntensityScaleAndShiftNormalizer\n"
-		"\n"
 		"IntensityScaleAndShiftNormalizer* IntensityScaleAndShiftNormalizer::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"IntensityScaleAndShiftNormalizer_swigregister", IntensityScaleAndShiftNormalizer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IVarianceFunction", _wrap_delete_IVarianceFunction, METH_VARARGS, (char *)"\n"
+	 { "IntensityScaleAndShiftNormalizer_swigregister", IntensityScaleAndShiftNormalizer_swigregister, METH_O, NULL},
+	 { "IntensityScaleAndShiftNormalizer_swiginit", IntensityScaleAndShiftNormalizer_swiginit, METH_VARARGS, NULL},
+	 { "delete_IVarianceFunction", _wrap_delete_IVarianceFunction, METH_O, "\n"
 		"delete_IVarianceFunction(IVarianceFunction self)\n"
-		"\n"
 		"IVarianceFunction::~IVarianceFunction()\n"
 		"\n"
 		""},
-	 { (char *)"IVarianceFunction_clone", _wrap_IVarianceFunction_clone, METH_VARARGS, (char *)"\n"
+	 { "IVarianceFunction_clone", _wrap_IVarianceFunction_clone, METH_O, "\n"
 		"IVarianceFunction_clone(IVarianceFunction self) -> IVarianceFunction\n"
-		"\n"
 		"virtual IVarianceFunction* IVarianceFunction::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IVarianceFunction_variance", _wrap_IVarianceFunction_variance, METH_VARARGS, (char *)"\n"
+	 { "IVarianceFunction_variance", _wrap_IVarianceFunction_variance, METH_VARARGS, "\n"
 		"IVarianceFunction_variance(IVarianceFunction self, double real_value, double simulated_value) -> double\n"
-		"\n"
 		"virtual double IVarianceFunction::variance(double real_value, double simulated_value) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IVarianceFunction_swigregister", IVarianceFunction_swigregister, METH_VARARGS, NULL},
-	 { (char *)"VarianceConstantFunction_clone", _wrap_VarianceConstantFunction_clone, METH_VARARGS, (char *)"\n"
+	 { "IVarianceFunction_swigregister", IVarianceFunction_swigregister, METH_O, NULL},
+	 { "VarianceConstantFunction_clone", _wrap_VarianceConstantFunction_clone, METH_O, "\n"
 		"VarianceConstantFunction_clone(VarianceConstantFunction self) -> VarianceConstantFunction\n"
-		"\n"
 		"VarianceConstantFunction * VarianceConstantFunction::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"VarianceConstantFunction_variance", _wrap_VarianceConstantFunction_variance, METH_VARARGS, (char *)"\n"
-		"VarianceConstantFunction_variance(VarianceConstantFunction self, double arg3, double arg4) -> double\n"
-		"\n"
+	 { "VarianceConstantFunction_variance", _wrap_VarianceConstantFunction_variance, METH_VARARGS, "\n"
+		"VarianceConstantFunction_variance(VarianceConstantFunction self, double arg2, double arg3) -> double\n"
 		"double VarianceConstantFunction::variance(double, double) const override\n"
 		"\n"
 		""},
-	 { (char *)"new_VarianceConstantFunction", _wrap_new_VarianceConstantFunction, METH_VARARGS, (char *)"\n"
+	 { "new_VarianceConstantFunction", _wrap_new_VarianceConstantFunction, METH_NOARGS, "\n"
 		"new_VarianceConstantFunction() -> VarianceConstantFunction\n"
 		"\n"
 		"\n"
-		"\n"
 		"Returns 1.0 as variance value\n"
 		"\n"
 		"C++ includes: VarianceFunctions.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_VarianceConstantFunction", _wrap_delete_VarianceConstantFunction, METH_VARARGS, (char *)"delete_VarianceConstantFunction(VarianceConstantFunction self)"},
-	 { (char *)"VarianceConstantFunction_swigregister", VarianceConstantFunction_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_VarianceSimFunction", _wrap_new_VarianceSimFunction, METH_VARARGS, (char *)"\n"
+	 { "delete_VarianceConstantFunction", _wrap_delete_VarianceConstantFunction, METH_O, "delete_VarianceConstantFunction(VarianceConstantFunction self)"},
+	 { "VarianceConstantFunction_swigregister", VarianceConstantFunction_swigregister, METH_O, NULL},
+	 { "VarianceConstantFunction_swiginit", VarianceConstantFunction_swiginit, METH_VARARGS, NULL},
+	 { "new_VarianceSimFunction", _wrap_new_VarianceSimFunction, METH_VARARGS, "\n"
 		"VarianceSimFunction(double epsilon=1.0)\n"
-		"new_VarianceSimFunction() -> VarianceSimFunction\n"
-		"\n"
 		"VarianceSimFunction::VarianceSimFunction(double epsilon=1.0)\n"
 		"\n"
 		""},
-	 { (char *)"VarianceSimFunction_clone", _wrap_VarianceSimFunction_clone, METH_VARARGS, (char *)"\n"
+	 { "VarianceSimFunction_clone", _wrap_VarianceSimFunction_clone, METH_O, "\n"
 		"VarianceSimFunction_clone(VarianceSimFunction self) -> VarianceSimFunction\n"
-		"\n"
 		"VarianceSimFunction * VarianceSimFunction::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"VarianceSimFunction_variance", _wrap_VarianceSimFunction_variance, METH_VARARGS, (char *)"\n"
+	 { "VarianceSimFunction_variance", _wrap_VarianceSimFunction_variance, METH_VARARGS, "\n"
 		"VarianceSimFunction_variance(VarianceSimFunction self, double exp, double sim) -> double\n"
-		"\n"
 		"double VarianceSimFunction::variance(double exp, double sim) const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_VarianceSimFunction", _wrap_delete_VarianceSimFunction, METH_VARARGS, (char *)"delete_VarianceSimFunction(VarianceSimFunction self)"},
-	 { (char *)"VarianceSimFunction_swigregister", VarianceSimFunction_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ChiSquaredModule", _wrap_new_ChiSquaredModule, METH_VARARGS, (char *)"\n"
+	 { "delete_VarianceSimFunction", _wrap_delete_VarianceSimFunction, METH_O, "delete_VarianceSimFunction(VarianceSimFunction self)"},
+	 { "VarianceSimFunction_swigregister", VarianceSimFunction_swigregister, METH_O, NULL},
+	 { "VarianceSimFunction_swiginit", VarianceSimFunction_swiginit, METH_VARARGS, NULL},
+	 { "new_ChiSquaredModule", _wrap_new_ChiSquaredModule, METH_VARARGS, "\n"
 		"ChiSquaredModule()\n"
 		"new_ChiSquaredModule(ChiSquaredModule other) -> ChiSquaredModule\n"
-		"\n"
 		"ChiSquaredModule::ChiSquaredModule(const ChiSquaredModule &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ChiSquaredModule", _wrap_delete_ChiSquaredModule, METH_VARARGS, (char *)"\n"
+	 { "delete_ChiSquaredModule", _wrap_delete_ChiSquaredModule, METH_O, "\n"
 		"delete_ChiSquaredModule(ChiSquaredModule self)\n"
-		"\n"
 		"virtual ChiSquaredModule::~ChiSquaredModule()\n"
 		"\n"
 		""},
-	 { (char *)"ChiSquaredModule_clone", _wrap_ChiSquaredModule_clone, METH_VARARGS, (char *)"\n"
+	 { "ChiSquaredModule_clone", _wrap_ChiSquaredModule_clone, METH_O, "\n"
 		"ChiSquaredModule_clone(ChiSquaredModule self) -> ChiSquaredModule\n"
-		"\n"
 		"virtual ChiSquaredModule* ChiSquaredModule::clone() const\n"
 		"\n"
 		"clone method \n"
 		"\n"
 		""},
-	 { (char *)"ChiSquaredModule_residual", _wrap_ChiSquaredModule_residual, METH_VARARGS, (char *)"\n"
+	 { "ChiSquaredModule_residual", _wrap_ChiSquaredModule_residual, METH_VARARGS, "\n"
 		"ChiSquaredModule_residual(ChiSquaredModule self, double a, double b, double weight) -> double\n"
-		"\n"
 		"double ChiSquaredModule::residual(double a, double b, double weight)\n"
 		"\n"
 		""},
-	 { (char *)"ChiSquaredModule_swigregister", ChiSquaredModule_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FitOptions", _wrap_new_FitOptions, METH_VARARGS, (char *)"new_FitOptions() -> FitOptions"},
-	 { (char *)"FitOptions_derivEpsilon", _wrap_FitOptions_derivEpsilon, METH_VARARGS, (char *)"FitOptions_derivEpsilon(FitOptions self) -> double"},
-	 { (char *)"FitOptions_setDerivEpsilon", _wrap_FitOptions_setDerivEpsilon, METH_VARARGS, (char *)"FitOptions_setDerivEpsilon(FitOptions self, double deriv_epsilon)"},
-	 { (char *)"FitOptions_stepFactor", _wrap_FitOptions_stepFactor, METH_VARARGS, (char *)"FitOptions_stepFactor(FitOptions self) -> double"},
-	 { (char *)"FitOptions_setStepFactor", _wrap_FitOptions_setStepFactor, METH_VARARGS, (char *)"FitOptions_setStepFactor(FitOptions self, double step_factor)"},
-	 { (char *)"delete_FitOptions", _wrap_delete_FitOptions, METH_VARARGS, (char *)"delete_FitOptions(FitOptions self)"},
-	 { (char *)"FitOptions_swigregister", FitOptions_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_PyBuilderCallback", _wrap_new_PyBuilderCallback, METH_VARARGS, (char *)"\n"
-		"new_PyBuilderCallback(PyObject * arg2) -> PyBuilderCallback\n"
-		"\n"
+	 { "ChiSquaredModule_swigregister", ChiSquaredModule_swigregister, METH_O, NULL},
+	 { "ChiSquaredModule_swiginit", ChiSquaredModule_swiginit, METH_VARARGS, NULL},
+	 { "new_FitOptions", _wrap_new_FitOptions, METH_NOARGS, "new_FitOptions() -> FitOptions"},
+	 { "FitOptions_derivEpsilon", _wrap_FitOptions_derivEpsilon, METH_O, "FitOptions_derivEpsilon(FitOptions self) -> double"},
+	 { "FitOptions_setDerivEpsilon", _wrap_FitOptions_setDerivEpsilon, METH_VARARGS, "FitOptions_setDerivEpsilon(FitOptions self, double deriv_epsilon)"},
+	 { "FitOptions_stepFactor", _wrap_FitOptions_stepFactor, METH_O, "FitOptions_stepFactor(FitOptions self) -> double"},
+	 { "FitOptions_setStepFactor", _wrap_FitOptions_setStepFactor, METH_VARARGS, "FitOptions_setStepFactor(FitOptions self, double step_factor)"},
+	 { "delete_FitOptions", _wrap_delete_FitOptions, METH_O, "delete_FitOptions(FitOptions self)"},
+	 { "FitOptions_swigregister", FitOptions_swigregister, METH_O, NULL},
+	 { "FitOptions_swiginit", FitOptions_swiginit, METH_VARARGS, NULL},
+	 { "new_PyBuilderCallback", _wrap_new_PyBuilderCallback, METH_O, "\n"
+		"new_PyBuilderCallback(PyObject * _self) -> PyBuilderCallback\n"
 		"PyBuilderCallback::PyBuilderCallback()\n"
 		"\n"
 		""},
-	 { (char *)"delete_PyBuilderCallback", _wrap_delete_PyBuilderCallback, METH_VARARGS, (char *)"\n"
+	 { "delete_PyBuilderCallback", _wrap_delete_PyBuilderCallback, METH_O, "\n"
 		"delete_PyBuilderCallback(PyBuilderCallback self)\n"
-		"\n"
 		"PyBuilderCallback::~PyBuilderCallback()\n"
 		"\n"
 		""},
-	 { (char *)"PyBuilderCallback_build_simulation", _wrap_PyBuilderCallback_build_simulation, METH_VARARGS, (char *)"\n"
+	 { "PyBuilderCallback_build_simulation", _wrap_PyBuilderCallback_build_simulation, METH_VARARGS, "\n"
 		"PyBuilderCallback_build_simulation(PyBuilderCallback self, Parameters arg0) -> Simulation\n"
-		"\n"
 		"Simulation * PyBuilderCallback::build_simulation(Fit::Parameters)\n"
 		"\n"
 		""},
-	 { (char *)"disown_PyBuilderCallback", _wrap_disown_PyBuilderCallback, METH_VARARGS, NULL},
-	 { (char *)"PyBuilderCallback_swigregister", PyBuilderCallback_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_PyObserverCallback", _wrap_new_PyObserverCallback, METH_VARARGS, (char *)"\n"
-		"new_PyObserverCallback(PyObject * arg2) -> PyObserverCallback\n"
-		"\n"
+	 { "disown_PyBuilderCallback", _wrap_disown_PyBuilderCallback, METH_O, NULL},
+	 { "PyBuilderCallback_swigregister", PyBuilderCallback_swigregister, METH_O, NULL},
+	 { "PyBuilderCallback_swiginit", PyBuilderCallback_swiginit, METH_VARARGS, NULL},
+	 { "new_PyObserverCallback", _wrap_new_PyObserverCallback, METH_O, "\n"
+		"new_PyObserverCallback(PyObject * _self) -> PyObserverCallback\n"
 		"PyObserverCallback::PyObserverCallback()\n"
 		"\n"
 		""},
-	 { (char *)"delete_PyObserverCallback", _wrap_delete_PyObserverCallback, METH_VARARGS, (char *)"\n"
+	 { "delete_PyObserverCallback", _wrap_delete_PyObserverCallback, METH_O, "\n"
 		"delete_PyObserverCallback(PyObserverCallback self)\n"
-		"\n"
 		"PyObserverCallback::~PyObserverCallback()\n"
 		"\n"
 		""},
-	 { (char *)"PyObserverCallback_update", _wrap_PyObserverCallback_update, METH_VARARGS, (char *)"\n"
+	 { "PyObserverCallback_update", _wrap_PyObserverCallback_update, METH_VARARGS, "\n"
 		"PyObserverCallback_update(PyObserverCallback self, FitObjective arg0)\n"
-		"\n"
 		"void PyObserverCallback::update(const FitObjective &)\n"
 		"\n"
 		""},
-	 { (char *)"disown_PyObserverCallback", _wrap_disown_PyObserverCallback, METH_VARARGS, NULL},
-	 { (char *)"PyObserverCallback_swigregister", PyObserverCallback_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FitObjective", _wrap_new_FitObjective, METH_VARARGS, (char *)"\n"
-		"new_FitObjective(PyObject * arg2) -> FitObjective\n"
-		"\n"
+	 { "disown_PyObserverCallback", _wrap_disown_PyObserverCallback, METH_O, NULL},
+	 { "PyObserverCallback_swigregister", PyObserverCallback_swigregister, METH_O, NULL},
+	 { "PyObserverCallback_swiginit", PyObserverCallback_swiginit, METH_VARARGS, NULL},
+	 { "new_FitObjective", _wrap_new_FitObjective, METH_O, "\n"
+		"new_FitObjective(PyObject * _self) -> FitObjective\n"
 		"FitObjective::FitObjective()\n"
 		"\n"
 		""},
-	 { (char *)"delete_FitObjective", _wrap_delete_FitObjective, METH_VARARGS, (char *)"\n"
+	 { "delete_FitObjective", _wrap_delete_FitObjective, METH_O, "\n"
 		"delete_FitObjective(FitObjective self)\n"
-		"\n"
 		"FitObjective::~FitObjective()\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_evaluate_cpp", _wrap_FitObjective_evaluate_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_evaluate_cpp", _wrap_FitObjective_evaluate_cpp, METH_VARARGS, "\n"
 		"FitObjective_evaluate_cpp(FitObjective self, Parameters params) -> double\n"
-		"\n"
 		"double FitObjective::evaluate(const Fit::Parameters &params)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_evaluate_residuals_cpp", _wrap_FitObjective_evaluate_residuals_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_evaluate_residuals_cpp", _wrap_FitObjective_evaluate_residuals_cpp, METH_VARARGS, "\n"
 		"FitObjective_evaluate_residuals_cpp(FitObjective self, Parameters params) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FitObjective::evaluate_residuals(const Fit::Parameters &params)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_numberOfFitElements", _wrap_FitObjective_numberOfFitElements, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_numberOfFitElements", _wrap_FitObjective_numberOfFitElements, METH_O, "\n"
 		"FitObjective_numberOfFitElements(FitObjective self) -> size_t\n"
-		"\n"
 		"size_t FitObjective::numberOfFitElements() const\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_simulationResult", _wrap_FitObjective_simulationResult, METH_VARARGS, (char *)"\n"
-		"simulationResult(size_t i_item=0) -> SimulationResult\n"
-		"FitObjective_simulationResult(FitObjective self) -> SimulationResult\n"
-		"\n"
+	 { "FitObjective_simulationResult", _wrap_FitObjective_simulationResult, METH_VARARGS, "\n"
+		"FitObjective_simulationResult(FitObjective self, size_t i_item=0) -> SimulationResult\n"
 		"SimulationResult FitObjective::simulationResult(size_t i_item=0) const\n"
 		"\n"
 		"Returns simulation result in the form of  SimulationResult. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_experimentalData", _wrap_FitObjective_experimentalData, METH_VARARGS, (char *)"\n"
-		"experimentalData(size_t i_item=0) -> SimulationResult\n"
-		"FitObjective_experimentalData(FitObjective self) -> SimulationResult\n"
-		"\n"
+	 { "FitObjective_experimentalData", _wrap_FitObjective_experimentalData, METH_VARARGS, "\n"
+		"FitObjective_experimentalData(FitObjective self, size_t i_item=0) -> SimulationResult\n"
 		"SimulationResult FitObjective::experimentalData(size_t i_item=0) const\n"
 		"\n"
 		"Returns experimental data in the form of  SimulationResult. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_uncertaintyData_cpp", _wrap_FitObjective_uncertaintyData_cpp, METH_VARARGS, (char *)"\n"
-		"uncertaintyData_cpp(size_t i_item=0) -> SimulationResult\n"
-		"FitObjective_uncertaintyData_cpp(FitObjective self) -> SimulationResult\n"
-		"\n"
+	 { "FitObjective_uncertaintyData_cpp", _wrap_FitObjective_uncertaintyData_cpp, METH_VARARGS, "\n"
+		"FitObjective_uncertaintyData_cpp(FitObjective self, size_t i_item=0) -> SimulationResult\n"
 		"SimulationResult FitObjective::uncertaintyData(size_t i_item=0) const\n"
 		"\n"
 		"Returns experimental data uncertainties in the form of  SimulationResult. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_relativeDifference", _wrap_FitObjective_relativeDifference, METH_VARARGS, (char *)"\n"
-		"relativeDifference(size_t i_item=0) -> SimulationResult\n"
-		"FitObjective_relativeDifference(FitObjective self) -> SimulationResult\n"
-		"\n"
+	 { "FitObjective_relativeDifference", _wrap_FitObjective_relativeDifference, METH_VARARGS, "\n"
+		"FitObjective_relativeDifference(FitObjective self, size_t i_item=0) -> SimulationResult\n"
 		"SimulationResult FitObjective::relativeDifference(size_t i_item=0) const\n"
 		"\n"
 		"Returns relative difference between simulation and experimental data in the form of  SimulationResult. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_absoluteDifference", _wrap_FitObjective_absoluteDifference, METH_VARARGS, (char *)"\n"
-		"absoluteDifference(size_t i_item=0) -> SimulationResult\n"
-		"FitObjective_absoluteDifference(FitObjective self) -> SimulationResult\n"
-		"\n"
+	 { "FitObjective_absoluteDifference", _wrap_FitObjective_absoluteDifference, METH_VARARGS, "\n"
+		"FitObjective_absoluteDifference(FitObjective self, size_t i_item=0) -> SimulationResult\n"
 		"SimulationResult FitObjective::absoluteDifference(size_t i_item=0) const\n"
 		"\n"
 		"Returns absolute value of difference between simulation and experimental data in the form of  SimulationResult. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_experimental_array", _wrap_FitObjective_experimental_array, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_experimental_array", _wrap_FitObjective_experimental_array, METH_O, "\n"
 		"FitObjective_experimental_array(FitObjective self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FitObjective::experimental_array() const\n"
 		"\n"
 		"Returns one dimensional array representing merged experimental data. The area outside of the region of interest is not included, masked data is nullified. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_simulation_array", _wrap_FitObjective_simulation_array, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_simulation_array", _wrap_FitObjective_simulation_array, METH_O, "\n"
 		"FitObjective_simulation_array(FitObjective self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FitObjective::simulation_array() const\n"
 		"\n"
 		"Returns one dimensional array representing merged simulated intensities data. The area outside of the region of interest is not included, masked data is nullified. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_uncertainties_cpp", _wrap_FitObjective_uncertainties_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_uncertainties_cpp", _wrap_FitObjective_uncertainties_cpp, METH_O, "\n"
 		"FitObjective_uncertainties_cpp(FitObjective self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FitObjective::uncertainties() const\n"
 		"\n"
 		"Returns one-dimensional array representing merged data uncertainties. The area outside of the region of interest is not included, masked data is nullified. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_weights_array", _wrap_FitObjective_weights_array, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_weights_array", _wrap_FitObjective_weights_array, METH_O, "\n"
 		"FitObjective_weights_array(FitObjective self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FitObjective::weights_array() const\n"
 		"\n"
 		"Returns one-dimensional array representing merged user weights. The area outside of the region of interest is not included, masked data is nullified. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_initPrint", _wrap_FitObjective_initPrint, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_initPrint", _wrap_FitObjective_initPrint, METH_VARARGS, "\n"
 		"FitObjective_initPrint(FitObjective self, int every_nth)\n"
-		"\n"
 		"void FitObjective::initPrint(int every_nth)\n"
 		"\n"
 		"Initializes printing to standard output during the fitting.\n"
@@ -127186,84 +124366,69 @@ static PyMethodDef SwigMethods[] = {
 		"Print every n'th iteration. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_initPlot_cpp", _wrap_FitObjective_initPlot_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_initPlot_cpp", _wrap_FitObjective_initPlot_cpp, METH_VARARGS, "\n"
 		"FitObjective_initPlot_cpp(FitObjective self, int every_nth, PyObserverCallback callback)\n"
-		"\n"
 		"void FitObjective::initPlot(int every_nth, fit_observer_t observer)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_iterationInfo", _wrap_FitObjective_iterationInfo, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_iterationInfo", _wrap_FitObjective_iterationInfo, METH_O, "\n"
 		"FitObjective_iterationInfo(FitObjective self) -> IterationInfo\n"
-		"\n"
 		"IterationInfo FitObjective::iterationInfo() const\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_minimizerResult", _wrap_FitObjective_minimizerResult, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_minimizerResult", _wrap_FitObjective_minimizerResult, METH_O, "\n"
 		"FitObjective_minimizerResult(FitObjective self) -> Fit::MinimizerResult\n"
-		"\n"
 		"Fit::MinimizerResult FitObjective::minimizerResult() const\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_finalize_cpp", _wrap_FitObjective_finalize_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_finalize_cpp", _wrap_FitObjective_finalize_cpp, METH_VARARGS, "\n"
 		"FitObjective_finalize_cpp(FitObjective self, Fit::MinimizerResult const & result)\n"
-		"\n"
 		"void FitObjective::finalize(const Fit::MinimizerResult &result)\n"
 		"\n"
 		"Should be explicitely called on last iteration to notify all observers. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_fitObjectCount", _wrap_FitObjective_fitObjectCount, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_fitObjectCount", _wrap_FitObjective_fitObjectCount, METH_O, "\n"
 		"FitObjective_fitObjectCount(FitObjective self) -> unsigned int\n"
-		"\n"
 		"unsigned FitObjective::fitObjectCount() const\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_run_simulations", _wrap_FitObjective_run_simulations, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_run_simulations", _wrap_FitObjective_run_simulations, METH_VARARGS, "\n"
 		"FitObjective_run_simulations(FitObjective self, Parameters params)\n"
-		"\n"
 		"void FitObjective::run_simulations(const Fit::Parameters &params)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_setChiSquaredModule", _wrap_FitObjective_setChiSquaredModule, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_setChiSquaredModule", _wrap_FitObjective_setChiSquaredModule, METH_VARARGS, "\n"
 		"FitObjective_setChiSquaredModule(FitObjective self, IChiSquaredModule module)\n"
-		"\n"
 		"void FitObjective::setChiSquaredModule(const IChiSquaredModule &module)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_setObjectiveMetric", _wrap_FitObjective_setObjectiveMetric, METH_VARARGS, (char *)"\n"
-		"setObjectiveMetric(std::string const & metric)\n"
+	 { "FitObjective_setObjectiveMetric", _wrap_FitObjective_setObjectiveMetric, METH_VARARGS, "\n"
+		"FitObjective_setObjectiveMetric(FitObjective self, std::string const & metric)\n"
 		"FitObjective_setObjectiveMetric(FitObjective self, std::string const & metric, std::string const & norm)\n"
-		"\n"
 		"void FitObjective::setObjectiveMetric(std::unique_ptr< ObjectiveMetric > metric)\n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_containsUncertainties_cpp", _wrap_FitObjective_containsUncertainties_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_containsUncertainties_cpp", _wrap_FitObjective_containsUncertainties_cpp, METH_VARARGS, "\n"
 		"FitObjective_containsUncertainties_cpp(FitObjective self, size_t i_item) -> bool\n"
-		"\n"
 		"bool FitObjective::containsUncertainties(size_t i_item) const\n"
 		"\n"
 		"Returns true if the specified DataPair element contains uncertainties. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_allPairsHaveUncertainties_cpp", _wrap_FitObjective_allPairsHaveUncertainties_cpp, METH_VARARGS, (char *)"\n"
+	 { "FitObjective_allPairsHaveUncertainties_cpp", _wrap_FitObjective_allPairsHaveUncertainties_cpp, METH_O, "\n"
 		"FitObjective_allPairsHaveUncertainties_cpp(FitObjective self) -> bool\n"
-		"\n"
 		"bool FitObjective::allPairsHaveUncertainties() const\n"
 		"\n"
 		"Returns true if all the data pairs in  FitObjective instance contain uncertainties. \n"
 		"\n"
 		""},
-	 { (char *)"FitObjective_availableMetricOptions", _wrap_FitObjective_availableMetricOptions, METH_VARARGS, (char *)"FitObjective_availableMetricOptions() -> std::string"},
-	 { (char *)"FitObjective_addSimulationAndData_cpp", _wrap_FitObjective_addSimulationAndData_cpp, METH_VARARGS, (char *)"\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble1d_t data, double weight=1.0)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble1d_t data)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t uncertainties, double weight=1.0)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t uncertainties)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble2d_t data, double weight=1.0)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble2d_t data)\n"
-		"addSimulationAndData_cpp(PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t uncertainties, double weight=1.0)\n"
-		"FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t uncertainties)\n"
-		"\n"
+	 { "FitObjective_availableMetricOptions", _wrap_FitObjective_availableMetricOptions, METH_NOARGS, "FitObjective_availableMetricOptions() -> std::string"},
+	 { "FitObjective_addSimulationAndData_cpp", _wrap_FitObjective_addSimulationAndData_cpp, METH_VARARGS, "\n"
+		"FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, double weight=1.0)\n"
+		"FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t uncertainties, double weight=1.0)\n"
+		"FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, double weight=1.0)\n"
+		"FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t uncertainties, double weight=1.0)\n"
 		"void FitObjective::addSimulationAndData(PyBuilderCallback &callback, const T &data, const T &uncertainties, double weight=1.0)\n"
 		"\n"
 		"Constructs simulation/data pair for later fit.\n"
@@ -127284,1013 +124449,892 @@ static PyMethodDef SwigMethods[] = {
 		"weight of dataset in metric calculations \n"
 		"\n"
 		""},
-	 { (char *)"disown_FitObjective", _wrap_disown_FitObjective, METH_VARARGS, NULL},
-	 { (char *)"FitObjective_swigregister", FitObjective_swigregister, METH_VARARGS, NULL},
-	 { (char *)"StandardNormal", _wrap_StandardNormal, METH_VARARGS, (char *)"\n"
+	 { "disown_FitObjective", _wrap_disown_FitObjective, METH_O, NULL},
+	 { "FitObjective_swigregister", FitObjective_swigregister, METH_O, NULL},
+	 { "FitObjective_swiginit", FitObjective_swiginit, METH_VARARGS, NULL},
+	 { "StandardNormal", _wrap_StandardNormal, METH_O, "\n"
 		"StandardNormal(double x) -> double\n"
-		"\n"
 		"double MathFunctions::StandardNormal(double x)\n"
 		"\n"
 		""},
-	 { (char *)"Gaussian", _wrap_Gaussian, METH_VARARGS, (char *)"\n"
+	 { "Gaussian", _wrap_Gaussian, METH_VARARGS, "\n"
 		"Gaussian(double x, double average, double std_dev) -> double\n"
-		"\n"
 		"double MathFunctions::Gaussian(double x, double average, double std_dev)\n"
 		"\n"
 		""},
-	 { (char *)"IntegratedGaussian", _wrap_IntegratedGaussian, METH_VARARGS, (char *)"\n"
+	 { "IntegratedGaussian", _wrap_IntegratedGaussian, METH_VARARGS, "\n"
 		"IntegratedGaussian(double x, double average, double std_dev) -> double\n"
-		"\n"
 		"double MathFunctions::IntegratedGaussian(double x, double average, double std_dev)\n"
 		"\n"
 		""},
-	 { (char *)"cot", _wrap_cot, METH_VARARGS, (char *)"\n"
+	 { "cot", _wrap_cot, METH_O, "\n"
 		"cot(double x) -> double\n"
-		"\n"
 		"double MathFunctions::cot(double x)\n"
 		"\n"
 		"cotangent function:  $cot(x)\\\\equiv1/tan(x)$\n"
 		"\n"
 		""},
-	 { (char *)"Si", _wrap_Si, METH_VARARGS, (char *)"\n"
+	 { "Si", _wrap_Si, METH_O, "\n"
 		"Si(double x) -> double\n"
-		"\n"
 		"double MathFunctions::Si(double x)\n"
 		"\n"
 		"Sine integral function:  $Si(x)\\\\equiv\\\\int_0^x du \\\\sin(u)/u$. \n"
 		"\n"
 		""},
-	 { (char *)"sinc", _wrap_sinc, METH_VARARGS, (char *)"\n"
+	 { "sinc", _wrap_sinc, METH_VARARGS, "\n"
 		"sinc(double x) -> double\n"
 		"sinc(complex_t const z) -> complex_t\n"
-		"\n"
 		"complex_t MathFunctions::sinc(const complex_t z)\n"
 		"\n"
 		"Complex sinc function:  $sinc(x)\\\\equiv\\\\sin(x)/x$. \n"
 		"\n"
 		""},
-	 { (char *)"tanhc", _wrap_tanhc, METH_VARARGS, (char *)"\n"
+	 { "tanhc", _wrap_tanhc, METH_O, "\n"
 		"tanhc(complex_t const z) -> complex_t\n"
-		"\n"
 		"complex_t MathFunctions::tanhc(const complex_t z)\n"
 		"\n"
 		"Complex tanhc function:  $tanhc(x)\\\\equiv\\\\tanh(x)/x$. \n"
 		"\n"
 		""},
-	 { (char *)"Laue", _wrap_Laue, METH_VARARGS, (char *)"\n"
+	 { "Laue", _wrap_Laue, METH_VARARGS, "\n"
 		"Laue(double const x, size_t N) -> double\n"
-		"\n"
 		"double MathFunctions::Laue(const double x, size_t N)\n"
 		"\n"
 		"Real Laue function:  $Laue(x,N)\\\\equiv\\\\sin(Nx)/sin(x)$. \n"
 		"\n"
 		""},
-	 { (char *)"erf", _wrap_erf, METH_VARARGS, (char *)"\n"
+	 { "erf", _wrap_erf, METH_O, "\n"
 		"erf(double arg) -> double\n"
-		"\n"
 		"double MathFunctions::erf(double arg)\n"
 		"\n"
 		"Error function of real-valued argument. \n"
 		"\n"
 		""},
-	 { (char *)"Bessel_I0", _wrap_Bessel_I0, METH_VARARGS, (char *)"\n"
+	 { "Bessel_I0", _wrap_Bessel_I0, METH_O, "\n"
 		"Bessel_I0(double x) -> double\n"
-		"\n"
 		"double MathFunctions::Bessel_I0(double x)\n"
 		"\n"
 		"Modified Bessel function of the first kind and order 0. \n"
 		"\n"
 		""},
-	 { (char *)"Bessel_J0", _wrap_Bessel_J0, METH_VARARGS, (char *)"\n"
+	 { "Bessel_J0", _wrap_Bessel_J0, METH_VARARGS, "\n"
 		"Bessel_J0(double x) -> double\n"
 		"Bessel_J0(complex_t const z) -> complex_t\n"
-		"\n"
 		"complex_t MathFunctions::Bessel_J0(const complex_t z)\n"
 		"\n"
 		"Complex Bessel function of the first kind and order 0. \n"
 		"\n"
 		""},
-	 { (char *)"Bessel_J1", _wrap_Bessel_J1, METH_VARARGS, (char *)"\n"
+	 { "Bessel_J1", _wrap_Bessel_J1, METH_VARARGS, "\n"
 		"Bessel_J1(double x) -> double\n"
 		"Bessel_J1(complex_t const z) -> complex_t\n"
-		"\n"
 		"complex_t MathFunctions::Bessel_J1(const complex_t z)\n"
 		"\n"
 		"Complex Bessel function of the first kind and order 1. \n"
 		"\n"
 		""},
-	 { (char *)"Bessel_J1c", _wrap_Bessel_J1c, METH_VARARGS, (char *)"\n"
+	 { "Bessel_J1c", _wrap_Bessel_J1c, METH_VARARGS, "\n"
 		"Bessel_J1c(double x) -> double\n"
 		"Bessel_J1c(complex_t const z) -> complex_t\n"
-		"\n"
 		"complex_t MathFunctions::Bessel_J1c(const complex_t z)\n"
 		"\n"
 		"Complex Bessel function Bessel_J1(x)/x. \n"
 		"\n"
 		""},
-	 { (char *)"FastFourierTransform", _wrap_FastFourierTransform, METH_VARARGS, (char *)"\n"
+	 { "FastFourierTransform", _wrap_FastFourierTransform, METH_VARARGS, "\n"
 		"FastFourierTransform(vector_complex_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t\n"
 		"FastFourierTransform(vdouble1d_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t\n"
-		"\n"
 		"std::vector< complex_t > MathFunctions::FastFourierTransform(const std::vector< double > &data, EFFTDirection tcase)\n"
 		"\n"
 		"simple (and unoptimized) wrapper function for the discrete fast Fourier transformation library (fftw3); transforms real to complex \n"
 		"\n"
 		""},
-	 { (char *)"ConvolveFFT", _wrap_ConvolveFFT, METH_VARARGS, (char *)"\n"
+	 { "ConvolveFFT", _wrap_ConvolveFFT, METH_VARARGS, "\n"
 		"ConvolveFFT(vdouble1d_t signal, vdouble1d_t resfunc) -> vector_complex_t\n"
-		"\n"
 		"std::vector< complex_t > MathFunctions::ConvolveFFT(const std::vector< double > &signal, const std::vector< double > &resfunc)\n"
 		"\n"
 		"convolution of two real vectors of equal size \n"
 		"\n"
 		""},
-	 { (char *)"GenerateUniformRandom", _wrap_GenerateUniformRandom, METH_VARARGS, (char *)"\n"
+	 { "GenerateUniformRandom", _wrap_GenerateUniformRandom, METH_NOARGS, "\n"
 		"GenerateUniformRandom() -> double\n"
-		"\n"
 		"double MathFunctions::GenerateUniformRandom()\n"
 		"\n"
 		""},
-	 { (char *)"GenerateStandardNormalRandom", _wrap_GenerateStandardNormalRandom, METH_VARARGS, (char *)"\n"
+	 { "GenerateStandardNormalRandom", _wrap_GenerateStandardNormalRandom, METH_NOARGS, "\n"
 		"GenerateStandardNormalRandom() -> double\n"
-		"\n"
 		"double MathFunctions::GenerateStandardNormalRandom()\n"
 		"\n"
 		""},
-	 { (char *)"GenerateNormalRandom", _wrap_GenerateNormalRandom, METH_VARARGS, (char *)"\n"
+	 { "GenerateNormalRandom", _wrap_GenerateNormalRandom, METH_VARARGS, "\n"
 		"GenerateNormalRandom(double average, double std_dev) -> double\n"
-		"\n"
 		"double MathFunctions::GenerateNormalRandom(double average, double std_dev)\n"
 		"\n"
 		""},
-	 { (char *)"GeneratePoissonRandom", _wrap_GeneratePoissonRandom, METH_VARARGS, (char *)"\n"
+	 { "GeneratePoissonRandom", _wrap_GeneratePoissonRandom, METH_O, "\n"
 		"GeneratePoissonRandom(double average) -> double\n"
-		"\n"
 		"double MathFunctions::GeneratePoissonRandom(double average)\n"
 		"\n"
 		""},
-	 { (char *)"new_IMultiLayerBuilder", _wrap_new_IMultiLayerBuilder, METH_VARARGS, (char *)"\n"
-		"new_IMultiLayerBuilder(PyObject * arg2) -> IMultiLayerBuilder\n"
-		"\n"
+	 { "new_IMultiLayerBuilder", _wrap_new_IMultiLayerBuilder, METH_O, "\n"
+		"new_IMultiLayerBuilder(PyObject * _self) -> IMultiLayerBuilder\n"
 		"IMultiLayerBuilder::IMultiLayerBuilder()\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_buildSample", _wrap_IMultiLayerBuilder_buildSample, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_buildSample", _wrap_IMultiLayerBuilder_buildSample, METH_O, "\n"
 		"IMultiLayerBuilder_buildSample(IMultiLayerBuilder self) -> MultiLayer\n"
-		"\n"
 		"virtual MultiLayer* IMultiLayerBuilder::buildSample() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_createSample", _wrap_IMultiLayerBuilder_createSample, METH_VARARGS, (char *)"\n"
-		"createSample(size_t index=0) -> MultiLayer\n"
-		"IMultiLayerBuilder_createSample(IMultiLayerBuilder self) -> MultiLayer\n"
-		"\n"
+	 { "IMultiLayerBuilder_createSample", _wrap_IMultiLayerBuilder_createSample, METH_VARARGS, "\n"
+		"IMultiLayerBuilder_createSample(IMultiLayerBuilder self, size_t index=0) -> MultiLayer\n"
 		"virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0)\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_size", _wrap_IMultiLayerBuilder_size, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_size", _wrap_IMultiLayerBuilder_size, METH_O, "\n"
 		"IMultiLayerBuilder_size(IMultiLayerBuilder self) -> size_t\n"
-		"\n"
 		"virtual size_t IMultiLayerBuilder::size()\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_registerParameter", _wrap_IMultiLayerBuilder_registerParameter, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_registerParameter", _wrap_IMultiLayerBuilder_registerParameter, METH_VARARGS, "\n"
 		"IMultiLayerBuilder_registerParameter(IMultiLayerBuilder self, std::string const & name, int64_t parpointer) -> RealParameter\n"
-		"\n"
 		"RealParameter & IParameterized::registerParameter(const std::string &name, double *parpointer)\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_setParameterValue", _wrap_IMultiLayerBuilder_setParameterValue, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_setParameterValue", _wrap_IMultiLayerBuilder_setParameterValue, METH_VARARGS, "\n"
 		"IMultiLayerBuilder_setParameterValue(IMultiLayerBuilder self, std::string const & name, double value)\n"
-		"\n"
 		"void IParameterized::setParameterValue(const std::string &name, double value)\n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_parametersToString", _wrap_IMultiLayerBuilder_parametersToString, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_parametersToString", _wrap_IMultiLayerBuilder_parametersToString, METH_O, "\n"
 		"IMultiLayerBuilder_parametersToString(IMultiLayerBuilder self) -> std::string\n"
-		"\n"
 		"std::string IParameterized::parametersToString() const\n"
 		"\n"
 		"Returns multiline string representing available parameters. \n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_createParameterTree", _wrap_IMultiLayerBuilder_createParameterTree, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_createParameterTree", _wrap_IMultiLayerBuilder_createParameterTree, METH_O, "\n"
 		"IMultiLayerBuilder_createParameterTree(IMultiLayerBuilder self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool * IParameterized::createParameterTree() const\n"
 		"\n"
 		"Creates new parameter pool, with all local parameters and those of its children. \n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_parameterPool", _wrap_IMultiLayerBuilder_parameterPool, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_parameterPool", _wrap_IMultiLayerBuilder_parameterPool, METH_O, "\n"
 		"IMultiLayerBuilder_parameterPool(IMultiLayerBuilder self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool* IParameterized::parameterPool() const\n"
 		"\n"
 		"Returns pointer to the parameter pool. \n"
 		"\n"
 		""},
-	 { (char *)"IMultiLayerBuilder_onChange", _wrap_IMultiLayerBuilder_onChange, METH_VARARGS, (char *)"\n"
+	 { "IMultiLayerBuilder_onChange", _wrap_IMultiLayerBuilder_onChange, METH_O, "\n"
 		"IMultiLayerBuilder_onChange(IMultiLayerBuilder self)\n"
-		"\n"
 		"virtual void IParameterized::onChange()\n"
 		"\n"
 		"Action to be taken in inherited class when a parameter has changed. \n"
 		"\n"
 		""},
-	 { (char *)"delete_IMultiLayerBuilder", _wrap_delete_IMultiLayerBuilder, METH_VARARGS, (char *)"delete_IMultiLayerBuilder(IMultiLayerBuilder self)"},
-	 { (char *)"disown_IMultiLayerBuilder", _wrap_disown_IMultiLayerBuilder, METH_VARARGS, NULL},
-	 { (char *)"IMultiLayerBuilder_swigregister", IMultiLayerBuilder_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_INodeVisitor", _wrap_new_INodeVisitor, METH_VARARGS, (char *)"\n"
+	 { "delete_IMultiLayerBuilder", _wrap_delete_IMultiLayerBuilder, METH_O, "delete_IMultiLayerBuilder(IMultiLayerBuilder self)"},
+	 { "disown_IMultiLayerBuilder", _wrap_disown_IMultiLayerBuilder, METH_O, NULL},
+	 { "IMultiLayerBuilder_swigregister", IMultiLayerBuilder_swigregister, METH_O, NULL},
+	 { "IMultiLayerBuilder_swiginit", IMultiLayerBuilder_swiginit, METH_VARARGS, NULL},
+	 { "new_INodeVisitor", _wrap_new_INodeVisitor, METH_NOARGS, "\n"
 		"new_INodeVisitor() -> INodeVisitor\n"
-		"\n"
 		"INodeVisitor::INodeVisitor()\n"
 		"\n"
 		""},
-	 { (char *)"delete_INodeVisitor", _wrap_delete_INodeVisitor, METH_VARARGS, (char *)"\n"
+	 { "delete_INodeVisitor", _wrap_delete_INodeVisitor, METH_O, "\n"
 		"delete_INodeVisitor(INodeVisitor self)\n"
-		"\n"
 		"virtual INodeVisitor::~INodeVisitor()\n"
 		"\n"
 		""},
-	 { (char *)"INodeVisitor_visit", _wrap_INodeVisitor_visit, METH_VARARGS, (char *)"\n"
-		"visit(BasicLattice arg2)\n"
-		"visit(Beam arg2)\n"
-		"visit(ConstantBackground arg2)\n"
-		"visit(ConvolutionDetectorResolution const * arg2)\n"
-		"visit(Crystal arg2)\n"
-		"visit(DistributionCosine arg2)\n"
-		"visit(DistributionGate arg2)\n"
-		"visit(DistributionGaussian arg2)\n"
-		"visit(DistributionLogNormal arg2)\n"
-		"visit(DistributionLorentz arg2)\n"
-		"visit(DistributionTrapezoid arg2)\n"
-		"visit(FootprintFactorGaussian arg2)\n"
-		"visit(FootprintFactorSquare arg2)\n"
-		"visit(FormFactorAnisoPyramid arg2)\n"
-		"visit(FormFactorBox arg2)\n"
-		"visit(FormFactorCone arg2)\n"
-		"visit(FormFactorCone6 arg2)\n"
-		"visit(FormFactorCoreShell const * arg2)\n"
-		"visit(FormFactorCrystal arg2)\n"
-		"visit(FormFactorCuboctahedron arg2)\n"
-		"visit(FormFactorCylinder arg2)\n"
-		"visit(FormFactorDecoratorMaterial const * arg2)\n"
-		"visit(FormFactorDecoratorPositionFactor const * arg2)\n"
-		"visit(FormFactorDecoratorRotation const * arg2)\n"
-		"visit(FormFactorDodecahedron arg2)\n"
-		"visit(FormFactorDWBA const * arg2)\n"
-		"visit(FormFactorDWBAPol const * arg2)\n"
-		"visit(FormFactorEllipsoidalCylinder arg2)\n"
-		"visit(FormFactorFullSphere arg2)\n"
-		"visit(FormFactorFullSpheroid arg2)\n"
-		"visit(FormFactorGauss arg2)\n"
-		"visit(FormFactorHemiEllipsoid arg2)\n"
-		"visit(FormFactorIcosahedron arg2)\n"
-		"visit(FormFactorLongBox arg2)\n"
-		"visit(FormFactorLongBoxGauss arg2)\n"
-		"visit(FormFactorLongBoxLorentz arg2)\n"
-		"visit(FormFactorLorentz arg2)\n"
-		"visit(FormFactorPrism3 arg2)\n"
-		"visit(FormFactorPrism6 arg2)\n"
-		"visit(FormFactorPyramid arg2)\n"
-		"visit(FormFactorRipple1 arg2)\n"
-		"visit(FormFactorRipple2 arg2)\n"
-		"visit(FormFactorSphereGaussianRadius arg2)\n"
-		"visit(FormFactorSphereLogNormalRadius arg2)\n"
-		"visit(FormFactorTetrahedron arg2)\n"
-		"visit(FormFactorDot arg2)\n"
-		"visit(FormFactorTruncatedCube arg2)\n"
-		"visit(FormFactorTruncatedSphere arg2)\n"
-		"visit(FormFactorTruncatedSpheroid arg2)\n"
-		"visit(FormFactorWeighted arg2)\n"
-		"visit(FTDecayFunction1DCauchy arg2)\n"
-		"visit(FTDecayFunction1DGauss arg2)\n"
-		"visit(FTDecayFunction1DTriangle arg2)\n"
-		"visit(FTDecayFunction1DVoigt arg2)\n"
-		"visit(FTDecayFunction2DCauchy arg2)\n"
-		"visit(FTDecayFunction2DGauss arg2)\n"
-		"visit(FTDecayFunction2DVoigt arg2)\n"
-		"visit(FTDistribution1DCauchy arg2)\n"
-		"visit(FTDistribution1DCosine arg2)\n"
-		"visit(FTDistribution1DGate arg2)\n"
-		"visit(FTDistribution1DGauss arg2)\n"
-		"visit(FTDistribution1DTriangle arg2)\n"
-		"visit(FTDistribution1DVoigt arg2)\n"
-		"visit(FTDistribution2DCauchy arg2)\n"
-		"visit(FTDistribution2DCone arg2)\n"
-		"visit(FTDistribution2DGate arg2)\n"
-		"visit(FTDistribution2DGauss arg2)\n"
-		"visit(FTDistribution2DVoigt arg2)\n"
-		"visit(GISASSimulation arg2)\n"
-		"visit(HexagonalLattice arg2)\n"
-		"visit(IAbstractParticle arg2)\n"
-		"visit(IClusteredParticles arg2)\n"
-		"visit(IdentityRotation arg2)\n"
-		"visit(IFormFactor arg2)\n"
-		"visit(IFormFactorBorn arg2)\n"
-		"visit(IFormFactorDecorator arg2)\n"
-		"visit(IInterferenceFunction arg2)\n"
-		"visit(ILayout arg2)\n"
-		"visit(INode arg2)\n"
-		"visit(Instrument arg2)\n"
-		"visit(IntensityNormalizer arg2)\n"
-		"visit(IntensityScaleAndShiftNormalizer arg2)\n"
-		"visit(InterferenceFunction1DLattice arg2)\n"
-		"visit(InterferenceFunction2DLattice arg2)\n"
-		"visit(InterferenceFunction2DParaCrystal arg2)\n"
-		"visit(InterferenceFunction2DSuperLattice arg2)\n"
-		"visit(InterferenceFunction3DLattice arg2)\n"
-		"visit(InterferenceFunctionFinite2DLattice arg2)\n"
-		"visit(InterferenceFunctionFinite3DLattice arg2)\n"
-		"visit(InterferenceFunctionHardDisk arg2)\n"
-		"visit(InterferenceFunctionRadialParaCrystal arg2)\n"
-		"visit(InterferenceFunctionTwin arg2)\n"
-		"visit(InterferenceFunctionNone arg2)\n"
-		"visit(IParticle arg2)\n"
-		"visit(IPeakShape arg2)\n"
-		"visit(IRotation arg2)\n"
-		"visit(ISample arg2)\n"
-		"visit(IsGISAXSDetector arg2)\n"
-		"visit(Layer arg2)\n"
-		"visit(LayerInterface const * arg2)\n"
-		"visit(LayerRoughness arg2)\n"
-		"visit(MesoCrystal arg2)\n"
-		"visit(MultiLayer arg2)\n"
-		"visit(OffSpecSimulation arg2)\n"
-		"visit(Particle arg2)\n"
-		"visit(ParticleComposition arg2)\n"
-		"visit(ParticleCoreShell arg2)\n"
-		"visit(ParticleDistribution arg2)\n"
-		"visit(ParticleLayout arg2)\n"
-		"visit(PoissonNoiseBackground arg2)\n"
-		"visit(RectangularDetector arg2)\n"
-		"visit(ResolutionFunction2DGaussian arg2)\n"
-		"visit(RotationEuler arg2)\n"
-		"visit(RotationX arg2)\n"
-		"visit(RotationY arg2)\n"
-		"visit(RotationZ arg2)\n"
-		"visit(SpecularDetector1D const * arg2)\n"
-		"visit(SpecularSimulation arg2)\n"
-		"visit(SphericalDetector arg2)\n"
-		"INodeVisitor_visit(INodeVisitor self, SquareLattice arg3)\n"
-		"\n"
+	 { "INodeVisitor_visit", _wrap_INodeVisitor_visit, METH_VARARGS, "\n"
+		"INodeVisitor_visit(INodeVisitor self, BasicLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, Beam arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ConstantBackground arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ConvolutionDetectorResolution const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, Crystal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionCosine arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionGate arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionGaussian arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionLogNormal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionLorentz arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, DistributionTrapezoid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FootprintFactorGaussian arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FootprintFactorSquare arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorAnisoPyramid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorBox arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCone arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCone6 arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCoreShell const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCrystal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCuboctahedron arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorCylinder arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDecoratorMaterial const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDecoratorPositionFactor const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDecoratorRotation const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDodecahedron arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDWBA const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDWBAPol const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorEllipsoidalCylinder arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorFullSphere arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorFullSpheroid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorHemiEllipsoid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorIcosahedron arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorLongBox arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorLongBoxGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorLongBoxLorentz arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorLorentz arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorPrism3 arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorPrism6 arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorPyramid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorRipple1 arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorRipple2 arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorSphereGaussianRadius arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorSphereLogNormalRadius arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorTetrahedron arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorDot arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorTruncatedCube arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorTruncatedSphere arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorTruncatedSpheroid arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FormFactorWeighted arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction1DCauchy arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction1DGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction1DTriangle arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction1DVoigt arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction2DCauchy arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction2DGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDecayFunction2DVoigt arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DCauchy arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DCosine arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DGate arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DTriangle arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution1DVoigt arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution2DCauchy arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution2DCone arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution2DGate arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution2DGauss arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, FTDistribution2DVoigt arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, GISASSimulation arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, HexagonalLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IAbstractParticle arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IClusteredParticles arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IdentityRotation arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IFormFactor arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IFormFactorBorn arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IFormFactorDecorator arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IInterferenceFunction arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ILayout arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, INode arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, Instrument arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IntensityNormalizer arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IntensityScaleAndShiftNormalizer arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunction1DLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunction2DLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunction2DParaCrystal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunction2DSuperLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunction3DLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionFinite2DLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionFinite3DLattice arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionHardDisk arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionRadialParaCrystal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionTwin arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, InterferenceFunctionNone arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IParticle arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IPeakShape arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IRotation arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ISample arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, IsGISAXSDetector arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, Layer arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, LayerInterface const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, LayerRoughness arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, MesoCrystal arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, MultiLayer arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, OffSpecSimulation arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, Particle arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ParticleComposition arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ParticleCoreShell arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ParticleDistribution arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ParticleLayout arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, PoissonNoiseBackground arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, RectangularDetector arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, ResolutionFunction2DGaussian arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, RotationEuler arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, RotationX arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, RotationY arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, RotationZ arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, SpecularDetector1D const * arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, SpecularSimulation arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, SphericalDetector arg2)\n"
+		"INodeVisitor_visit(INodeVisitor self, SquareLattice arg2)\n"
 		"virtual void INodeVisitor::visit(const SquareLattice *)\n"
 		"\n"
 		""},
-	 { (char *)"INodeVisitor_depth", _wrap_INodeVisitor_depth, METH_VARARGS, (char *)"\n"
+	 { "INodeVisitor_depth", _wrap_INodeVisitor_depth, METH_O, "\n"
 		"INodeVisitor_depth(INodeVisitor self) -> int\n"
-		"\n"
 		"int INodeVisitor::depth() const\n"
 		"\n"
 		"Returns depth of the visitor in the composite hierarchy. \n"
 		"\n"
 		""},
-	 { (char *)"INodeVisitor_setDepth", _wrap_INodeVisitor_setDepth, METH_VARARGS, (char *)"\n"
+	 { "INodeVisitor_setDepth", _wrap_INodeVisitor_setDepth, METH_VARARGS, "\n"
 		"INodeVisitor_setDepth(INodeVisitor self, int depth)\n"
-		"\n"
 		"void INodeVisitor::setDepth(int depth)\n"
 		"\n"
 		"Sets depth of the visitor in the composite hierarchy. \n"
 		"\n"
 		""},
-	 { (char *)"INodeVisitor_swigregister", INodeVisitor_swigregister, METH_VARARGS, NULL},
-	 { (char *)"VisitNodesPreorder", _wrap_VisitNodesPreorder, METH_VARARGS, (char *)"\n"
+	 { "INodeVisitor_swigregister", INodeVisitor_swigregister, METH_O, NULL},
+	 { "INodeVisitor_swiginit", INodeVisitor_swiginit, METH_VARARGS, NULL},
+	 { "VisitNodesPreorder", _wrap_VisitNodesPreorder, METH_VARARGS, "\n"
 		"VisitNodesPreorder(INode node, INodeVisitor visitor)\n"
-		"\n"
 		"BA_CORE_API_ void VisitNodesPreorder(const INode &node, INodeVisitor &visitor)\n"
 		"\n"
 		""},
-	 { (char *)"VisitNodesPostorder", _wrap_VisitNodesPostorder, METH_VARARGS, (char *)"\n"
+	 { "VisitNodesPostorder", _wrap_VisitNodesPostorder, METH_VARARGS, "\n"
 		"VisitNodesPostorder(INode node, INodeVisitor visitor)\n"
-		"\n"
 		"BA_CORE_API_ void VisitNodesPostorder(const INode &node, INodeVisitor &visitor)\n"
 		"\n"
 		""},
-	 { (char *)"IClusteredParticles_clone", _wrap_IClusteredParticles_clone, METH_VARARGS, (char *)"\n"
+	 { "IClusteredParticles_clone", _wrap_IClusteredParticles_clone, METH_O, "\n"
 		"IClusteredParticles_clone(IClusteredParticles self) -> IClusteredParticles\n"
-		"\n"
 		"IClusteredParticles* IClusteredParticles::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IClusteredParticles_accept", _wrap_IClusteredParticles_accept, METH_VARARGS, (char *)"\n"
+	 { "IClusteredParticles_accept", _wrap_IClusteredParticles_accept, METH_VARARGS, "\n"
 		"IClusteredParticles_accept(IClusteredParticles self, INodeVisitor visitor)\n"
-		"\n"
 		"void IClusteredParticles::accept(INodeVisitor *visitor) const override=0\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IClusteredParticles_createTotalFormFactor", _wrap_IClusteredParticles_createTotalFormFactor, METH_VARARGS, (char *)"\n"
-		"IClusteredParticles_createTotalFormFactor(IClusteredParticles self, IFormFactor arg3, IRotation arg4, kvector_t arg5) -> IFormFactor\n"
-		"\n"
+	 { "IClusteredParticles_createTotalFormFactor", _wrap_IClusteredParticles_createTotalFormFactor, METH_VARARGS, "\n"
+		"IClusteredParticles_createTotalFormFactor(IClusteredParticles self, IFormFactor arg2, IRotation arg3, kvector_t arg4) -> IFormFactor\n"
 		"virtual IFormFactor* IClusteredParticles::createTotalFormFactor(const IFormFactor &, const IRotation *, const kvector_t &) const =0\n"
 		"\n"
 		"Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the  IClusteredParticles object itself \n"
 		"\n"
 		""},
-	 { (char *)"IClusteredParticles_homogeneousRegions", _wrap_IClusteredParticles_homogeneousRegions, METH_VARARGS, (char *)"\n"
+	 { "IClusteredParticles_homogeneousRegions", _wrap_IClusteredParticles_homogeneousRegions, METH_O, "\n"
 		"IClusteredParticles_homogeneousRegions(IClusteredParticles self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >\n"
-		"\n"
 		"virtual std::vector<HomogeneousRegion> IClusteredParticles::homogeneousRegions() const =0\n"
 		"\n"
 		"Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume \n"
 		"\n"
 		""},
-	 { (char *)"delete_IClusteredParticles", _wrap_delete_IClusteredParticles, METH_VARARGS, (char *)"delete_IClusteredParticles(IClusteredParticles self)"},
-	 { (char *)"IClusteredParticles_swigregister", IClusteredParticles_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Crystal", _wrap_new_Crystal, METH_VARARGS, (char *)"\n"
+	 { "delete_IClusteredParticles", _wrap_delete_IClusteredParticles, METH_O, "delete_IClusteredParticles(IClusteredParticles self)"},
+	 { "IClusteredParticles_swigregister", IClusteredParticles_swigregister, METH_O, NULL},
+	 { "new_Crystal", _wrap_new_Crystal, METH_VARARGS, "\n"
 		"new_Crystal(IParticle lattice_basis, Lattice lattice) -> Crystal\n"
-		"\n"
 		"Crystal::Crystal(const IParticle &lattice_basis, const Lattice &lattice)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Crystal", _wrap_delete_Crystal, METH_VARARGS, (char *)"\n"
+	 { "delete_Crystal", _wrap_delete_Crystal, METH_O, "\n"
 		"delete_Crystal(Crystal self)\n"
-		"\n"
 		"Crystal::~Crystal()\n"
 		"\n"
 		""},
-	 { (char *)"Crystal_clone", _wrap_Crystal_clone, METH_VARARGS, (char *)"\n"
+	 { "Crystal_clone", _wrap_Crystal_clone, METH_O, "\n"
 		"Crystal_clone(Crystal self) -> Crystal\n"
-		"\n"
 		"Crystal * Crystal::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"Crystal_accept", _wrap_Crystal_accept, METH_VARARGS, (char *)"\n"
+	 { "Crystal_accept", _wrap_Crystal_accept, METH_VARARGS, "\n"
 		"Crystal_accept(Crystal self, INodeVisitor visitor)\n"
-		"\n"
 		"void Crystal::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Crystal_createTotalFormFactor", _wrap_Crystal_createTotalFormFactor, METH_VARARGS, (char *)"\n"
+	 { "Crystal_createTotalFormFactor", _wrap_Crystal_createTotalFormFactor, METH_VARARGS, "\n"
 		"Crystal_createTotalFormFactor(Crystal self, IFormFactor meso_crystal_form_factor, IRotation p_rotation, kvector_t translation) -> IFormFactor\n"
-		"\n"
 		"IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const override final\n"
 		"\n"
 		"Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the  IClusteredParticles object itself \n"
 		"\n"
 		""},
-	 { (char *)"Crystal_homogeneousRegions", _wrap_Crystal_homogeneousRegions, METH_VARARGS, (char *)"\n"
+	 { "Crystal_homogeneousRegions", _wrap_Crystal_homogeneousRegions, METH_O, "\n"
 		"Crystal_homogeneousRegions(Crystal self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >\n"
-		"\n"
 		"std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const override final\n"
 		"\n"
 		"Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume \n"
 		"\n"
 		""},
-	 { (char *)"Crystal_transformedLattice", _wrap_Crystal_transformedLattice, METH_VARARGS, (char *)"\n"
-		"transformedLattice(IRotation p_rotation=None) -> Lattice\n"
-		"Crystal_transformedLattice(Crystal self) -> Lattice\n"
-		"\n"
+	 { "Crystal_transformedLattice", _wrap_Crystal_transformedLattice, METH_VARARGS, "\n"
+		"Crystal_transformedLattice(Crystal self, IRotation p_rotation=None) -> Lattice\n"
 		"Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const\n"
 		"\n"
 		""},
-	 { (char *)"Crystal_setPositionVariance", _wrap_Crystal_setPositionVariance, METH_VARARGS, (char *)"\n"
+	 { "Crystal_setPositionVariance", _wrap_Crystal_setPositionVariance, METH_VARARGS, "\n"
 		"Crystal_setPositionVariance(Crystal self, double position_variance)\n"
-		"\n"
 		"void Crystal::setPositionVariance(double position_variance)\n"
 		"\n"
 		""},
-	 { (char *)"Crystal_getChildren", _wrap_Crystal_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Crystal_getChildren", _wrap_Crystal_getChildren, METH_O, "\n"
 		"Crystal_getChildren(Crystal self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Crystal::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"Crystal_swigregister", Crystal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IDistribution1D", _wrap_delete_IDistribution1D, METH_VARARGS, (char *)"\n"
+	 { "Crystal_swigregister", Crystal_swigregister, METH_O, NULL},
+	 { "Crystal_swiginit", Crystal_swiginit, METH_VARARGS, NULL},
+	 { "delete_IDistribution1D", _wrap_delete_IDistribution1D, METH_O, "\n"
 		"delete_IDistribution1D(IDistribution1D self)\n"
-		"\n"
 		"virtual IDistribution1D::~IDistribution1D()\n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_clone", _wrap_IDistribution1D_clone, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_clone", _wrap_IDistribution1D_clone, METH_O, "\n"
 		"IDistribution1D_clone(IDistribution1D self) -> IDistribution1D\n"
-		"\n"
 		"virtual IDistribution1D* IDistribution1D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_probabilityDensity", _wrap_IDistribution1D_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_probabilityDensity", _wrap_IDistribution1D_probabilityDensity, METH_VARARGS, "\n"
 		"IDistribution1D_probabilityDensity(IDistribution1D self, double x) -> double\n"
-		"\n"
 		"virtual double IDistribution1D::probabilityDensity(double x) const =0\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_getMean", _wrap_IDistribution1D_getMean, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_getMean", _wrap_IDistribution1D_getMean, METH_O, "\n"
 		"IDistribution1D_getMean(IDistribution1D self) -> double\n"
-		"\n"
 		"virtual double IDistribution1D::getMean() const =0\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_equidistantSamples", _wrap_IDistribution1D_equidistantSamples, METH_VARARGS, (char *)"\n"
-		"equidistantSamples(size_t nbr_samples, double sigma_factor=0., RealLimits limits) -> ParameterSampleVector\n"
-		"equidistantSamples(size_t nbr_samples, double sigma_factor=0.) -> ParameterSampleVector\n"
-		"IDistribution1D_equidistantSamples(IDistribution1D self, size_t nbr_samples) -> ParameterSampleVector\n"
-		"\n"
+	 { "IDistribution1D_equidistantSamples", _wrap_IDistribution1D_equidistantSamples, METH_VARARGS, "\n"
+		"IDistribution1D_equidistantSamples(IDistribution1D self, size_t nbr_samples, double sigma_factor=0., RealLimits limits=RealLimits()) -> ParameterSampleVector\n"
 		"std::vector< ParameterSample > IDistribution1D::equidistantSamples(size_t nbr_samples, double sigma_factor=0., const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"Returns equidistant samples, using intrinsic parameters, weighted with  probabilityDensity(). \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_equidistantSamplesInRange", _wrap_IDistribution1D_equidistantSamplesInRange, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_equidistantSamplesInRange", _wrap_IDistribution1D_equidistantSamplesInRange, METH_VARARGS, "\n"
 		"IDistribution1D_equidistantSamplesInRange(IDistribution1D self, size_t nbr_samples, double xmin, double xmax) -> ParameterSampleVector\n"
-		"\n"
 		"std::vector< ParameterSample > IDistribution1D::equidistantSamplesInRange(size_t nbr_samples, double xmin, double xmax) const\n"
 		"\n"
 		"Returns equidistant samples from xmin to xmax, weighted with  probabilityDensity(). \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_equidistantPoints", _wrap_IDistribution1D_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"IDistribution1D_equidistantPoints(IDistribution1D self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "IDistribution1D_equidistantPoints", _wrap_IDistribution1D_equidistantPoints, METH_VARARGS, "\n"
+		"IDistribution1D_equidistantPoints(IDistribution1D self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"virtual std::vector<double> IDistribution1D::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const =0\n"
 		"\n"
 		"Returns equidistant interpolation points, with range computed in distribution-specific way from mean and width parameter, taking into account limits and sigma_factor. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_equidistantPointsInRange", _wrap_IDistribution1D_equidistantPointsInRange, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_equidistantPointsInRange", _wrap_IDistribution1D_equidistantPointsInRange, METH_VARARGS, "\n"
 		"IDistribution1D_equidistantPointsInRange(IDistribution1D self, size_t nbr_samples, double xmin, double xmax) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > IDistribution1D::equidistantPointsInRange(size_t nbr_samples, double xmin, double xmax) const\n"
 		"\n"
 		"Returns equidistant interpolation points from xmin to xmax. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_isDelta", _wrap_IDistribution1D_isDelta, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_isDelta", _wrap_IDistribution1D_isDelta, METH_O, "\n"
 		"IDistribution1D_isDelta(IDistribution1D self) -> bool\n"
-		"\n"
 		"virtual bool IDistribution1D::isDelta() const =0\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_setUnits", _wrap_IDistribution1D_setUnits, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_setUnits", _wrap_IDistribution1D_setUnits, METH_VARARGS, "\n"
 		"IDistribution1D_setUnits(IDistribution1D self, std::string const & units)\n"
-		"\n"
 		"void IDistribution1D::setUnits(const std::string &units)\n"
 		"\n"
 		"Sets distribution units. \n"
 		"\n"
 		""},
-	 { (char *)"IDistribution1D_swigregister", IDistribution1D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionGate", _wrap_new_DistributionGate, METH_VARARGS, (char *)"\n"
+	 { "IDistribution1D_swigregister", IDistribution1D_swigregister, METH_O, NULL},
+	 { "new_DistributionGate", _wrap_new_DistributionGate, METH_VARARGS, "\n"
 		"DistributionGate()\n"
 		"new_DistributionGate(double min, double max) -> DistributionGate\n"
-		"\n"
 		"DistributionGate::DistributionGate(double min, double max)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionGate", _wrap_delete_DistributionGate, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionGate", _wrap_delete_DistributionGate, METH_O, "\n"
 		"delete_DistributionGate(DistributionGate self)\n"
-		"\n"
 		"virtual DistributionGate::~DistributionGate()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_clone", _wrap_DistributionGate_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_clone", _wrap_DistributionGate_clone, METH_O, "\n"
 		"DistributionGate_clone(DistributionGate self) -> DistributionGate\n"
-		"\n"
 		"DistributionGate* DistributionGate::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_probabilityDensity", _wrap_DistributionGate_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_probabilityDensity", _wrap_DistributionGate_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionGate_probabilityDensity(DistributionGate self, double x) -> double\n"
-		"\n"
 		"double DistributionGate::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_getMean", _wrap_DistributionGate_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_getMean", _wrap_DistributionGate_getMean, METH_O, "\n"
 		"DistributionGate_getMean(DistributionGate self) -> double\n"
-		"\n"
 		"double DistributionGate::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_getMin", _wrap_DistributionGate_getMin, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_getMin", _wrap_DistributionGate_getMin, METH_O, "\n"
 		"DistributionGate_getMin(DistributionGate self) -> double\n"
-		"\n"
 		"double DistributionGate::getMin() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_getMax", _wrap_DistributionGate_getMax, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_getMax", _wrap_DistributionGate_getMax, METH_O, "\n"
 		"DistributionGate_getMax(DistributionGate self) -> double\n"
-		"\n"
 		"double DistributionGate::getMax() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_equidistantPoints", _wrap_DistributionGate_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionGate_equidistantPoints(DistributionGate self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionGate_equidistantPoints", _wrap_DistributionGate_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionGate_equidistantPoints(DistributionGate self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionGate::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"Returns list of sample values. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_isDelta", _wrap_DistributionGate_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_isDelta", _wrap_DistributionGate_isDelta, METH_O, "\n"
 		"DistributionGate_isDelta(DistributionGate self) -> bool\n"
-		"\n"
 		"bool DistributionGate::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_accept", _wrap_DistributionGate_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_accept", _wrap_DistributionGate_accept, METH_VARARGS, "\n"
 		"DistributionGate_accept(DistributionGate self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionGate::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGate_swigregister", DistributionGate_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionLorentz", _wrap_new_DistributionLorentz, METH_VARARGS, (char *)"\n"
+	 { "DistributionGate_swigregister", DistributionGate_swigregister, METH_O, NULL},
+	 { "DistributionGate_swiginit", DistributionGate_swiginit, METH_VARARGS, NULL},
+	 { "new_DistributionLorentz", _wrap_new_DistributionLorentz, METH_VARARGS, "\n"
 		"DistributionLorentz()\n"
 		"new_DistributionLorentz(double mean, double hwhm) -> DistributionLorentz\n"
-		"\n"
 		"DistributionLorentz::DistributionLorentz(double mean, double hwhm)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionLorentz", _wrap_delete_DistributionLorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionLorentz", _wrap_delete_DistributionLorentz, METH_O, "\n"
 		"delete_DistributionLorentz(DistributionLorentz self)\n"
-		"\n"
 		"virtual DistributionLorentz::~DistributionLorentz()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_clone", _wrap_DistributionLorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_clone", _wrap_DistributionLorentz_clone, METH_O, "\n"
 		"DistributionLorentz_clone(DistributionLorentz self) -> DistributionLorentz\n"
-		"\n"
 		"DistributionLorentz* DistributionLorentz::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_probabilityDensity", _wrap_DistributionLorentz_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_probabilityDensity", _wrap_DistributionLorentz_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionLorentz_probabilityDensity(DistributionLorentz self, double x) -> double\n"
-		"\n"
 		"double DistributionLorentz::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_getMean", _wrap_DistributionLorentz_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_getMean", _wrap_DistributionLorentz_getMean, METH_O, "\n"
 		"DistributionLorentz_getMean(DistributionLorentz self) -> double\n"
-		"\n"
 		"double DistributionLorentz::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_getHWHM", _wrap_DistributionLorentz_getHWHM, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_getHWHM", _wrap_DistributionLorentz_getHWHM, METH_O, "\n"
 		"DistributionLorentz_getHWHM(DistributionLorentz self) -> double\n"
-		"\n"
 		"double DistributionLorentz::getHWHM() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_equidistantPoints", _wrap_DistributionLorentz_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionLorentz_equidistantPoints(DistributionLorentz self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionLorentz_equidistantPoints", _wrap_DistributionLorentz_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionLorentz_equidistantPoints(DistributionLorentz self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionLorentz::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"generate list of sample values \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_isDelta", _wrap_DistributionLorentz_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_isDelta", _wrap_DistributionLorentz_isDelta, METH_O, "\n"
 		"DistributionLorentz_isDelta(DistributionLorentz self) -> bool\n"
-		"\n"
 		"bool DistributionLorentz::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_accept", _wrap_DistributionLorentz_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_accept", _wrap_DistributionLorentz_accept, METH_VARARGS, "\n"
 		"DistributionLorentz_accept(DistributionLorentz self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionLorentz::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLorentz_swigregister", DistributionLorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionGaussian", _wrap_new_DistributionGaussian, METH_VARARGS, (char *)"\n"
+	 { "DistributionLorentz_swigregister", DistributionLorentz_swigregister, METH_O, NULL},
+	 { "DistributionLorentz_swiginit", DistributionLorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_DistributionGaussian", _wrap_new_DistributionGaussian, METH_VARARGS, "\n"
 		"DistributionGaussian()\n"
 		"new_DistributionGaussian(double mean, double std_dev) -> DistributionGaussian\n"
-		"\n"
 		"DistributionGaussian::DistributionGaussian(double mean, double std_dev)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionGaussian", _wrap_delete_DistributionGaussian, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionGaussian", _wrap_delete_DistributionGaussian, METH_O, "\n"
 		"delete_DistributionGaussian(DistributionGaussian self)\n"
-		"\n"
 		"virtual DistributionGaussian::~DistributionGaussian()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_clone", _wrap_DistributionGaussian_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_clone", _wrap_DistributionGaussian_clone, METH_O, "\n"
 		"DistributionGaussian_clone(DistributionGaussian self) -> DistributionGaussian\n"
-		"\n"
 		"DistributionGaussian* DistributionGaussian::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_probabilityDensity", _wrap_DistributionGaussian_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_probabilityDensity", _wrap_DistributionGaussian_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionGaussian_probabilityDensity(DistributionGaussian self, double x) -> double\n"
-		"\n"
 		"double DistributionGaussian::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_getMean", _wrap_DistributionGaussian_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_getMean", _wrap_DistributionGaussian_getMean, METH_O, "\n"
 		"DistributionGaussian_getMean(DistributionGaussian self) -> double\n"
-		"\n"
 		"double DistributionGaussian::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_getStdDev", _wrap_DistributionGaussian_getStdDev, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_getStdDev", _wrap_DistributionGaussian_getStdDev, METH_O, "\n"
 		"DistributionGaussian_getStdDev(DistributionGaussian self) -> double\n"
-		"\n"
 		"double DistributionGaussian::getStdDev() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_equidistantPoints", _wrap_DistributionGaussian_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionGaussian_equidistantPoints(DistributionGaussian self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionGaussian_equidistantPoints", _wrap_DistributionGaussian_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionGaussian_equidistantPoints(DistributionGaussian self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionGaussian::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"generate list of sample values \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_isDelta", _wrap_DistributionGaussian_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_isDelta", _wrap_DistributionGaussian_isDelta, METH_O, "\n"
 		"DistributionGaussian_isDelta(DistributionGaussian self) -> bool\n"
-		"\n"
 		"bool DistributionGaussian::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_accept", _wrap_DistributionGaussian_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_accept", _wrap_DistributionGaussian_accept, METH_VARARGS, "\n"
 		"DistributionGaussian_accept(DistributionGaussian self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionGaussian::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionGaussian_swigregister", DistributionGaussian_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionLogNormal", _wrap_new_DistributionLogNormal, METH_VARARGS, (char *)"\n"
+	 { "DistributionGaussian_swigregister", DistributionGaussian_swigregister, METH_O, NULL},
+	 { "DistributionGaussian_swiginit", DistributionGaussian_swiginit, METH_VARARGS, NULL},
+	 { "new_DistributionLogNormal", _wrap_new_DistributionLogNormal, METH_VARARGS, "\n"
 		"DistributionLogNormal(double scale_param)\n"
 		"new_DistributionLogNormal(double median, double scale_param) -> DistributionLogNormal\n"
-		"\n"
 		"DistributionLogNormal::DistributionLogNormal(double median, double scale_param)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionLogNormal", _wrap_delete_DistributionLogNormal, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionLogNormal", _wrap_delete_DistributionLogNormal, METH_O, "\n"
 		"delete_DistributionLogNormal(DistributionLogNormal self)\n"
-		"\n"
 		"virtual DistributionLogNormal::~DistributionLogNormal()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_clone", _wrap_DistributionLogNormal_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_clone", _wrap_DistributionLogNormal_clone, METH_O, "\n"
 		"DistributionLogNormal_clone(DistributionLogNormal self) -> DistributionLogNormal\n"
-		"\n"
 		"DistributionLogNormal* DistributionLogNormal::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_probabilityDensity", _wrap_DistributionLogNormal_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_probabilityDensity", _wrap_DistributionLogNormal_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionLogNormal_probabilityDensity(DistributionLogNormal self, double x) -> double\n"
-		"\n"
 		"double DistributionLogNormal::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_getMean", _wrap_DistributionLogNormal_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_getMean", _wrap_DistributionLogNormal_getMean, METH_O, "\n"
 		"DistributionLogNormal_getMean(DistributionLogNormal self) -> double\n"
-		"\n"
 		"double DistributionLogNormal::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_getMedian", _wrap_DistributionLogNormal_getMedian, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_getMedian", _wrap_DistributionLogNormal_getMedian, METH_O, "\n"
 		"DistributionLogNormal_getMedian(DistributionLogNormal self) -> double\n"
-		"\n"
 		"double DistributionLogNormal::getMedian() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_getScalePar", _wrap_DistributionLogNormal_getScalePar, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_getScalePar", _wrap_DistributionLogNormal_getScalePar, METH_O, "\n"
 		"DistributionLogNormal_getScalePar(DistributionLogNormal self) -> double\n"
-		"\n"
 		"double DistributionLogNormal::getScalePar() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_equidistantPoints", _wrap_DistributionLogNormal_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionLogNormal_equidistantPoints(DistributionLogNormal self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionLogNormal_equidistantPoints", _wrap_DistributionLogNormal_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionLogNormal_equidistantPoints(DistributionLogNormal self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionLogNormal::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"generate list of sample values \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_isDelta", _wrap_DistributionLogNormal_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_isDelta", _wrap_DistributionLogNormal_isDelta, METH_O, "\n"
 		"DistributionLogNormal_isDelta(DistributionLogNormal self) -> bool\n"
-		"\n"
 		"bool DistributionLogNormal::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_accept", _wrap_DistributionLogNormal_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_accept", _wrap_DistributionLogNormal_accept, METH_VARARGS, "\n"
 		"DistributionLogNormal_accept(DistributionLogNormal self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionLogNormal::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_setUnits", _wrap_DistributionLogNormal_setUnits, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_setUnits", _wrap_DistributionLogNormal_setUnits, METH_VARARGS, "\n"
 		"DistributionLogNormal_setUnits(DistributionLogNormal self, std::string const & units)\n"
-		"\n"
 		"void DistributionLogNormal::setUnits(const std::string &units)\n"
 		"\n"
 		"Sets distribution units. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionLogNormal_swigregister", DistributionLogNormal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionCosine", _wrap_new_DistributionCosine, METH_VARARGS, (char *)"\n"
+	 { "DistributionLogNormal_swigregister", DistributionLogNormal_swigregister, METH_O, NULL},
+	 { "DistributionLogNormal_swiginit", DistributionLogNormal_swiginit, METH_VARARGS, NULL},
+	 { "new_DistributionCosine", _wrap_new_DistributionCosine, METH_VARARGS, "\n"
 		"DistributionCosine()\n"
 		"new_DistributionCosine(double mean, double sigma) -> DistributionCosine\n"
-		"\n"
 		"DistributionCosine::DistributionCosine(double mean, double sigma)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionCosine", _wrap_delete_DistributionCosine, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionCosine", _wrap_delete_DistributionCosine, METH_O, "\n"
 		"delete_DistributionCosine(DistributionCosine self)\n"
-		"\n"
 		"virtual DistributionCosine::~DistributionCosine()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_clone", _wrap_DistributionCosine_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_clone", _wrap_DistributionCosine_clone, METH_O, "\n"
 		"DistributionCosine_clone(DistributionCosine self) -> DistributionCosine\n"
-		"\n"
 		"DistributionCosine* DistributionCosine::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_probabilityDensity", _wrap_DistributionCosine_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_probabilityDensity", _wrap_DistributionCosine_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionCosine_probabilityDensity(DistributionCosine self, double x) -> double\n"
-		"\n"
 		"double DistributionCosine::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_getMean", _wrap_DistributionCosine_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_getMean", _wrap_DistributionCosine_getMean, METH_O, "\n"
 		"DistributionCosine_getMean(DistributionCosine self) -> double\n"
-		"\n"
 		"double DistributionCosine::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_getSigma", _wrap_DistributionCosine_getSigma, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_getSigma", _wrap_DistributionCosine_getSigma, METH_O, "\n"
 		"DistributionCosine_getSigma(DistributionCosine self) -> double\n"
-		"\n"
 		"double DistributionCosine::getSigma() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_equidistantPoints", _wrap_DistributionCosine_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionCosine_equidistantPoints(DistributionCosine self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionCosine_equidistantPoints", _wrap_DistributionCosine_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionCosine_equidistantPoints(DistributionCosine self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionCosine::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"generate list of sample values \n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_isDelta", _wrap_DistributionCosine_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_isDelta", _wrap_DistributionCosine_isDelta, METH_O, "\n"
 		"DistributionCosine_isDelta(DistributionCosine self) -> bool\n"
-		"\n"
 		"bool DistributionCosine::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_accept", _wrap_DistributionCosine_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_accept", _wrap_DistributionCosine_accept, METH_VARARGS, "\n"
 		"DistributionCosine_accept(DistributionCosine self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionCosine::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionCosine_swigregister", DistributionCosine_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DistributionTrapezoid", _wrap_new_DistributionTrapezoid, METH_VARARGS, (char *)"\n"
+	 { "DistributionCosine_swigregister", DistributionCosine_swigregister, METH_O, NULL},
+	 { "DistributionCosine_swiginit", DistributionCosine_swiginit, METH_VARARGS, NULL},
+	 { "new_DistributionTrapezoid", _wrap_new_DistributionTrapezoid, METH_VARARGS, "\n"
 		"DistributionTrapezoid()\n"
 		"new_DistributionTrapezoid(double center, double left_width, double middle_width, double right_width) -> DistributionTrapezoid\n"
-		"\n"
 		"DistributionTrapezoid::DistributionTrapezoid(double center, double left_width, double middle_width, double right_width)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DistributionTrapezoid", _wrap_delete_DistributionTrapezoid, METH_VARARGS, (char *)"\n"
+	 { "delete_DistributionTrapezoid", _wrap_delete_DistributionTrapezoid, METH_O, "\n"
 		"delete_DistributionTrapezoid(DistributionTrapezoid self)\n"
-		"\n"
 		"virtual DistributionTrapezoid::~DistributionTrapezoid()\n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_clone", _wrap_DistributionTrapezoid_clone, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_clone", _wrap_DistributionTrapezoid_clone, METH_O, "\n"
 		"DistributionTrapezoid_clone(DistributionTrapezoid self) -> DistributionTrapezoid\n"
-		"\n"
 		"DistributionTrapezoid* DistributionTrapezoid::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_probabilityDensity", _wrap_DistributionTrapezoid_probabilityDensity, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_probabilityDensity", _wrap_DistributionTrapezoid_probabilityDensity, METH_VARARGS, "\n"
 		"DistributionTrapezoid_probabilityDensity(DistributionTrapezoid self, double x) -> double\n"
-		"\n"
 		"double DistributionTrapezoid::probabilityDensity(double x) const final\n"
 		"\n"
 		"Returns the distribution-specific probability density for value x. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_getMean", _wrap_DistributionTrapezoid_getMean, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_getMean", _wrap_DistributionTrapezoid_getMean, METH_O, "\n"
 		"DistributionTrapezoid_getMean(DistributionTrapezoid self) -> double\n"
-		"\n"
 		"double DistributionTrapezoid::getMean() const final\n"
 		"\n"
 		"Returns the distribution-specific mean. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_getLeftWidth", _wrap_DistributionTrapezoid_getLeftWidth, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_getLeftWidth", _wrap_DistributionTrapezoid_getLeftWidth, METH_O, "\n"
 		"DistributionTrapezoid_getLeftWidth(DistributionTrapezoid self) -> double\n"
-		"\n"
 		"double DistributionTrapezoid::getLeftWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_getMiddleWidth", _wrap_DistributionTrapezoid_getMiddleWidth, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_getMiddleWidth", _wrap_DistributionTrapezoid_getMiddleWidth, METH_O, "\n"
 		"DistributionTrapezoid_getMiddleWidth(DistributionTrapezoid self) -> double\n"
-		"\n"
 		"double DistributionTrapezoid::getMiddleWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_getRightWidth", _wrap_DistributionTrapezoid_getRightWidth, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_getRightWidth", _wrap_DistributionTrapezoid_getRightWidth, METH_O, "\n"
 		"DistributionTrapezoid_getRightWidth(DistributionTrapezoid self) -> double\n"
-		"\n"
 		"double DistributionTrapezoid::getRightWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_equidistantPoints", _wrap_DistributionTrapezoid_equidistantPoints, METH_VARARGS, (char *)"\n"
-		"equidistantPoints(size_t nbr_samples, double sigma_factor, RealLimits limits) -> vdouble1d_t\n"
-		"DistributionTrapezoid_equidistantPoints(DistributionTrapezoid self, size_t nbr_samples, double sigma_factor) -> vdouble1d_t\n"
-		"\n"
+	 { "DistributionTrapezoid_equidistantPoints", _wrap_DistributionTrapezoid_equidistantPoints, METH_VARARGS, "\n"
+		"DistributionTrapezoid_equidistantPoints(DistributionTrapezoid self, size_t nbr_samples, double sigma_factor, RealLimits limits=RealLimits()) -> vdouble1d_t\n"
 		"std::vector< double > DistributionTrapezoid::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const\n"
 		"\n"
 		"generate list of sample values \n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_isDelta", _wrap_DistributionTrapezoid_isDelta, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_isDelta", _wrap_DistributionTrapezoid_isDelta, METH_O, "\n"
 		"DistributionTrapezoid_isDelta(DistributionTrapezoid self) -> bool\n"
-		"\n"
 		"bool DistributionTrapezoid::isDelta() const final\n"
 		"\n"
 		"Returns true if the distribution is in the limit case of a Dirac delta distribution. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_accept", _wrap_DistributionTrapezoid_accept, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_accept", _wrap_DistributionTrapezoid_accept, METH_VARARGS, "\n"
 		"DistributionTrapezoid_accept(DistributionTrapezoid self, INodeVisitor visitor)\n"
-		"\n"
 		"void DistributionTrapezoid::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DistributionTrapezoid_swigregister", DistributionTrapezoid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DetectorMask", _wrap_new_DetectorMask, METH_VARARGS, (char *)"\n"
+	 { "DistributionTrapezoid_swigregister", DistributionTrapezoid_swigregister, METH_O, NULL},
+	 { "DistributionTrapezoid_swiginit", DistributionTrapezoid_swiginit, METH_VARARGS, NULL},
+	 { "new_DetectorMask", _wrap_new_DetectorMask, METH_VARARGS, "\n"
 		"DetectorMask()\n"
 		"new_DetectorMask(DetectorMask other) -> DetectorMask\n"
-		"\n"
 		"DetectorMask::DetectorMask(const DetectorMask &other)\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_addMask", _wrap_DetectorMask_addMask, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_addMask", _wrap_DetectorMask_addMask, METH_VARARGS, "\n"
 		"DetectorMask_addMask(DetectorMask self, IShape2D shape, bool mask_value)\n"
-		"\n"
 		"void DetectorMask::addMask(const IShape2D &shape, bool mask_value)\n"
 		"\n"
 		"Add mask to the stack of detector masks. The value \"true\" means that the area will be excluded from the analysis.\n"
@@ -128305,71 +125349,61 @@ static PyMethodDef SwigMethods[] = {
 		"The value of mask \n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_initMaskData", _wrap_DetectorMask_initMaskData, METH_VARARGS, (char *)"\n"
-		"initMaskData(IDetector2D detector)\n"
+	 { "DetectorMask_initMaskData", _wrap_DetectorMask_initMaskData, METH_VARARGS, "\n"
+		"DetectorMask_initMaskData(DetectorMask self, IDetector2D detector)\n"
 		"DetectorMask_initMaskData(DetectorMask self, IntensityData data)\n"
-		"\n"
 		"void DetectorMask::initMaskData(const OutputData< double > &data)\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_isMasked", _wrap_DetectorMask_isMasked, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_isMasked", _wrap_DetectorMask_isMasked, METH_VARARGS, "\n"
 		"DetectorMask_isMasked(DetectorMask self, size_t index) -> bool\n"
-		"\n"
 		"bool DetectorMask::isMasked(size_t index) const\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_getMaskData", _wrap_DetectorMask_getMaskData, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_getMaskData", _wrap_DetectorMask_getMaskData, METH_O, "\n"
 		"DetectorMask_getMaskData(DetectorMask self) -> OutputData< bool > const *\n"
-		"\n"
 		"const OutputData<bool>* DetectorMask::getMaskData() const\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_createHistogram", _wrap_DetectorMask_createHistogram, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_createHistogram", _wrap_DetectorMask_createHistogram, METH_O, "\n"
 		"DetectorMask_createHistogram(DetectorMask self) -> Histogram2D\n"
-		"\n"
 		"Histogram2D * DetectorMask::createHistogram() const\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_removeMasks", _wrap_DetectorMask_removeMasks, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_removeMasks", _wrap_DetectorMask_removeMasks, METH_O, "\n"
 		"DetectorMask_removeMasks(DetectorMask self)\n"
-		"\n"
 		"void DetectorMask::removeMasks()\n"
 		"\n"
 		"remove all masks and return object to initial state \n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_hasMasks", _wrap_DetectorMask_hasMasks, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_hasMasks", _wrap_DetectorMask_hasMasks, METH_O, "\n"
 		"DetectorMask_hasMasks(DetectorMask self) -> bool\n"
-		"\n"
 		"bool DetectorMask::hasMasks() const\n"
 		"\n"
 		"returns true if has masks \n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_numberOfMaskedChannels", _wrap_DetectorMask_numberOfMaskedChannels, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_numberOfMaskedChannels", _wrap_DetectorMask_numberOfMaskedChannels, METH_O, "\n"
 		"DetectorMask_numberOfMaskedChannels(DetectorMask self) -> int\n"
-		"\n"
 		"int DetectorMask::numberOfMaskedChannels() const\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_numberOfMasks", _wrap_DetectorMask_numberOfMasks, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_numberOfMasks", _wrap_DetectorMask_numberOfMasks, METH_O, "\n"
 		"DetectorMask_numberOfMasks(DetectorMask self) -> size_t\n"
-		"\n"
 		"size_t DetectorMask::numberOfMasks() const\n"
 		"\n"
 		""},
-	 { (char *)"DetectorMask_getMaskShape", _wrap_DetectorMask_getMaskShape, METH_VARARGS, (char *)"\n"
+	 { "DetectorMask_getMaskShape", _wrap_DetectorMask_getMaskShape, METH_VARARGS, "\n"
 		"DetectorMask_getMaskShape(DetectorMask self, size_t mask_index, bool & mask_value) -> IShape2D\n"
-		"\n"
 		"const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const\n"
 		"\n"
 		""},
-	 { (char *)"delete_DetectorMask", _wrap_delete_DetectorMask, METH_VARARGS, (char *)"delete_DetectorMask(DetectorMask self)"},
-	 { (char *)"DetectorMask_swigregister", DetectorMask_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Ellipse", _wrap_new_Ellipse, METH_VARARGS, (char *)"\n"
+	 { "delete_DetectorMask", _wrap_delete_DetectorMask, METH_O, "delete_DetectorMask(DetectorMask self)"},
+	 { "DetectorMask_swigregister", DetectorMask_swigregister, METH_O, NULL},
+	 { "DetectorMask_swiginit", DetectorMask_swiginit, METH_VARARGS, NULL},
+	 { "new_Ellipse", _wrap_new_Ellipse, METH_VARARGS, "\n"
 		"Ellipse(double xcenter, double ycenter, double xradius, double yradius, double theta=0.0)\n"
-		"new_Ellipse(double xcenter, double ycenter, double xradius, double yradius) -> Ellipse\n"
-		"\n"
 		"Ellipse::Ellipse(double xcenter, double ycenter, double xradius, double yradius, double theta=0.0)\n"
 		"\n"
 		"Parameters:\n"
@@ -128391,160 +125425,141 @@ static PyMethodDef SwigMethods[] = {
 		"Angle of  Ellipse rotation in radians \n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_clone", _wrap_Ellipse_clone, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_clone", _wrap_Ellipse_clone, METH_O, "\n"
 		"Ellipse_clone(Ellipse self) -> Ellipse\n"
-		"\n"
 		"Ellipse* Ellipse::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_contains", _wrap_Ellipse_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "Ellipse_contains", _wrap_Ellipse_contains, METH_VARARGS, "\n"
+		"Ellipse_contains(Ellipse self, double x, double y) -> bool\n"
 		"Ellipse_contains(Ellipse self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool Ellipse::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of ellipse; more precisely, if mid point of two bins satisfy this condition. \n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_getCenterX", _wrap_Ellipse_getCenterX, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_getCenterX", _wrap_Ellipse_getCenterX, METH_O, "\n"
 		"Ellipse_getCenterX(Ellipse self) -> double\n"
-		"\n"
 		"double Ellipse::getCenterX() const\n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_getCenterY", _wrap_Ellipse_getCenterY, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_getCenterY", _wrap_Ellipse_getCenterY, METH_O, "\n"
 		"Ellipse_getCenterY(Ellipse self) -> double\n"
-		"\n"
 		"double Ellipse::getCenterY() const\n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_getRadiusX", _wrap_Ellipse_getRadiusX, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_getRadiusX", _wrap_Ellipse_getRadiusX, METH_O, "\n"
 		"Ellipse_getRadiusX(Ellipse self) -> double\n"
-		"\n"
 		"double Ellipse::getRadiusX() const\n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_getRadiusY", _wrap_Ellipse_getRadiusY, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_getRadiusY", _wrap_Ellipse_getRadiusY, METH_O, "\n"
 		"Ellipse_getRadiusY(Ellipse self) -> double\n"
-		"\n"
 		"double Ellipse::getRadiusY() const\n"
 		"\n"
 		""},
-	 { (char *)"Ellipse_getTheta", _wrap_Ellipse_getTheta, METH_VARARGS, (char *)"\n"
+	 { "Ellipse_getTheta", _wrap_Ellipse_getTheta, METH_O, "\n"
 		"Ellipse_getTheta(Ellipse self) -> double\n"
-		"\n"
 		"double Ellipse::getTheta() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_Ellipse", _wrap_delete_Ellipse, METH_VARARGS, (char *)"delete_Ellipse(Ellipse self)"},
-	 { (char *)"Ellipse_swigregister", Ellipse_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IFTDecayFunction1D_clone", _wrap_IFTDecayFunction1D_clone, METH_VARARGS, (char *)"\n"
+	 { "delete_Ellipse", _wrap_delete_Ellipse, METH_O, "delete_Ellipse(Ellipse self)"},
+	 { "Ellipse_swigregister", Ellipse_swigregister, METH_O, NULL},
+	 { "Ellipse_swiginit", Ellipse_swiginit, METH_VARARGS, NULL},
+	 { "IFTDecayFunction1D_clone", _wrap_IFTDecayFunction1D_clone, METH_O, "\n"
 		"IFTDecayFunction1D_clone(IFTDecayFunction1D self) -> IFTDecayFunction1D\n"
-		"\n"
 		"virtual IFTDecayFunction1D* IFTDecayFunction1D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction1D_evaluate", _wrap_IFTDecayFunction1D_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction1D_evaluate", _wrap_IFTDecayFunction1D_evaluate, METH_VARARGS, "\n"
 		"IFTDecayFunction1D_evaluate(IFTDecayFunction1D self, double q) -> double\n"
-		"\n"
 		"virtual double IFTDecayFunction1D::evaluate(double q) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction1D_decayLength", _wrap_IFTDecayFunction1D_decayLength, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction1D_decayLength", _wrap_IFTDecayFunction1D_decayLength, METH_O, "\n"
 		"IFTDecayFunction1D_decayLength(IFTDecayFunction1D self) -> double\n"
-		"\n"
 		"double IFTDecayFunction1D::decayLength() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_IFTDecayFunction1D", _wrap_delete_IFTDecayFunction1D, METH_VARARGS, (char *)"delete_IFTDecayFunction1D(IFTDecayFunction1D self)"},
-	 { (char *)"IFTDecayFunction1D_swigregister", IFTDecayFunction1D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction1DCauchy", _wrap_new_FTDecayFunction1DCauchy, METH_VARARGS, (char *)"\n"
+	 { "delete_IFTDecayFunction1D", _wrap_delete_IFTDecayFunction1D, METH_O, "delete_IFTDecayFunction1D(IFTDecayFunction1D self)"},
+	 { "IFTDecayFunction1D_swigregister", IFTDecayFunction1D_swigregister, METH_O, NULL},
+	 { "new_FTDecayFunction1DCauchy", _wrap_new_FTDecayFunction1DCauchy, METH_O, "\n"
 		"new_FTDecayFunction1DCauchy(double decay_length) -> FTDecayFunction1DCauchy\n"
-		"\n"
 		"FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DCauchy_clone", _wrap_FTDecayFunction1DCauchy_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DCauchy_clone", _wrap_FTDecayFunction1DCauchy_clone, METH_O, "\n"
 		"FTDecayFunction1DCauchy_clone(FTDecayFunction1DCauchy self) -> FTDecayFunction1DCauchy\n"
-		"\n"
 		"FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DCauchy_accept", _wrap_FTDecayFunction1DCauchy_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DCauchy_accept", _wrap_FTDecayFunction1DCauchy_accept, METH_VARARGS, "\n"
 		"FTDecayFunction1DCauchy_accept(FTDecayFunction1DCauchy self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction1DCauchy::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DCauchy_evaluate", _wrap_FTDecayFunction1DCauchy_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DCauchy_evaluate", _wrap_FTDecayFunction1DCauchy_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction1DCauchy_evaluate(FTDecayFunction1DCauchy self, double q) -> double\n"
-		"\n"
 		"double FTDecayFunction1DCauchy::evaluate(double q) const final\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction1DCauchy", _wrap_delete_FTDecayFunction1DCauchy, METH_VARARGS, (char *)"delete_FTDecayFunction1DCauchy(FTDecayFunction1DCauchy self)"},
-	 { (char *)"FTDecayFunction1DCauchy_swigregister", FTDecayFunction1DCauchy_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction1DGauss", _wrap_new_FTDecayFunction1DGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction1DCauchy", _wrap_delete_FTDecayFunction1DCauchy, METH_O, "delete_FTDecayFunction1DCauchy(FTDecayFunction1DCauchy self)"},
+	 { "FTDecayFunction1DCauchy_swigregister", FTDecayFunction1DCauchy_swigregister, METH_O, NULL},
+	 { "FTDecayFunction1DCauchy_swiginit", FTDecayFunction1DCauchy_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDecayFunction1DGauss", _wrap_new_FTDecayFunction1DGauss, METH_O, "\n"
 		"new_FTDecayFunction1DGauss(double decay_length) -> FTDecayFunction1DGauss\n"
-		"\n"
 		"FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DGauss_clone", _wrap_FTDecayFunction1DGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DGauss_clone", _wrap_FTDecayFunction1DGauss_clone, METH_O, "\n"
 		"FTDecayFunction1DGauss_clone(FTDecayFunction1DGauss self) -> FTDecayFunction1DGauss\n"
-		"\n"
 		"FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DGauss_accept", _wrap_FTDecayFunction1DGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DGauss_accept", _wrap_FTDecayFunction1DGauss_accept, METH_VARARGS, "\n"
 		"FTDecayFunction1DGauss_accept(FTDecayFunction1DGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction1DGauss::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DGauss_evaluate", _wrap_FTDecayFunction1DGauss_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DGauss_evaluate", _wrap_FTDecayFunction1DGauss_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction1DGauss_evaluate(FTDecayFunction1DGauss self, double q) -> double\n"
-		"\n"
 		"double FTDecayFunction1DGauss::evaluate(double q) const final\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction1DGauss", _wrap_delete_FTDecayFunction1DGauss, METH_VARARGS, (char *)"delete_FTDecayFunction1DGauss(FTDecayFunction1DGauss self)"},
-	 { (char *)"FTDecayFunction1DGauss_swigregister", FTDecayFunction1DGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction1DTriangle", _wrap_new_FTDecayFunction1DTriangle, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction1DGauss", _wrap_delete_FTDecayFunction1DGauss, METH_O, "delete_FTDecayFunction1DGauss(FTDecayFunction1DGauss self)"},
+	 { "FTDecayFunction1DGauss_swigregister", FTDecayFunction1DGauss_swigregister, METH_O, NULL},
+	 { "FTDecayFunction1DGauss_swiginit", FTDecayFunction1DGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDecayFunction1DTriangle", _wrap_new_FTDecayFunction1DTriangle, METH_O, "\n"
 		"new_FTDecayFunction1DTriangle(double decay_length) -> FTDecayFunction1DTriangle\n"
-		"\n"
 		"FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DTriangle_clone", _wrap_FTDecayFunction1DTriangle_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DTriangle_clone", _wrap_FTDecayFunction1DTriangle_clone, METH_O, "\n"
 		"FTDecayFunction1DTriangle_clone(FTDecayFunction1DTriangle self) -> FTDecayFunction1DTriangle\n"
-		"\n"
 		"FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DTriangle_accept", _wrap_FTDecayFunction1DTriangle_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DTriangle_accept", _wrap_FTDecayFunction1DTriangle_accept, METH_VARARGS, "\n"
 		"FTDecayFunction1DTriangle_accept(FTDecayFunction1DTriangle self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction1DTriangle::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DTriangle_evaluate", _wrap_FTDecayFunction1DTriangle_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DTriangle_evaluate", _wrap_FTDecayFunction1DTriangle_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction1DTriangle_evaluate(FTDecayFunction1DTriangle self, double q) -> double\n"
-		"\n"
 		"double FTDecayFunction1DTriangle::evaluate(double q) const final\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction1DTriangle", _wrap_delete_FTDecayFunction1DTriangle, METH_VARARGS, (char *)"delete_FTDecayFunction1DTriangle(FTDecayFunction1DTriangle self)"},
-	 { (char *)"FTDecayFunction1DTriangle_swigregister", FTDecayFunction1DTriangle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction1DVoigt", _wrap_new_FTDecayFunction1DVoigt, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction1DTriangle", _wrap_delete_FTDecayFunction1DTriangle, METH_O, "delete_FTDecayFunction1DTriangle(FTDecayFunction1DTriangle self)"},
+	 { "FTDecayFunction1DTriangle_swigregister", FTDecayFunction1DTriangle_swigregister, METH_O, NULL},
+	 { "FTDecayFunction1DTriangle_swiginit", FTDecayFunction1DTriangle_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDecayFunction1DVoigt", _wrap_new_FTDecayFunction1DVoigt, METH_VARARGS, "\n"
 		"new_FTDecayFunction1DVoigt(double decay_length, double eta) -> FTDecayFunction1DVoigt\n"
-		"\n"
 		"FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double decay_length, double eta)\n"
 		"\n"
 		"Constructor of pseudo-Voigt decay function.\n"
@@ -128559,83 +125574,73 @@ static PyMethodDef SwigMethods[] = {
 		"parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0) \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DVoigt_clone", _wrap_FTDecayFunction1DVoigt_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DVoigt_clone", _wrap_FTDecayFunction1DVoigt_clone, METH_O, "\n"
 		"FTDecayFunction1DVoigt_clone(FTDecayFunction1DVoigt self) -> FTDecayFunction1DVoigt\n"
-		"\n"
 		"FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DVoigt_accept", _wrap_FTDecayFunction1DVoigt_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DVoigt_accept", _wrap_FTDecayFunction1DVoigt_accept, METH_VARARGS, "\n"
 		"FTDecayFunction1DVoigt_accept(FTDecayFunction1DVoigt self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction1DVoigt::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DVoigt_evaluate", _wrap_FTDecayFunction1DVoigt_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DVoigt_evaluate", _wrap_FTDecayFunction1DVoigt_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction1DVoigt_evaluate(FTDecayFunction1DVoigt self, double q) -> double\n"
-		"\n"
 		"double FTDecayFunction1DVoigt::evaluate(double q) const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction1DVoigt_eEta", _wrap_FTDecayFunction1DVoigt_eEta, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction1DVoigt_eEta", _wrap_FTDecayFunction1DVoigt_eEta, METH_O, "\n"
 		"FTDecayFunction1DVoigt_eEta(FTDecayFunction1DVoigt self) -> double\n"
-		"\n"
 		"double FTDecayFunction1DVoigt::eEta() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction1DVoigt", _wrap_delete_FTDecayFunction1DVoigt, METH_VARARGS, (char *)"delete_FTDecayFunction1DVoigt(FTDecayFunction1DVoigt self)"},
-	 { (char *)"FTDecayFunction1DVoigt_swigregister", FTDecayFunction1DVoigt_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IFTDecayFunction2D_clone", _wrap_IFTDecayFunction2D_clone, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction1DVoigt", _wrap_delete_FTDecayFunction1DVoigt, METH_O, "delete_FTDecayFunction1DVoigt(FTDecayFunction1DVoigt self)"},
+	 { "FTDecayFunction1DVoigt_swigregister", FTDecayFunction1DVoigt_swigregister, METH_O, NULL},
+	 { "FTDecayFunction1DVoigt_swiginit", FTDecayFunction1DVoigt_swiginit, METH_VARARGS, NULL},
+	 { "IFTDecayFunction2D_clone", _wrap_IFTDecayFunction2D_clone, METH_O, "\n"
 		"IFTDecayFunction2D_clone(IFTDecayFunction2D self) -> IFTDecayFunction2D\n"
-		"\n"
 		"virtual IFTDecayFunction2D* IFTDecayFunction2D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_setGamma", _wrap_IFTDecayFunction2D_setGamma, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_setGamma", _wrap_IFTDecayFunction2D_setGamma, METH_VARARGS, "\n"
 		"IFTDecayFunction2D_setGamma(IFTDecayFunction2D self, double gamma)\n"
-		"\n"
 		"void IFTDecayFunction2D::setGamma(double gamma)\n"
 		"\n"
 		"set angle between first lattice vector and X-axis of distribution (both in direct space) \n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_gamma", _wrap_IFTDecayFunction2D_gamma, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_gamma", _wrap_IFTDecayFunction2D_gamma, METH_O, "\n"
 		"IFTDecayFunction2D_gamma(IFTDecayFunction2D self) -> double\n"
-		"\n"
 		"double IFTDecayFunction2D::gamma() const\n"
 		"\n"
 		"get angle between first lattice vector and X-axis of distribution (both in direct space) \n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_decayLengthX", _wrap_IFTDecayFunction2D_decayLengthX, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_decayLengthX", _wrap_IFTDecayFunction2D_decayLengthX, METH_O, "\n"
 		"IFTDecayFunction2D_decayLengthX(IFTDecayFunction2D self) -> double\n"
-		"\n"
 		"double IFTDecayFunction2D::decayLengthX() const\n"
 		"\n"
 		"get decay length in distribution's X-direction \n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_decayLengthY", _wrap_IFTDecayFunction2D_decayLengthY, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_decayLengthY", _wrap_IFTDecayFunction2D_decayLengthY, METH_O, "\n"
 		"IFTDecayFunction2D_decayLengthY(IFTDecayFunction2D self) -> double\n"
-		"\n"
 		"double IFTDecayFunction2D::decayLengthY() const\n"
 		"\n"
 		"get decay length in distribution's Y-direction \n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_evaluate", _wrap_IFTDecayFunction2D_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_evaluate", _wrap_IFTDecayFunction2D_evaluate, METH_VARARGS, "\n"
 		"IFTDecayFunction2D_evaluate(IFTDecayFunction2D self, double qx, double qy) -> double\n"
-		"\n"
 		"virtual double IFTDecayFunction2D::evaluate(double qx, double qy) const =0\n"
 		"\n"
 		"evaluate Fourier transformed decay function for q in X,Y coordinates \n"
 		"\n"
 		""},
-	 { (char *)"IFTDecayFunction2D_boundingReciprocalLatticeCoordinates", _wrap_IFTDecayFunction2D_boundingReciprocalLatticeCoordinates, METH_VARARGS, (char *)"\n"
+	 { "IFTDecayFunction2D_boundingReciprocalLatticeCoordinates", _wrap_IFTDecayFunction2D_boundingReciprocalLatticeCoordinates, METH_VARARGS, "\n"
 		"IFTDecayFunction2D_boundingReciprocalLatticeCoordinates(IFTDecayFunction2D self, double qX, double qY, double a, double b, double alpha) -> pair_double_t\n"
-		"\n"
 		"std::pair< double, double > IFTDecayFunction2D::boundingReciprocalLatticeCoordinates(double qX, double qY, double a, double b, double alpha) const\n"
 		"\n"
 		"transform back to a*, b* basis:\n"
@@ -128643,74 +125648,64 @@ static PyMethodDef SwigMethods[] = {
 		"Calculates bounding values of reciprocal lattice coordinates that contain the centered rectangle with a corner defined by qX and qY \n"
 		"\n"
 		""},
-	 { (char *)"delete_IFTDecayFunction2D", _wrap_delete_IFTDecayFunction2D, METH_VARARGS, (char *)"delete_IFTDecayFunction2D(IFTDecayFunction2D self)"},
-	 { (char *)"IFTDecayFunction2D_swigregister", IFTDecayFunction2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction2DCauchy", _wrap_new_FTDecayFunction2DCauchy, METH_VARARGS, (char *)"\n"
+	 { "delete_IFTDecayFunction2D", _wrap_delete_IFTDecayFunction2D, METH_O, "delete_IFTDecayFunction2D(IFTDecayFunction2D self)"},
+	 { "IFTDecayFunction2D_swigregister", IFTDecayFunction2D_swigregister, METH_O, NULL},
+	 { "new_FTDecayFunction2DCauchy", _wrap_new_FTDecayFunction2DCauchy, METH_VARARGS, "\n"
 		"FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)\n"
-		"new_FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y) -> FTDecayFunction2DCauchy\n"
-		"\n"
 		"FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DCauchy_clone", _wrap_FTDecayFunction2DCauchy_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DCauchy_clone", _wrap_FTDecayFunction2DCauchy_clone, METH_O, "\n"
 		"FTDecayFunction2DCauchy_clone(FTDecayFunction2DCauchy self) -> FTDecayFunction2DCauchy\n"
-		"\n"
 		"FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DCauchy_accept", _wrap_FTDecayFunction2DCauchy_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DCauchy_accept", _wrap_FTDecayFunction2DCauchy_accept, METH_VARARGS, "\n"
 		"FTDecayFunction2DCauchy_accept(FTDecayFunction2DCauchy self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction2DCauchy::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DCauchy_evaluate", _wrap_FTDecayFunction2DCauchy_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DCauchy_evaluate", _wrap_FTDecayFunction2DCauchy_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction2DCauchy_evaluate(FTDecayFunction2DCauchy self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDecayFunction2DCauchy::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed decay function for q in X,Y coordinates \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction2DCauchy", _wrap_delete_FTDecayFunction2DCauchy, METH_VARARGS, (char *)"delete_FTDecayFunction2DCauchy(FTDecayFunction2DCauchy self)"},
-	 { (char *)"FTDecayFunction2DCauchy_swigregister", FTDecayFunction2DCauchy_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction2DGauss", _wrap_new_FTDecayFunction2DGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction2DCauchy", _wrap_delete_FTDecayFunction2DCauchy, METH_O, "delete_FTDecayFunction2DCauchy(FTDecayFunction2DCauchy self)"},
+	 { "FTDecayFunction2DCauchy_swigregister", FTDecayFunction2DCauchy_swigregister, METH_O, NULL},
+	 { "FTDecayFunction2DCauchy_swiginit", FTDecayFunction2DCauchy_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDecayFunction2DGauss", _wrap_new_FTDecayFunction2DGauss, METH_VARARGS, "\n"
 		"FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)\n"
-		"new_FTDecayFunction2DGauss(double decay_length_x, double decay_length_y) -> FTDecayFunction2DGauss\n"
-		"\n"
 		"FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DGauss_clone", _wrap_FTDecayFunction2DGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DGauss_clone", _wrap_FTDecayFunction2DGauss_clone, METH_O, "\n"
 		"FTDecayFunction2DGauss_clone(FTDecayFunction2DGauss self) -> FTDecayFunction2DGauss\n"
-		"\n"
 		"FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DGauss_accept", _wrap_FTDecayFunction2DGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DGauss_accept", _wrap_FTDecayFunction2DGauss_accept, METH_VARARGS, "\n"
 		"FTDecayFunction2DGauss_accept(FTDecayFunction2DGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction2DGauss::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DGauss_evaluate", _wrap_FTDecayFunction2DGauss_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DGauss_evaluate", _wrap_FTDecayFunction2DGauss_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction2DGauss_evaluate(FTDecayFunction2DGauss self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDecayFunction2DGauss::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed decay function for q in X,Y coordinates \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction2DGauss", _wrap_delete_FTDecayFunction2DGauss, METH_VARARGS, (char *)"delete_FTDecayFunction2DGauss(FTDecayFunction2DGauss self)"},
-	 { (char *)"FTDecayFunction2DGauss_swigregister", FTDecayFunction2DGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDecayFunction2DVoigt", _wrap_new_FTDecayFunction2DVoigt, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction2DGauss", _wrap_delete_FTDecayFunction2DGauss, METH_O, "delete_FTDecayFunction2DGauss(FTDecayFunction2DGauss self)"},
+	 { "FTDecayFunction2DGauss_swigregister", FTDecayFunction2DGauss_swigregister, METH_O, NULL},
+	 { "FTDecayFunction2DGauss_swiginit", FTDecayFunction2DGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDecayFunction2DVoigt", _wrap_new_FTDecayFunction2DVoigt, METH_VARARGS, "\n"
 		"FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)\n"
-		"new_FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta) -> FTDecayFunction2DVoigt\n"
-		"\n"
 		"FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)\n"
 		"\n"
 		"Constructor of two-dimensional pseudo-Voigt decay function in reciprocal space.\n"
@@ -128731,270 +125726,240 @@ static PyMethodDef SwigMethods[] = {
 		"distribution orientation with respect to the first lattice vector in radians \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DVoigt_clone", _wrap_FTDecayFunction2DVoigt_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DVoigt_clone", _wrap_FTDecayFunction2DVoigt_clone, METH_O, "\n"
 		"FTDecayFunction2DVoigt_clone(FTDecayFunction2DVoigt self) -> FTDecayFunction2DVoigt\n"
-		"\n"
 		"FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DVoigt_accept", _wrap_FTDecayFunction2DVoigt_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DVoigt_accept", _wrap_FTDecayFunction2DVoigt_accept, METH_VARARGS, "\n"
 		"FTDecayFunction2DVoigt_accept(FTDecayFunction2DVoigt self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDecayFunction2DVoigt::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DVoigt_evaluate", _wrap_FTDecayFunction2DVoigt_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DVoigt_evaluate", _wrap_FTDecayFunction2DVoigt_evaluate, METH_VARARGS, "\n"
 		"FTDecayFunction2DVoigt_evaluate(FTDecayFunction2DVoigt self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDecayFunction2DVoigt::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed decay function for q in X,Y coordinates \n"
 		"\n"
 		""},
-	 { (char *)"FTDecayFunction2DVoigt_eta", _wrap_FTDecayFunction2DVoigt_eta, METH_VARARGS, (char *)"\n"
+	 { "FTDecayFunction2DVoigt_eta", _wrap_FTDecayFunction2DVoigt_eta, METH_O, "\n"
 		"FTDecayFunction2DVoigt_eta(FTDecayFunction2DVoigt self) -> double\n"
-		"\n"
 		"double FTDecayFunction2DVoigt::eta() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDecayFunction2DVoigt", _wrap_delete_FTDecayFunction2DVoigt, METH_VARARGS, (char *)"delete_FTDecayFunction2DVoigt(FTDecayFunction2DVoigt self)"},
-	 { (char *)"FTDecayFunction2DVoigt_swigregister", FTDecayFunction2DVoigt_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IFTDistribution1D", _wrap_delete_IFTDistribution1D, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDecayFunction2DVoigt", _wrap_delete_FTDecayFunction2DVoigt, METH_O, "delete_FTDecayFunction2DVoigt(FTDecayFunction2DVoigt self)"},
+	 { "FTDecayFunction2DVoigt_swigregister", FTDecayFunction2DVoigt_swigregister, METH_O, NULL},
+	 { "FTDecayFunction2DVoigt_swiginit", FTDecayFunction2DVoigt_swiginit, METH_VARARGS, NULL},
+	 { "delete_IFTDistribution1D", _wrap_delete_IFTDistribution1D, METH_O, "\n"
 		"delete_IFTDistribution1D(IFTDistribution1D self)\n"
-		"\n"
 		"IFTDistribution1D::~IFTDistribution1D()\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_clone", _wrap_IFTDistribution1D_clone, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_clone", _wrap_IFTDistribution1D_clone, METH_O, "\n"
 		"IFTDistribution1D_clone(IFTDistribution1D self) -> IFTDistribution1D\n"
-		"\n"
 		"virtual IFTDistribution1D* IFTDistribution1D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_evaluate", _wrap_IFTDistribution1D_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_evaluate", _wrap_IFTDistribution1D_evaluate, METH_VARARGS, "\n"
 		"IFTDistribution1D_evaluate(IFTDistribution1D self, double q) -> double\n"
-		"\n"
 		"virtual double IFTDistribution1D::evaluate(double q) const =0\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_setOmega", _wrap_IFTDistribution1D_setOmega, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_setOmega", _wrap_IFTDistribution1D_setOmega, METH_VARARGS, "\n"
 		"IFTDistribution1D_setOmega(IFTDistribution1D self, double omega)\n"
-		"\n"
 		"void IFTDistribution1D::setOmega(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_omega", _wrap_IFTDistribution1D_omega, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_omega", _wrap_IFTDistribution1D_omega, METH_O, "\n"
 		"IFTDistribution1D_omega(IFTDistribution1D self) -> double\n"
-		"\n"
 		"double IFTDistribution1D::omega() const\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_qSecondDerivative", _wrap_IFTDistribution1D_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_qSecondDerivative", _wrap_IFTDistribution1D_qSecondDerivative, METH_O, "\n"
 		"IFTDistribution1D_qSecondDerivative(IFTDistribution1D self) -> double\n"
-		"\n"
 		"virtual double IFTDistribution1D::qSecondDerivative() const =0\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution1D_swigregister", IFTDistribution1D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DCauchy", _wrap_new_FTDistribution1DCauchy, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution1D_swigregister", IFTDistribution1D_swigregister, METH_O, NULL},
+	 { "new_FTDistribution1DCauchy", _wrap_new_FTDistribution1DCauchy, METH_O, "\n"
 		"new_FTDistribution1DCauchy(double omega) -> FTDistribution1DCauchy\n"
-		"\n"
 		"FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCauchy_clone", _wrap_FTDistribution1DCauchy_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCauchy_clone", _wrap_FTDistribution1DCauchy_clone, METH_O, "\n"
 		"FTDistribution1DCauchy_clone(FTDistribution1DCauchy self) -> FTDistribution1DCauchy\n"
-		"\n"
 		"FTDistribution1DCauchy * FTDistribution1DCauchy::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCauchy_accept", _wrap_FTDistribution1DCauchy_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCauchy_accept", _wrap_FTDistribution1DCauchy_accept, METH_VARARGS, "\n"
 		"FTDistribution1DCauchy_accept(FTDistribution1DCauchy self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DCauchy::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCauchy_evaluate", _wrap_FTDistribution1DCauchy_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCauchy_evaluate", _wrap_FTDistribution1DCauchy_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DCauchy_evaluate(FTDistribution1DCauchy self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DCauchy::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCauchy_qSecondDerivative", _wrap_FTDistribution1DCauchy_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCauchy_qSecondDerivative", _wrap_FTDistribution1DCauchy_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DCauchy_qSecondDerivative(FTDistribution1DCauchy self) -> double\n"
-		"\n"
 		"double FTDistribution1DCauchy::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DCauchy", _wrap_delete_FTDistribution1DCauchy, METH_VARARGS, (char *)"delete_FTDistribution1DCauchy(FTDistribution1DCauchy self)"},
-	 { (char *)"FTDistribution1DCauchy_swigregister", FTDistribution1DCauchy_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DGauss", _wrap_new_FTDistribution1DGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DCauchy", _wrap_delete_FTDistribution1DCauchy, METH_O, "delete_FTDistribution1DCauchy(FTDistribution1DCauchy self)"},
+	 { "FTDistribution1DCauchy_swigregister", FTDistribution1DCauchy_swigregister, METH_O, NULL},
+	 { "FTDistribution1DCauchy_swiginit", FTDistribution1DCauchy_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution1DGauss", _wrap_new_FTDistribution1DGauss, METH_O, "\n"
 		"new_FTDistribution1DGauss(double omega) -> FTDistribution1DGauss\n"
-		"\n"
 		"FTDistribution1DGauss::FTDistribution1DGauss(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGauss_clone", _wrap_FTDistribution1DGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGauss_clone", _wrap_FTDistribution1DGauss_clone, METH_O, "\n"
 		"FTDistribution1DGauss_clone(FTDistribution1DGauss self) -> FTDistribution1DGauss\n"
-		"\n"
 		"FTDistribution1DGauss * FTDistribution1DGauss::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGauss_accept", _wrap_FTDistribution1DGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGauss_accept", _wrap_FTDistribution1DGauss_accept, METH_VARARGS, "\n"
 		"FTDistribution1DGauss_accept(FTDistribution1DGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DGauss::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGauss_evaluate", _wrap_FTDistribution1DGauss_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGauss_evaluate", _wrap_FTDistribution1DGauss_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DGauss_evaluate(FTDistribution1DGauss self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DGauss::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGauss_qSecondDerivative", _wrap_FTDistribution1DGauss_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGauss_qSecondDerivative", _wrap_FTDistribution1DGauss_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DGauss_qSecondDerivative(FTDistribution1DGauss self) -> double\n"
-		"\n"
 		"double FTDistribution1DGauss::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DGauss", _wrap_delete_FTDistribution1DGauss, METH_VARARGS, (char *)"delete_FTDistribution1DGauss(FTDistribution1DGauss self)"},
-	 { (char *)"FTDistribution1DGauss_swigregister", FTDistribution1DGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DGate", _wrap_new_FTDistribution1DGate, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DGauss", _wrap_delete_FTDistribution1DGauss, METH_O, "delete_FTDistribution1DGauss(FTDistribution1DGauss self)"},
+	 { "FTDistribution1DGauss_swigregister", FTDistribution1DGauss_swigregister, METH_O, NULL},
+	 { "FTDistribution1DGauss_swiginit", FTDistribution1DGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution1DGate", _wrap_new_FTDistribution1DGate, METH_O, "\n"
 		"new_FTDistribution1DGate(double omega) -> FTDistribution1DGate\n"
-		"\n"
 		"FTDistribution1DGate::FTDistribution1DGate(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGate_clone", _wrap_FTDistribution1DGate_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGate_clone", _wrap_FTDistribution1DGate_clone, METH_O, "\n"
 		"FTDistribution1DGate_clone(FTDistribution1DGate self) -> FTDistribution1DGate\n"
-		"\n"
 		"FTDistribution1DGate * FTDistribution1DGate::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGate_accept", _wrap_FTDistribution1DGate_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGate_accept", _wrap_FTDistribution1DGate_accept, METH_VARARGS, "\n"
 		"FTDistribution1DGate_accept(FTDistribution1DGate self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DGate::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGate_evaluate", _wrap_FTDistribution1DGate_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGate_evaluate", _wrap_FTDistribution1DGate_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DGate_evaluate(FTDistribution1DGate self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DGate::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DGate_qSecondDerivative", _wrap_FTDistribution1DGate_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DGate_qSecondDerivative", _wrap_FTDistribution1DGate_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DGate_qSecondDerivative(FTDistribution1DGate self) -> double\n"
-		"\n"
 		"double FTDistribution1DGate::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DGate", _wrap_delete_FTDistribution1DGate, METH_VARARGS, (char *)"delete_FTDistribution1DGate(FTDistribution1DGate self)"},
-	 { (char *)"FTDistribution1DGate_swigregister", FTDistribution1DGate_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DTriangle", _wrap_new_FTDistribution1DTriangle, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DGate", _wrap_delete_FTDistribution1DGate, METH_O, "delete_FTDistribution1DGate(FTDistribution1DGate self)"},
+	 { "FTDistribution1DGate_swigregister", FTDistribution1DGate_swigregister, METH_O, NULL},
+	 { "FTDistribution1DGate_swiginit", FTDistribution1DGate_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution1DTriangle", _wrap_new_FTDistribution1DTriangle, METH_O, "\n"
 		"new_FTDistribution1DTriangle(double omega) -> FTDistribution1DTriangle\n"
-		"\n"
 		"FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DTriangle_clone", _wrap_FTDistribution1DTriangle_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DTriangle_clone", _wrap_FTDistribution1DTriangle_clone, METH_O, "\n"
 		"FTDistribution1DTriangle_clone(FTDistribution1DTriangle self) -> FTDistribution1DTriangle\n"
-		"\n"
 		"FTDistribution1DTriangle * FTDistribution1DTriangle::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DTriangle_accept", _wrap_FTDistribution1DTriangle_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DTriangle_accept", _wrap_FTDistribution1DTriangle_accept, METH_VARARGS, "\n"
 		"FTDistribution1DTriangle_accept(FTDistribution1DTriangle self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DTriangle::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DTriangle_evaluate", _wrap_FTDistribution1DTriangle_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DTriangle_evaluate", _wrap_FTDistribution1DTriangle_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DTriangle_evaluate(FTDistribution1DTriangle self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DTriangle::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DTriangle_qSecondDerivative", _wrap_FTDistribution1DTriangle_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DTriangle_qSecondDerivative", _wrap_FTDistribution1DTriangle_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DTriangle_qSecondDerivative(FTDistribution1DTriangle self) -> double\n"
-		"\n"
 		"double FTDistribution1DTriangle::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DTriangle", _wrap_delete_FTDistribution1DTriangle, METH_VARARGS, (char *)"delete_FTDistribution1DTriangle(FTDistribution1DTriangle self)"},
-	 { (char *)"FTDistribution1DTriangle_swigregister", FTDistribution1DTriangle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DCosine", _wrap_new_FTDistribution1DCosine, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DTriangle", _wrap_delete_FTDistribution1DTriangle, METH_O, "delete_FTDistribution1DTriangle(FTDistribution1DTriangle self)"},
+	 { "FTDistribution1DTriangle_swigregister", FTDistribution1DTriangle_swigregister, METH_O, NULL},
+	 { "FTDistribution1DTriangle_swiginit", FTDistribution1DTriangle_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution1DCosine", _wrap_new_FTDistribution1DCosine, METH_O, "\n"
 		"new_FTDistribution1DCosine(double omega) -> FTDistribution1DCosine\n"
-		"\n"
 		"FTDistribution1DCosine::FTDistribution1DCosine(double omega)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCosine_clone", _wrap_FTDistribution1DCosine_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCosine_clone", _wrap_FTDistribution1DCosine_clone, METH_O, "\n"
 		"FTDistribution1DCosine_clone(FTDistribution1DCosine self) -> FTDistribution1DCosine\n"
-		"\n"
 		"FTDistribution1DCosine * FTDistribution1DCosine::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCosine_accept", _wrap_FTDistribution1DCosine_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCosine_accept", _wrap_FTDistribution1DCosine_accept, METH_VARARGS, "\n"
 		"FTDistribution1DCosine_accept(FTDistribution1DCosine self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DCosine::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCosine_evaluate", _wrap_FTDistribution1DCosine_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCosine_evaluate", _wrap_FTDistribution1DCosine_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DCosine_evaluate(FTDistribution1DCosine self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DCosine::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DCosine_qSecondDerivative", _wrap_FTDistribution1DCosine_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DCosine_qSecondDerivative", _wrap_FTDistribution1DCosine_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DCosine_qSecondDerivative(FTDistribution1DCosine self) -> double\n"
-		"\n"
 		"double FTDistribution1DCosine::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DCosine", _wrap_delete_FTDistribution1DCosine, METH_VARARGS, (char *)"delete_FTDistribution1DCosine(FTDistribution1DCosine self)"},
-	 { (char *)"FTDistribution1DCosine_swigregister", FTDistribution1DCosine_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution1DVoigt", _wrap_new_FTDistribution1DVoigt, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DCosine", _wrap_delete_FTDistribution1DCosine, METH_O, "delete_FTDistribution1DCosine(FTDistribution1DCosine self)"},
+	 { "FTDistribution1DCosine_swigregister", FTDistribution1DCosine_swigregister, METH_O, NULL},
+	 { "FTDistribution1DCosine_swiginit", FTDistribution1DCosine_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution1DVoigt", _wrap_new_FTDistribution1DVoigt, METH_VARARGS, "\n"
 		"new_FTDistribution1DVoigt(double omega, double eta) -> FTDistribution1DVoigt\n"
-		"\n"
 		"FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)\n"
 		"\n"
 		"Constructor of one-dimensional pseudo-Voigt probability distribution.\n"
@@ -129009,218 +125974,189 @@ static PyMethodDef SwigMethods[] = {
 		"parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0) \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DVoigt_clone", _wrap_FTDistribution1DVoigt_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DVoigt_clone", _wrap_FTDistribution1DVoigt_clone, METH_O, "\n"
 		"FTDistribution1DVoigt_clone(FTDistribution1DVoigt self) -> FTDistribution1DVoigt\n"
-		"\n"
 		"FTDistribution1DVoigt * FTDistribution1DVoigt::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DVoigt_accept", _wrap_FTDistribution1DVoigt_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DVoigt_accept", _wrap_FTDistribution1DVoigt_accept, METH_VARARGS, "\n"
 		"FTDistribution1DVoigt_accept(FTDistribution1DVoigt self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution1DVoigt::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DVoigt_evaluate", _wrap_FTDistribution1DVoigt_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DVoigt_evaluate", _wrap_FTDistribution1DVoigt_evaluate, METH_VARARGS, "\n"
 		"FTDistribution1DVoigt_evaluate(FTDistribution1DVoigt self, double q) -> double\n"
-		"\n"
 		"double FTDistribution1DVoigt::evaluate(double q) const override final\n"
 		"\n"
 		"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DVoigt_eta", _wrap_FTDistribution1DVoigt_eta, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DVoigt_eta", _wrap_FTDistribution1DVoigt_eta, METH_O, "\n"
 		"FTDistribution1DVoigt_eta(FTDistribution1DVoigt self) -> double\n"
-		"\n"
 		"double FTDistribution1DVoigt::eta() const\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution1DVoigt_qSecondDerivative", _wrap_FTDistribution1DVoigt_qSecondDerivative, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution1DVoigt_qSecondDerivative", _wrap_FTDistribution1DVoigt_qSecondDerivative, METH_O, "\n"
 		"FTDistribution1DVoigt_qSecondDerivative(FTDistribution1DVoigt self) -> double\n"
-		"\n"
 		"double FTDistribution1DVoigt::qSecondDerivative() const override final\n"
 		"\n"
 		"Returns the negative of the second order derivative in q space around q=0. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution1DVoigt", _wrap_delete_FTDistribution1DVoigt, METH_VARARGS, (char *)"delete_FTDistribution1DVoigt(FTDistribution1DVoigt self)"},
-	 { (char *)"FTDistribution1DVoigt_swigregister", FTDistribution1DVoigt_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IFTDistribution2D_clone", _wrap_IFTDistribution2D_clone, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution1DVoigt", _wrap_delete_FTDistribution1DVoigt, METH_O, "delete_FTDistribution1DVoigt(FTDistribution1DVoigt self)"},
+	 { "FTDistribution1DVoigt_swigregister", FTDistribution1DVoigt_swigregister, METH_O, NULL},
+	 { "FTDistribution1DVoigt_swiginit", FTDistribution1DVoigt_swiginit, METH_VARARGS, NULL},
+	 { "IFTDistribution2D_clone", _wrap_IFTDistribution2D_clone, METH_O, "\n"
 		"IFTDistribution2D_clone(IFTDistribution2D self) -> IFTDistribution2D\n"
-		"\n"
 		"IFTDistribution2D* IFTDistribution2D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_setGamma", _wrap_IFTDistribution2D_setGamma, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_setGamma", _wrap_IFTDistribution2D_setGamma, METH_VARARGS, "\n"
 		"IFTDistribution2D_setGamma(IFTDistribution2D self, double gamma)\n"
-		"\n"
 		"void IFTDistribution2D::setGamma(double gamma)\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_gamma", _wrap_IFTDistribution2D_gamma, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_gamma", _wrap_IFTDistribution2D_gamma, METH_O, "\n"
 		"IFTDistribution2D_gamma(IFTDistribution2D self) -> double\n"
-		"\n"
 		"double IFTDistribution2D::gamma() const\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_delta", _wrap_IFTDistribution2D_delta, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_delta", _wrap_IFTDistribution2D_delta, METH_O, "\n"
 		"IFTDistribution2D_delta(IFTDistribution2D self) -> double\n"
-		"\n"
 		"double IFTDistribution2D::delta() const\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_omegaX", _wrap_IFTDistribution2D_omegaX, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_omegaX", _wrap_IFTDistribution2D_omegaX, METH_O, "\n"
 		"IFTDistribution2D_omegaX(IFTDistribution2D self) -> double\n"
-		"\n"
 		"double IFTDistribution2D::omegaX() const\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_omegaY", _wrap_IFTDistribution2D_omegaY, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_omegaY", _wrap_IFTDistribution2D_omegaY, METH_O, "\n"
 		"IFTDistribution2D_omegaY(IFTDistribution2D self) -> double\n"
-		"\n"
 		"double IFTDistribution2D::omegaY() const\n"
 		"\n"
 		""},
-	 { (char *)"IFTDistribution2D_evaluate", _wrap_IFTDistribution2D_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFTDistribution2D_evaluate", _wrap_IFTDistribution2D_evaluate, METH_VARARGS, "\n"
 		"IFTDistribution2D_evaluate(IFTDistribution2D self, double qx, double qy) -> double\n"
-		"\n"
 		"virtual double IFTDistribution2D::evaluate(double qx, double qy) const =0\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"delete_IFTDistribution2D", _wrap_delete_IFTDistribution2D, METH_VARARGS, (char *)"delete_IFTDistribution2D(IFTDistribution2D self)"},
-	 { (char *)"IFTDistribution2D_swigregister", IFTDistribution2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution2DCauchy", _wrap_new_FTDistribution2DCauchy, METH_VARARGS, (char *)"\n"
+	 { "delete_IFTDistribution2D", _wrap_delete_IFTDistribution2D, METH_O, "delete_IFTDistribution2D(IFTDistribution2D self)"},
+	 { "IFTDistribution2D_swigregister", IFTDistribution2D_swigregister, METH_O, NULL},
+	 { "new_FTDistribution2DCauchy", _wrap_new_FTDistribution2DCauchy, METH_VARARGS, "\n"
 		"FTDistribution2DCauchy(double omega_x, double omega_y, double gamma=0)\n"
-		"new_FTDistribution2DCauchy(double omega_x, double omega_y) -> FTDistribution2DCauchy\n"
-		"\n"
 		"FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCauchy_clone", _wrap_FTDistribution2DCauchy_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCauchy_clone", _wrap_FTDistribution2DCauchy_clone, METH_O, "\n"
 		"FTDistribution2DCauchy_clone(FTDistribution2DCauchy self) -> FTDistribution2DCauchy\n"
-		"\n"
 		"FTDistribution2DCauchy * FTDistribution2DCauchy::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCauchy_accept", _wrap_FTDistribution2DCauchy_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCauchy_accept", _wrap_FTDistribution2DCauchy_accept, METH_VARARGS, "\n"
 		"FTDistribution2DCauchy_accept(FTDistribution2DCauchy self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution2DCauchy::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCauchy_evaluate", _wrap_FTDistribution2DCauchy_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCauchy_evaluate", _wrap_FTDistribution2DCauchy_evaluate, METH_VARARGS, "\n"
 		"FTDistribution2DCauchy_evaluate(FTDistribution2DCauchy self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDistribution2DCauchy::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution2DCauchy", _wrap_delete_FTDistribution2DCauchy, METH_VARARGS, (char *)"delete_FTDistribution2DCauchy(FTDistribution2DCauchy self)"},
-	 { (char *)"FTDistribution2DCauchy_swigregister", FTDistribution2DCauchy_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution2DGauss", _wrap_new_FTDistribution2DGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution2DCauchy", _wrap_delete_FTDistribution2DCauchy, METH_O, "delete_FTDistribution2DCauchy(FTDistribution2DCauchy self)"},
+	 { "FTDistribution2DCauchy_swigregister", FTDistribution2DCauchy_swigregister, METH_O, NULL},
+	 { "FTDistribution2DCauchy_swiginit", FTDistribution2DCauchy_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution2DGauss", _wrap_new_FTDistribution2DGauss, METH_VARARGS, "\n"
 		"FTDistribution2DGauss(double omega_x, double omega_y, double gamma=0)\n"
-		"new_FTDistribution2DGauss(double omega_x, double omega_y) -> FTDistribution2DGauss\n"
-		"\n"
 		"FTDistribution2DGauss::FTDistribution2DGauss(double omega_x, double omega_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGauss_clone", _wrap_FTDistribution2DGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGauss_clone", _wrap_FTDistribution2DGauss_clone, METH_O, "\n"
 		"FTDistribution2DGauss_clone(FTDistribution2DGauss self) -> FTDistribution2DGauss\n"
-		"\n"
 		"FTDistribution2DGauss * FTDistribution2DGauss::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGauss_accept", _wrap_FTDistribution2DGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGauss_accept", _wrap_FTDistribution2DGauss_accept, METH_VARARGS, "\n"
 		"FTDistribution2DGauss_accept(FTDistribution2DGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution2DGauss::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGauss_evaluate", _wrap_FTDistribution2DGauss_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGauss_evaluate", _wrap_FTDistribution2DGauss_evaluate, METH_VARARGS, "\n"
 		"FTDistribution2DGauss_evaluate(FTDistribution2DGauss self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDistribution2DGauss::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution2DGauss", _wrap_delete_FTDistribution2DGauss, METH_VARARGS, (char *)"delete_FTDistribution2DGauss(FTDistribution2DGauss self)"},
-	 { (char *)"FTDistribution2DGauss_swigregister", FTDistribution2DGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution2DGate", _wrap_new_FTDistribution2DGate, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution2DGauss", _wrap_delete_FTDistribution2DGauss, METH_O, "delete_FTDistribution2DGauss(FTDistribution2DGauss self)"},
+	 { "FTDistribution2DGauss_swigregister", FTDistribution2DGauss_swigregister, METH_O, NULL},
+	 { "FTDistribution2DGauss_swiginit", FTDistribution2DGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution2DGate", _wrap_new_FTDistribution2DGate, METH_VARARGS, "\n"
 		"FTDistribution2DGate(double omega_x, double omega_y, double gamma=0)\n"
-		"new_FTDistribution2DGate(double omega_x, double omega_y) -> FTDistribution2DGate\n"
-		"\n"
 		"FTDistribution2DGate::FTDistribution2DGate(double omega_x, double omega_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGate_clone", _wrap_FTDistribution2DGate_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGate_clone", _wrap_FTDistribution2DGate_clone, METH_O, "\n"
 		"FTDistribution2DGate_clone(FTDistribution2DGate self) -> FTDistribution2DGate\n"
-		"\n"
 		"FTDistribution2DGate * FTDistribution2DGate::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGate_accept", _wrap_FTDistribution2DGate_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGate_accept", _wrap_FTDistribution2DGate_accept, METH_VARARGS, "\n"
 		"FTDistribution2DGate_accept(FTDistribution2DGate self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution2DGate::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DGate_evaluate", _wrap_FTDistribution2DGate_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DGate_evaluate", _wrap_FTDistribution2DGate_evaluate, METH_VARARGS, "\n"
 		"FTDistribution2DGate_evaluate(FTDistribution2DGate self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDistribution2DGate::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution2DGate", _wrap_delete_FTDistribution2DGate, METH_VARARGS, (char *)"delete_FTDistribution2DGate(FTDistribution2DGate self)"},
-	 { (char *)"FTDistribution2DGate_swigregister", FTDistribution2DGate_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution2DCone", _wrap_new_FTDistribution2DCone, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution2DGate", _wrap_delete_FTDistribution2DGate, METH_O, "delete_FTDistribution2DGate(FTDistribution2DGate self)"},
+	 { "FTDistribution2DGate_swigregister", FTDistribution2DGate_swigregister, METH_O, NULL},
+	 { "FTDistribution2DGate_swiginit", FTDistribution2DGate_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution2DCone", _wrap_new_FTDistribution2DCone, METH_VARARGS, "\n"
 		"FTDistribution2DCone(double omega_x, double omega_y, double gamma=0)\n"
-		"new_FTDistribution2DCone(double omega_x, double omega_y) -> FTDistribution2DCone\n"
-		"\n"
 		"FTDistribution2DCone::FTDistribution2DCone(double omega_x, double omega_y, double gamma=0)\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCone_clone", _wrap_FTDistribution2DCone_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCone_clone", _wrap_FTDistribution2DCone_clone, METH_O, "\n"
 		"FTDistribution2DCone_clone(FTDistribution2DCone self) -> FTDistribution2DCone\n"
-		"\n"
 		"FTDistribution2DCone * FTDistribution2DCone::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCone_accept", _wrap_FTDistribution2DCone_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCone_accept", _wrap_FTDistribution2DCone_accept, METH_VARARGS, "\n"
 		"FTDistribution2DCone_accept(FTDistribution2DCone self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution2DCone::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DCone_evaluate", _wrap_FTDistribution2DCone_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DCone_evaluate", _wrap_FTDistribution2DCone_evaluate, METH_VARARGS, "\n"
 		"FTDistribution2DCone_evaluate(FTDistribution2DCone self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDistribution2DCone::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution2DCone", _wrap_delete_FTDistribution2DCone, METH_VARARGS, (char *)"delete_FTDistribution2DCone(FTDistribution2DCone self)"},
-	 { (char *)"FTDistribution2DCone_swigregister", FTDistribution2DCone_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FTDistribution2DVoigt", _wrap_new_FTDistribution2DVoigt, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution2DCone", _wrap_delete_FTDistribution2DCone, METH_O, "delete_FTDistribution2DCone(FTDistribution2DCone self)"},
+	 { "FTDistribution2DCone_swigregister", FTDistribution2DCone_swigregister, METH_O, NULL},
+	 { "FTDistribution2DCone_swiginit", FTDistribution2DCone_swiginit, METH_VARARGS, NULL},
+	 { "new_FTDistribution2DVoigt", _wrap_new_FTDistribution2DVoigt, METH_VARARGS, "\n"
 		"FTDistribution2DVoigt(double omega_x, double omega_y, double eta, double gamma=0)\n"
-		"new_FTDistribution2DVoigt(double omega_x, double omega_y, double eta) -> FTDistribution2DVoigt\n"
-		"\n"
 		"FTDistribution2DVoigt::FTDistribution2DVoigt(double omega_x, double omega_y, double eta, double gamma=0)\n"
 		"\n"
 		"Constructor of two-dimensional pseudo-Voigt probability distribution.\n"
@@ -129241,39 +126177,35 @@ static PyMethodDef SwigMethods[] = {
 		"angle in direct space between first lattice vector and x-axis of the distribution in radians \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DVoigt_clone", _wrap_FTDistribution2DVoigt_clone, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DVoigt_clone", _wrap_FTDistribution2DVoigt_clone, METH_O, "\n"
 		"FTDistribution2DVoigt_clone(FTDistribution2DVoigt self) -> FTDistribution2DVoigt\n"
-		"\n"
 		"FTDistribution2DVoigt * FTDistribution2DVoigt::clone() const final\n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DVoigt_accept", _wrap_FTDistribution2DVoigt_accept, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DVoigt_accept", _wrap_FTDistribution2DVoigt_accept, METH_VARARGS, "\n"
 		"FTDistribution2DVoigt_accept(FTDistribution2DVoigt self, INodeVisitor visitor)\n"
-		"\n"
 		"void FTDistribution2DVoigt::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DVoigt_evaluate", _wrap_FTDistribution2DVoigt_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DVoigt_evaluate", _wrap_FTDistribution2DVoigt_evaluate, METH_VARARGS, "\n"
 		"FTDistribution2DVoigt_evaluate(FTDistribution2DVoigt self, double qx, double qy) -> double\n"
-		"\n"
 		"double FTDistribution2DVoigt::evaluate(double qx, double qy) const final\n"
 		"\n"
 		"evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1 \n"
 		"\n"
 		""},
-	 { (char *)"FTDistribution2DVoigt_eta", _wrap_FTDistribution2DVoigt_eta, METH_VARARGS, (char *)"\n"
+	 { "FTDistribution2DVoigt_eta", _wrap_FTDistribution2DVoigt_eta, METH_O, "\n"
 		"FTDistribution2DVoigt_eta(FTDistribution2DVoigt self) -> double\n"
-		"\n"
 		"double FTDistribution2DVoigt::eta() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FTDistribution2DVoigt", _wrap_delete_FTDistribution2DVoigt, METH_VARARGS, (char *)"delete_FTDistribution2DVoigt(FTDistribution2DVoigt self)"},
-	 { (char *)"FTDistribution2DVoigt_swigregister", FTDistribution2DVoigt_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FixedBinAxis", _wrap_new_FixedBinAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_FTDistribution2DVoigt", _wrap_delete_FTDistribution2DVoigt, METH_O, "delete_FTDistribution2DVoigt(FTDistribution2DVoigt self)"},
+	 { "FTDistribution2DVoigt_swigregister", FTDistribution2DVoigt_swigregister, METH_O, NULL},
+	 { "FTDistribution2DVoigt_swiginit", FTDistribution2DVoigt_swiginit, METH_VARARGS, NULL},
+	 { "new_FixedBinAxis", _wrap_new_FixedBinAxis, METH_VARARGS, "\n"
 		"new_FixedBinAxis(std::string const & name, size_t nbins, double start, double end) -> FixedBinAxis\n"
-		"\n"
 		"FixedBinAxis::FixedBinAxis(const std::string &name, size_t nbins, double start, double end)\n"
 		"\n"
 		"FixedBinAxis constructor.\n"
@@ -129294,471 +126226,427 @@ static PyMethodDef SwigMethods[] = {
 		"upper edge of last bin \n"
 		"\n"
 		""},
-	 { (char *)"delete_FixedBinAxis", _wrap_delete_FixedBinAxis, METH_VARARGS, (char *)"\n"
+	 { "delete_FixedBinAxis", _wrap_delete_FixedBinAxis, METH_O, "\n"
 		"delete_FixedBinAxis(FixedBinAxis self)\n"
-		"\n"
 		"virtual FixedBinAxis::~FixedBinAxis()\n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_clone", _wrap_FixedBinAxis_clone, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_clone", _wrap_FixedBinAxis_clone, METH_O, "\n"
 		"FixedBinAxis_clone(FixedBinAxis self) -> FixedBinAxis\n"
-		"\n"
 		"FixedBinAxis * FixedBinAxis::clone() const\n"
 		"\n"
 		"clone function \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_size", _wrap_FixedBinAxis_size, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_size", _wrap_FixedBinAxis_size, METH_O, "\n"
 		"FixedBinAxis_size(FixedBinAxis self) -> size_t\n"
-		"\n"
 		"size_t FixedBinAxis::size() const\n"
 		"\n"
 		"retrieve the number of bins \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getBin", _wrap_FixedBinAxis_getBin, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getBin", _wrap_FixedBinAxis_getBin, METH_VARARGS, "\n"
 		"FixedBinAxis_getBin(FixedBinAxis self, size_t index) -> Bin1D\n"
-		"\n"
 		"Bin1D FixedBinAxis::getBin(size_t index) const\n"
 		"\n"
 		"retrieve a 1d bin for the given index \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getMin", _wrap_FixedBinAxis_getMin, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getMin", _wrap_FixedBinAxis_getMin, METH_O, "\n"
 		"FixedBinAxis_getMin(FixedBinAxis self) -> double\n"
-		"\n"
 		"double FixedBinAxis::getMin() const\n"
 		"\n"
 		"Returns value of first point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getMax", _wrap_FixedBinAxis_getMax, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getMax", _wrap_FixedBinAxis_getMax, METH_O, "\n"
 		"FixedBinAxis_getMax(FixedBinAxis self) -> double\n"
-		"\n"
 		"double FixedBinAxis::getMax() const\n"
 		"\n"
 		"Returns value of last point of axis. \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getBinCenter", _wrap_FixedBinAxis_getBinCenter, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getBinCenter", _wrap_FixedBinAxis_getBinCenter, METH_VARARGS, "\n"
 		"FixedBinAxis_getBinCenter(FixedBinAxis self, size_t index) -> double\n"
-		"\n"
 		"double FixedBinAxis::getBinCenter(size_t index) const\n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_findClosestIndex", _wrap_FixedBinAxis_findClosestIndex, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_findClosestIndex", _wrap_FixedBinAxis_findClosestIndex, METH_VARARGS, "\n"
 		"FixedBinAxis_findClosestIndex(FixedBinAxis self, double value) -> size_t\n"
-		"\n"
 		"size_t FixedBinAxis::findClosestIndex(double value) const\n"
 		"\n"
 		"find bin index which is best match for given value \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getBinCenters", _wrap_FixedBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getBinCenters", _wrap_FixedBinAxis_getBinCenters, METH_O, "\n"
 		"FixedBinAxis_getBinCenters(FixedBinAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FixedBinAxis::getBinCenters() const\n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_getBinBoundaries", _wrap_FixedBinAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_getBinBoundaries", _wrap_FixedBinAxis_getBinBoundaries, METH_O, "\n"
 		"FixedBinAxis_getBinBoundaries(FixedBinAxis self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > FixedBinAxis::getBinBoundaries() const\n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis_createClippedAxis", _wrap_FixedBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
+	 { "FixedBinAxis_createClippedAxis", _wrap_FixedBinAxis_createClippedAxis, METH_VARARGS, "\n"
 		"FixedBinAxis_createClippedAxis(FixedBinAxis self, double left, double right) -> FixedBinAxis\n"
-		"\n"
 		"FixedBinAxis * FixedBinAxis::createClippedAxis(double left, double right) const\n"
 		"\n"
 		"Creates a new clipped axis. \n"
 		"\n"
 		""},
-	 { (char *)"FixedBinAxis___getitem__", _wrap_FixedBinAxis___getitem__, METH_VARARGS, (char *)"FixedBinAxis___getitem__(FixedBinAxis self, unsigned int i) -> double"},
-	 { (char *)"FixedBinAxis_swigregister", FixedBinAxis_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IFormFactor", _wrap_new_IFormFactor, METH_VARARGS, (char *)"\n"
-		"new_IFormFactor(PyObject * arg2) -> IFormFactor\n"
-		"\n"
+	 { "FixedBinAxis___getitem__", _wrap_FixedBinAxis___getitem__, METH_VARARGS, "FixedBinAxis___getitem__(FixedBinAxis self, unsigned int i) -> double"},
+	 { "FixedBinAxis_swigregister", FixedBinAxis_swigregister, METH_O, NULL},
+	 { "FixedBinAxis_swiginit", FixedBinAxis_swiginit, METH_VARARGS, NULL},
+	 { "new_IFormFactor", _wrap_new_IFormFactor, METH_O, "\n"
+		"new_IFormFactor(PyObject * _self) -> IFormFactor\n"
 		"IFormFactor::IFormFactor()\n"
 		"\n"
 		""},
-	 { (char *)"delete_IFormFactor", _wrap_delete_IFormFactor, METH_VARARGS, (char *)"\n"
+	 { "delete_IFormFactor", _wrap_delete_IFormFactor, METH_O, "\n"
 		"delete_IFormFactor(IFormFactor self)\n"
-		"\n"
 		"IFormFactor::~IFormFactor() override\n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_clone", _wrap_IFormFactor_clone, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_clone", _wrap_IFormFactor_clone, METH_O, "\n"
 		"IFormFactor_clone(IFormFactor self) -> IFormFactor\n"
-		"\n"
 		"IFormFactor* IFormFactor::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_createSlicedFormFactor", _wrap_IFormFactor_createSlicedFormFactor, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_createSlicedFormFactor", _wrap_IFormFactor_createSlicedFormFactor, METH_VARARGS, "\n"
 		"IFormFactor_createSlicedFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor\n"
-		"\n"
 		"IFormFactor * IFormFactor::createSlicedFormFactor(ZLimits limits, const IRotation &rot, kvector_t translation) const\n"
 		"\n"
 		"Creates a (possibly sliced) form factor with the given rotation and translation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_setAmbientMaterial", _wrap_IFormFactor_setAmbientMaterial, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_setAmbientMaterial", _wrap_IFormFactor_setAmbientMaterial, METH_VARARGS, "\n"
 		"IFormFactor_setAmbientMaterial(IFormFactor self, Material arg0)\n"
-		"\n"
 		"virtual void IFormFactor::setAmbientMaterial(Material)=0\n"
 		"\n"
 		"Passes the material in which this particle is embedded. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_evaluate", _wrap_IFormFactor_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_evaluate", _wrap_IFormFactor_evaluate, METH_VARARGS, "\n"
 		"IFormFactor_evaluate(IFormFactor self, WavevectorInfo wavevectors) -> complex_t\n"
-		"\n"
 		"virtual complex_t IFormFactor::evaluate(const WavevectorInfo &wavevectors) const =0\n"
 		"\n"
 		"Returns scattering amplitude for complex wavevectors ki, kf. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_volume", _wrap_IFormFactor_volume, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_volume", _wrap_IFormFactor_volume, METH_O, "\n"
 		"IFormFactor_volume(IFormFactor self) -> double\n"
-		"\n"
 		"double IFormFactor::volume() const\n"
 		"\n"
 		"Returns the total volume of the particle of this form factor's shape. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_radialExtension", _wrap_IFormFactor_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_radialExtension", _wrap_IFormFactor_radialExtension, METH_O, "\n"
 		"IFormFactor_radialExtension(IFormFactor self) -> double\n"
-		"\n"
 		"virtual double IFormFactor::radialExtension() const =0\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_bottomZ", _wrap_IFormFactor_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_bottomZ", _wrap_IFormFactor_bottomZ, METH_VARARGS, "\n"
 		"IFormFactor_bottomZ(IFormFactor self, IRotation rotation) -> double\n"
-		"\n"
 		"virtual double IFormFactor::bottomZ(const IRotation &rotation) const =0\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_topZ", _wrap_IFormFactor_topZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_topZ", _wrap_IFormFactor_topZ, METH_VARARGS, "\n"
 		"IFormFactor_topZ(IFormFactor self, IRotation rotation) -> double\n"
-		"\n"
 		"virtual double IFormFactor::topZ(const IRotation &rotation) const =0\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactor_canSliceAnalytically", _wrap_IFormFactor_canSliceAnalytically, METH_VARARGS, (char *)"IFormFactor_canSliceAnalytically(IFormFactor self, IRotation rot) -> bool"},
-	 { (char *)"IFormFactor_sliceFormFactor", _wrap_IFormFactor_sliceFormFactor, METH_VARARGS, (char *)"IFormFactor_sliceFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"},
-	 { (char *)"disown_IFormFactor", _wrap_disown_IFormFactor, METH_VARARGS, NULL},
-	 { (char *)"IFormFactor_swigregister", IFormFactor_swigregister, METH_VARARGS, NULL},
-	 { (char *)"CreateTransformedFormFactor", _wrap_CreateTransformedFormFactor, METH_VARARGS, (char *)"\n"
+	 { "IFormFactor_canSliceAnalytically", _wrap_IFormFactor_canSliceAnalytically, METH_VARARGS, "IFormFactor_canSliceAnalytically(IFormFactor self, IRotation rot) -> bool"},
+	 { "IFormFactor_sliceFormFactor", _wrap_IFormFactor_sliceFormFactor, METH_VARARGS, "IFormFactor_sliceFormFactor(IFormFactor self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"},
+	 { "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"
-		"\n"
 		"IFormFactor* CreateTransformedFormFactor(const IFormFactor &formfactor, const IRotation &rot, kvector_t translation)\n"
 		"\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_iterator", _wrap_vector_IFormFactorPtr_t_iterator, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_iterator(vector_IFormFactorPtr_t self) -> SwigPyIterator"},
-	 { (char *)"vector_IFormFactorPtr_t___nonzero__", _wrap_vector_IFormFactorPtr_t___nonzero__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___nonzero__(vector_IFormFactorPtr_t self) -> bool"},
-	 { (char *)"vector_IFormFactorPtr_t___bool__", _wrap_vector_IFormFactorPtr_t___bool__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___bool__(vector_IFormFactorPtr_t self) -> bool"},
-	 { (char *)"vector_IFormFactorPtr_t___len__", _wrap_vector_IFormFactorPtr_t___len__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___len__(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
-	 { (char *)"vector_IFormFactorPtr_t___getslice__", _wrap_vector_IFormFactorPtr_t___getslice__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t"},
-	 { (char *)"vector_IFormFactorPtr_t___setslice__", _wrap_vector_IFormFactorPtr_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)\n"
+	 { "vector_IFormFactorPtr_t_iterator", _wrap_vector_IFormFactorPtr_t_iterator, METH_O, "vector_IFormFactorPtr_t_iterator(vector_IFormFactorPtr_t self) -> SwigPyIterator"},
+	 { "vector_IFormFactorPtr_t___nonzero__", _wrap_vector_IFormFactorPtr_t___nonzero__, METH_O, "vector_IFormFactorPtr_t___nonzero__(vector_IFormFactorPtr_t self) -> bool"},
+	 { "vector_IFormFactorPtr_t___bool__", _wrap_vector_IFormFactorPtr_t___bool__, METH_O, "vector_IFormFactorPtr_t___bool__(vector_IFormFactorPtr_t self) -> bool"},
+	 { "vector_IFormFactorPtr_t___len__", _wrap_vector_IFormFactorPtr_t___len__, METH_O, "vector_IFormFactorPtr_t___len__(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
+	 { "vector_IFormFactorPtr_t___getslice__", _wrap_vector_IFormFactorPtr_t___getslice__, METH_VARARGS, "vector_IFormFactorPtr_t___getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t"},
+	 { "vector_IFormFactorPtr_t___setslice__", _wrap_vector_IFormFactorPtr_t___setslice__, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t___setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)\n"
 		"vector_IFormFactorPtr_t___setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v)\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t___delslice__", _wrap_vector_IFormFactorPtr_t___delslice__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___delslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)"},
-	 { (char *)"vector_IFormFactorPtr_t___delitem__", _wrap_vector_IFormFactorPtr_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< IFormFactor * >::difference_type i)\n"
+	 { "vector_IFormFactorPtr_t___delslice__", _wrap_vector_IFormFactorPtr_t___delslice__, METH_VARARGS, "vector_IFormFactorPtr_t___delslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)"},
+	 { "vector_IFormFactorPtr_t___delitem__", _wrap_vector_IFormFactorPtr_t___delitem__, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t___delitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i)\n"
 		"vector_IFormFactorPtr_t___delitem__(vector_IFormFactorPtr_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t___getitem__", _wrap_vector_IFormFactorPtr_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_IFormFactorPtr_t\n"
+	 { "vector_IFormFactorPtr_t___getitem__", _wrap_vector_IFormFactorPtr_t___getitem__, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t___getitem__(vector_IFormFactorPtr_t self, PySliceObject * slice) -> vector_IFormFactorPtr_t\n"
 		"vector_IFormFactorPtr_t___getitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i) -> IFormFactor\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t___setitem__", _wrap_vector_IFormFactorPtr_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_IFormFactorPtr_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_IFormFactorPtr_t___setitem__", _wrap_vector_IFormFactorPtr_t___setitem__, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t___setitem__(vector_IFormFactorPtr_t self, PySliceObject * slice, vector_IFormFactorPtr_t v)\n"
+		"vector_IFormFactorPtr_t___setitem__(vector_IFormFactorPtr_t self, PySliceObject * slice)\n"
 		"vector_IFormFactorPtr_t___setitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, IFormFactor x)\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_pop", _wrap_vector_IFormFactorPtr_t_pop, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_pop(vector_IFormFactorPtr_t self) -> IFormFactor"},
-	 { (char *)"vector_IFormFactorPtr_t_append", _wrap_vector_IFormFactorPtr_t_append, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_append(vector_IFormFactorPtr_t self, IFormFactor x)"},
-	 { (char *)"vector_IFormFactorPtr_t_empty", _wrap_vector_IFormFactorPtr_t_empty, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_empty(vector_IFormFactorPtr_t self) -> bool"},
-	 { (char *)"vector_IFormFactorPtr_t_size", _wrap_vector_IFormFactorPtr_t_size, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_size(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
-	 { (char *)"vector_IFormFactorPtr_t_swap", _wrap_vector_IFormFactorPtr_t_swap, METH_VARARGS, (char *)"\n"
+	 { "vector_IFormFactorPtr_t_pop", _wrap_vector_IFormFactorPtr_t_pop, METH_O, "vector_IFormFactorPtr_t_pop(vector_IFormFactorPtr_t self) -> IFormFactor"},
+	 { "vector_IFormFactorPtr_t_append", _wrap_vector_IFormFactorPtr_t_append, METH_VARARGS, "vector_IFormFactorPtr_t_append(vector_IFormFactorPtr_t self, IFormFactor x)"},
+	 { "vector_IFormFactorPtr_t_empty", _wrap_vector_IFormFactorPtr_t_empty, METH_O, "vector_IFormFactorPtr_t_empty(vector_IFormFactorPtr_t self) -> bool"},
+	 { "vector_IFormFactorPtr_t_size", _wrap_vector_IFormFactorPtr_t_size, METH_O, "vector_IFormFactorPtr_t_size(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
+	 { "vector_IFormFactorPtr_t_swap", _wrap_vector_IFormFactorPtr_t_swap, METH_VARARGS, "\n"
 		"vector_IFormFactorPtr_t_swap(vector_IFormFactorPtr_t self, vector_IFormFactorPtr_t v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_begin", _wrap_vector_IFormFactorPtr_t_begin, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"},
-	 { (char *)"vector_IFormFactorPtr_t_end", _wrap_vector_IFormFactorPtr_t_end, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_end(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"},
-	 { (char *)"vector_IFormFactorPtr_t_rbegin", _wrap_vector_IFormFactorPtr_t_rbegin, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_rbegin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"},
-	 { (char *)"vector_IFormFactorPtr_t_rend", _wrap_vector_IFormFactorPtr_t_rend, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_rend(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"},
-	 { (char *)"vector_IFormFactorPtr_t_clear", _wrap_vector_IFormFactorPtr_t_clear, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_clear(vector_IFormFactorPtr_t self)"},
-	 { (char *)"vector_IFormFactorPtr_t_get_allocator", _wrap_vector_IFormFactorPtr_t_get_allocator, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"},
-	 { (char *)"vector_IFormFactorPtr_t_pop_back", _wrap_vector_IFormFactorPtr_t_pop_back, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_pop_back(vector_IFormFactorPtr_t self)"},
-	 { (char *)"vector_IFormFactorPtr_t_erase", _wrap_vector_IFormFactorPtr_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< IFormFactor * >::iterator pos) -> std::vector< IFormFactor * >::iterator\n"
+	 { "vector_IFormFactorPtr_t_begin", _wrap_vector_IFormFactorPtr_t_begin, METH_O, "vector_IFormFactorPtr_t_begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"},
+	 { "vector_IFormFactorPtr_t_end", _wrap_vector_IFormFactorPtr_t_end, METH_O, "vector_IFormFactorPtr_t_end(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"},
+	 { "vector_IFormFactorPtr_t_rbegin", _wrap_vector_IFormFactorPtr_t_rbegin, METH_O, "vector_IFormFactorPtr_t_rbegin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"},
+	 { "vector_IFormFactorPtr_t_rend", _wrap_vector_IFormFactorPtr_t_rend, METH_O, "vector_IFormFactorPtr_t_rend(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"},
+	 { "vector_IFormFactorPtr_t_clear", _wrap_vector_IFormFactorPtr_t_clear, METH_O, "vector_IFormFactorPtr_t_clear(vector_IFormFactorPtr_t self)"},
+	 { "vector_IFormFactorPtr_t_get_allocator", _wrap_vector_IFormFactorPtr_t_get_allocator, METH_O, "vector_IFormFactorPtr_t_get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"},
+	 { "vector_IFormFactorPtr_t_pop_back", _wrap_vector_IFormFactorPtr_t_pop_back, METH_O, "vector_IFormFactorPtr_t_pop_back(vector_IFormFactorPtr_t self)"},
+	 { "vector_IFormFactorPtr_t_erase", _wrap_vector_IFormFactorPtr_t_erase, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t_erase(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos) -> std::vector< IFormFactor * >::iterator\n"
 		"vector_IFormFactorPtr_t_erase(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator first, std::vector< IFormFactor * >::iterator last) -> std::vector< IFormFactor * >::iterator\n"
 		""},
-	 { (char *)"new_vector_IFormFactorPtr_t", _wrap_new_vector_IFormFactorPtr_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_IFormFactorPtr_t", _wrap_new_vector_IFormFactorPtr_t, METH_VARARGS, "\n"
 		"vector_IFormFactorPtr_t()\n"
-		"vector_IFormFactorPtr_t(vector_IFormFactorPtr_t arg2)\n"
+		"vector_IFormFactorPtr_t(vector_IFormFactorPtr_t other)\n"
 		"vector_IFormFactorPtr_t(std::vector< IFormFactor * >::size_type size)\n"
 		"new_vector_IFormFactorPtr_t(std::vector< IFormFactor * >::size_type size, IFormFactor value) -> vector_IFormFactorPtr_t\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_push_back", _wrap_vector_IFormFactorPtr_t_push_back, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_push_back(vector_IFormFactorPtr_t self, IFormFactor x)"},
-	 { (char *)"vector_IFormFactorPtr_t_front", _wrap_vector_IFormFactorPtr_t_front, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_front(vector_IFormFactorPtr_t self) -> IFormFactor"},
-	 { (char *)"vector_IFormFactorPtr_t_back", _wrap_vector_IFormFactorPtr_t_back, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_back(vector_IFormFactorPtr_t self) -> IFormFactor"},
-	 { (char *)"vector_IFormFactorPtr_t_assign", _wrap_vector_IFormFactorPtr_t_assign, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_assign(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n, IFormFactor x)"},
-	 { (char *)"vector_IFormFactorPtr_t_resize", _wrap_vector_IFormFactorPtr_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< IFormFactor * >::size_type new_size)\n"
+	 { "vector_IFormFactorPtr_t_push_back", _wrap_vector_IFormFactorPtr_t_push_back, METH_VARARGS, "vector_IFormFactorPtr_t_push_back(vector_IFormFactorPtr_t self, IFormFactor x)"},
+	 { "vector_IFormFactorPtr_t_front", _wrap_vector_IFormFactorPtr_t_front, METH_O, "vector_IFormFactorPtr_t_front(vector_IFormFactorPtr_t self) -> IFormFactor"},
+	 { "vector_IFormFactorPtr_t_back", _wrap_vector_IFormFactorPtr_t_back, METH_O, "vector_IFormFactorPtr_t_back(vector_IFormFactorPtr_t self) -> IFormFactor"},
+	 { "vector_IFormFactorPtr_t_assign", _wrap_vector_IFormFactorPtr_t_assign, METH_VARARGS, "vector_IFormFactorPtr_t_assign(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n, IFormFactor x)"},
+	 { "vector_IFormFactorPtr_t_resize", _wrap_vector_IFormFactorPtr_t_resize, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t_resize(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type new_size)\n"
 		"vector_IFormFactorPtr_t_resize(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type new_size, IFormFactor x)\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_insert", _wrap_vector_IFormFactorPtr_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< IFormFactor * >::iterator pos, IFormFactor x) -> std::vector< IFormFactor * >::iterator\n"
+	 { "vector_IFormFactorPtr_t_insert", _wrap_vector_IFormFactorPtr_t_insert, METH_VARARGS, "\n"
+		"vector_IFormFactorPtr_t_insert(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos, IFormFactor x) -> std::vector< IFormFactor * >::iterator\n"
 		"vector_IFormFactorPtr_t_insert(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::iterator pos, std::vector< IFormFactor * >::size_type n, IFormFactor x)\n"
 		""},
-	 { (char *)"vector_IFormFactorPtr_t_reserve", _wrap_vector_IFormFactorPtr_t_reserve, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_reserve(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n)"},
-	 { (char *)"vector_IFormFactorPtr_t_capacity", _wrap_vector_IFormFactorPtr_t_capacity, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_capacity(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
-	 { (char *)"delete_vector_IFormFactorPtr_t", _wrap_delete_vector_IFormFactorPtr_t, METH_VARARGS, (char *)"delete_vector_IFormFactorPtr_t(vector_IFormFactorPtr_t self)"},
-	 { (char *)"vector_IFormFactorPtr_t_swigregister", vector_IFormFactorPtr_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IFormFactorBorn", _wrap_new_IFormFactorBorn, METH_VARARGS, (char *)"\n"
-		"new_IFormFactorBorn(PyObject * arg2) -> IFormFactorBorn\n"
-		"\n"
+	 { "vector_IFormFactorPtr_t_reserve", _wrap_vector_IFormFactorPtr_t_reserve, METH_VARARGS, "vector_IFormFactorPtr_t_reserve(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::size_type n)"},
+	 { "vector_IFormFactorPtr_t_capacity", _wrap_vector_IFormFactorPtr_t_capacity, METH_O, "vector_IFormFactorPtr_t_capacity(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"},
+	 { "delete_vector_IFormFactorPtr_t", _wrap_delete_vector_IFormFactorPtr_t, METH_O, "delete_vector_IFormFactorPtr_t(vector_IFormFactorPtr_t self)"},
+	 { "vector_IFormFactorPtr_t_swigregister", vector_IFormFactorPtr_t_swigregister, METH_O, NULL},
+	 { "vector_IFormFactorPtr_t_swiginit", vector_IFormFactorPtr_t_swiginit, METH_VARARGS, NULL},
+	 { "new_IFormFactorBorn", _wrap_new_IFormFactorBorn, METH_O, "\n"
+		"new_IFormFactorBorn(PyObject * _self) -> IFormFactorBorn\n"
 		"IFormFactorBorn::IFormFactorBorn()\n"
 		"\n"
 		""},
-	 { (char *)"delete_IFormFactorBorn", _wrap_delete_IFormFactorBorn, METH_VARARGS, (char *)"\n"
+	 { "delete_IFormFactorBorn", _wrap_delete_IFormFactorBorn, METH_O, "\n"
 		"delete_IFormFactorBorn(IFormFactorBorn self)\n"
-		"\n"
 		"IFormFactorBorn::~IFormFactorBorn() override\n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_clone", _wrap_IFormFactorBorn_clone, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_clone", _wrap_IFormFactorBorn_clone, METH_O, "\n"
 		"IFormFactorBorn_clone(IFormFactorBorn self) -> IFormFactorBorn\n"
-		"\n"
 		"IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_setAmbientMaterial", _wrap_IFormFactorBorn_setAmbientMaterial, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_setAmbientMaterial", _wrap_IFormFactorBorn_setAmbientMaterial, METH_VARARGS, "\n"
 		"IFormFactorBorn_setAmbientMaterial(IFormFactorBorn self, Material arg0)\n"
-		"\n"
 		"void IFormFactorBorn::setAmbientMaterial(Material) override\n"
 		"\n"
 		"Passes the material in which this particle is embedded. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_evaluate", _wrap_IFormFactorBorn_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_evaluate", _wrap_IFormFactorBorn_evaluate, METH_VARARGS, "\n"
 		"IFormFactorBorn_evaluate(IFormFactorBorn self, WavevectorInfo wavevectors) -> complex_t\n"
-		"\n"
 		"complex_t IFormFactorBorn::evaluate(const WavevectorInfo &wavevectors) const override\n"
 		"\n"
 		"Returns scattering amplitude for complex wavevectors ki, kf. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_bottomZ", _wrap_IFormFactorBorn_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_bottomZ", _wrap_IFormFactorBorn_bottomZ, METH_VARARGS, "\n"
 		"IFormFactorBorn_bottomZ(IFormFactorBorn self, IRotation rotation) -> double\n"
-		"\n"
 		"double IFormFactorBorn::bottomZ(const IRotation &rotation) const override\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_topZ", _wrap_IFormFactorBorn_topZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_topZ", _wrap_IFormFactorBorn_topZ, METH_VARARGS, "\n"
 		"IFormFactorBorn_topZ(IFormFactorBorn self, IRotation rotation) -> double\n"
-		"\n"
 		"double IFormFactorBorn::topZ(const IRotation &rotation) const override\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_evaluate_for_q", _wrap_IFormFactorBorn_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_evaluate_for_q", _wrap_IFormFactorBorn_evaluate_for_q, METH_VARARGS, "\n"
 		"IFormFactorBorn_evaluate_for_q(IFormFactorBorn self, cvector_t q) -> complex_t\n"
-		"\n"
 		"virtual complex_t IFormFactorBorn::evaluate_for_q(cvector_t q) const =0\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorBorn_canSliceAnalytically", _wrap_IFormFactorBorn_canSliceAnalytically, METH_VARARGS, (char *)"IFormFactorBorn_canSliceAnalytically(IFormFactorBorn self, IRotation rot) -> bool"},
-	 { (char *)"disown_IFormFactorBorn", _wrap_disown_IFormFactorBorn, METH_VARARGS, NULL},
-	 { (char *)"IFormFactorBorn_sliceFormFactor", _wrap_IFormFactorBorn_sliceFormFactor, METH_VARARGS, (char *)"IFormFactorBorn_sliceFormFactor(IFormFactorBorn self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"},
-	 { (char *)"IFormFactorBorn_swigregister", IFormFactorBorn_swigregister, METH_VARARGS, NULL},
-	 { (char *)"SlicingEffects_position_set", _wrap_SlicingEffects_position_set, METH_VARARGS, (char *)"SlicingEffects_position_set(SlicingEffects self, kvector_t position)"},
-	 { (char *)"SlicingEffects_position_get", _wrap_SlicingEffects_position_get, METH_VARARGS, (char *)"SlicingEffects_position_get(SlicingEffects self) -> kvector_t"},
-	 { (char *)"SlicingEffects_dz_bottom_set", _wrap_SlicingEffects_dz_bottom_set, METH_VARARGS, (char *)"SlicingEffects_dz_bottom_set(SlicingEffects self, double dz_bottom)"},
-	 { (char *)"SlicingEffects_dz_bottom_get", _wrap_SlicingEffects_dz_bottom_get, METH_VARARGS, (char *)"SlicingEffects_dz_bottom_get(SlicingEffects self) -> double"},
-	 { (char *)"SlicingEffects_dz_top_set", _wrap_SlicingEffects_dz_top_set, METH_VARARGS, (char *)"SlicingEffects_dz_top_set(SlicingEffects self, double dz_top)"},
-	 { (char *)"SlicingEffects_dz_top_get", _wrap_SlicingEffects_dz_top_get, METH_VARARGS, (char *)"SlicingEffects_dz_top_get(SlicingEffects self) -> double"},
-	 { (char *)"new_SlicingEffects", _wrap_new_SlicingEffects, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorBorn_canSliceAnalytically", _wrap_IFormFactorBorn_canSliceAnalytically, METH_VARARGS, "IFormFactorBorn_canSliceAnalytically(IFormFactorBorn self, IRotation rot) -> bool"},
+	 { "disown_IFormFactorBorn", _wrap_disown_IFormFactorBorn, METH_O, NULL},
+	 { "IFormFactorBorn_sliceFormFactor", _wrap_IFormFactorBorn_sliceFormFactor, METH_VARARGS, "IFormFactorBorn_sliceFormFactor(IFormFactorBorn self, ZLimits limits, IRotation rot, kvector_t translation) -> IFormFactor"},
+	 { "IFormFactorBorn_swigregister", IFormFactorBorn_swigregister, METH_O, NULL},
+	 { "IFormFactorBorn_swiginit", IFormFactorBorn_swiginit, METH_VARARGS, NULL},
+	 { "SlicingEffects_position_set", _wrap_SlicingEffects_position_set, METH_VARARGS, "SlicingEffects_position_set(SlicingEffects self, kvector_t position)"},
+	 { "SlicingEffects_position_get", _wrap_SlicingEffects_position_get, METH_O, "SlicingEffects_position_get(SlicingEffects self) -> kvector_t"},
+	 { "SlicingEffects_dz_bottom_set", _wrap_SlicingEffects_dz_bottom_set, METH_VARARGS, "SlicingEffects_dz_bottom_set(SlicingEffects self, double dz_bottom)"},
+	 { "SlicingEffects_dz_bottom_get", _wrap_SlicingEffects_dz_bottom_get, METH_O, "SlicingEffects_dz_bottom_get(SlicingEffects self) -> double"},
+	 { "SlicingEffects_dz_top_set", _wrap_SlicingEffects_dz_top_set, METH_VARARGS, "SlicingEffects_dz_top_set(SlicingEffects self, double dz_top)"},
+	 { "SlicingEffects_dz_top_get", _wrap_SlicingEffects_dz_top_get, METH_O, "SlicingEffects_dz_top_get(SlicingEffects self) -> double"},
+	 { "new_SlicingEffects", _wrap_new_SlicingEffects, METH_NOARGS, "\n"
 		"new_SlicingEffects() -> SlicingEffects\n"
 		"\n"
 		"\n"
-		"\n"
 		"Nested structure that holds slicing effects on position and removed parts.\n"
 		"\n"
 		"C++ includes: IFormFactorBorn.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_SlicingEffects", _wrap_delete_SlicingEffects, METH_VARARGS, (char *)"delete_SlicingEffects(SlicingEffects self)"},
-	 { (char *)"SlicingEffects_swigregister", SlicingEffects_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IFormFactorDecorator", _wrap_delete_IFormFactorDecorator, METH_VARARGS, (char *)"\n"
+	 { "delete_SlicingEffects", _wrap_delete_SlicingEffects, METH_O, "delete_SlicingEffects(SlicingEffects self)"},
+	 { "SlicingEffects_swigregister", SlicingEffects_swigregister, METH_O, NULL},
+	 { "SlicingEffects_swiginit", SlicingEffects_swiginit, METH_VARARGS, NULL},
+	 { "delete_IFormFactorDecorator", _wrap_delete_IFormFactorDecorator, METH_O, "\n"
 		"delete_IFormFactorDecorator(IFormFactorDecorator self)\n"
-		"\n"
 		"IFormFactorDecorator::~IFormFactorDecorator() override\n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_clone", _wrap_IFormFactorDecorator_clone, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_clone", _wrap_IFormFactorDecorator_clone, METH_O, "\n"
 		"IFormFactorDecorator_clone(IFormFactorDecorator self) -> IFormFactorDecorator\n"
-		"\n"
 		"IFormFactorDecorator* IFormFactorDecorator::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_accept", _wrap_IFormFactorDecorator_accept, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_accept", _wrap_IFormFactorDecorator_accept, METH_VARARGS, "\n"
 		"IFormFactorDecorator_accept(IFormFactorDecorator self, INodeVisitor visitor)\n"
-		"\n"
 		"void IFormFactorDecorator::accept(INodeVisitor *visitor) const override=0\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_setAmbientMaterial", _wrap_IFormFactorDecorator_setAmbientMaterial, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_setAmbientMaterial", _wrap_IFormFactorDecorator_setAmbientMaterial, METH_VARARGS, "\n"
 		"IFormFactorDecorator_setAmbientMaterial(IFormFactorDecorator self, Material material)\n"
-		"\n"
 		"void IFormFactorDecorator::setAmbientMaterial(Material material) override\n"
 		"\n"
 		"Passes the material in which this particle is embedded. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_volume", _wrap_IFormFactorDecorator_volume, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_volume", _wrap_IFormFactorDecorator_volume, METH_O, "\n"
 		"IFormFactorDecorator_volume(IFormFactorDecorator self) -> double\n"
-		"\n"
 		"double IFormFactorDecorator::volume() const override\n"
 		"\n"
 		"Returns the total volume of the particle of this form factor's shape. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_radialExtension", _wrap_IFormFactorDecorator_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_radialExtension", _wrap_IFormFactorDecorator_radialExtension, METH_O, "\n"
 		"IFormFactorDecorator_radialExtension(IFormFactorDecorator self) -> double\n"
-		"\n"
 		"double IFormFactorDecorator::radialExtension() const override\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_bottomZ", _wrap_IFormFactorDecorator_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_bottomZ", _wrap_IFormFactorDecorator_bottomZ, METH_VARARGS, "\n"
 		"IFormFactorDecorator_bottomZ(IFormFactorDecorator self, IRotation rotation) -> double\n"
-		"\n"
 		"double IFormFactorDecorator::bottomZ(const IRotation &rotation) const override\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_topZ", _wrap_IFormFactorDecorator_topZ, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_topZ", _wrap_IFormFactorDecorator_topZ, METH_VARARGS, "\n"
 		"IFormFactorDecorator_topZ(IFormFactorDecorator self, IRotation rotation) -> double\n"
-		"\n"
 		"double IFormFactorDecorator::topZ(const IRotation &rotation) const override\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_getFormFactor", _wrap_IFormFactorDecorator_getFormFactor, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_getFormFactor", _wrap_IFormFactorDecorator_getFormFactor, METH_O, "\n"
 		"IFormFactorDecorator_getFormFactor(IFormFactorDecorator self) -> IFormFactor\n"
-		"\n"
 		"const IFormFactor* IFormFactorDecorator::getFormFactor() const\n"
 		"\n"
 		""},
-	 { (char *)"IFormFactorDecorator_swigregister", IFormFactorDecorator_swigregister, METH_VARARGS, NULL},
-	 { (char *)"PolygonalTopology_vertexIndices_set", _wrap_PolygonalTopology_vertexIndices_set, METH_VARARGS, (char *)"PolygonalTopology_vertexIndices_set(PolygonalTopology self, vector_integer_t vertexIndices)"},
-	 { (char *)"PolygonalTopology_vertexIndices_get", _wrap_PolygonalTopology_vertexIndices_get, METH_VARARGS, (char *)"PolygonalTopology_vertexIndices_get(PolygonalTopology self) -> vector_integer_t"},
-	 { (char *)"PolygonalTopology_symmetry_S2_set", _wrap_PolygonalTopology_symmetry_S2_set, METH_VARARGS, (char *)"PolygonalTopology_symmetry_S2_set(PolygonalTopology self, bool symmetry_S2)"},
-	 { (char *)"PolygonalTopology_symmetry_S2_get", _wrap_PolygonalTopology_symmetry_S2_get, METH_VARARGS, (char *)"PolygonalTopology_symmetry_S2_get(PolygonalTopology self) -> bool"},
-	 { (char *)"new_PolygonalTopology", _wrap_new_PolygonalTopology, METH_VARARGS, (char *)"\n"
+	 { "IFormFactorDecorator_swigregister", IFormFactorDecorator_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)"},
+	 { "PolygonalTopology_symmetry_S2_get", _wrap_PolygonalTopology_symmetry_S2_get, METH_O, "PolygonalTopology_symmetry_S2_get(PolygonalTopology self) -> bool"},
+	 { "new_PolygonalTopology", _wrap_new_PolygonalTopology, METH_NOARGS, "\n"
 		"new_PolygonalTopology() -> PolygonalTopology\n"
 		"\n"
 		"\n"
-		"\n"
 		"For internal use in  PolyhedralFace.\n"
 		"\n"
 		"C++ includes: FormFactorPolyhedron.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_PolygonalTopology", _wrap_delete_PolygonalTopology, METH_VARARGS, (char *)"delete_PolygonalTopology(PolygonalTopology self)"},
-	 { (char *)"PolygonalTopology_swigregister", PolygonalTopology_swigregister, METH_VARARGS, NULL},
-	 { (char *)"PolyhedralTopology_faces_set", _wrap_PolyhedralTopology_faces_set, METH_VARARGS, (char *)"PolyhedralTopology_faces_set(PolyhedralTopology self, std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > * faces)"},
-	 { (char *)"PolyhedralTopology_faces_get", _wrap_PolyhedralTopology_faces_get, METH_VARARGS, (char *)"PolyhedralTopology_faces_get(PolyhedralTopology self) -> std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > *"},
-	 { (char *)"PolyhedralTopology_symmetry_Ci_set", _wrap_PolyhedralTopology_symmetry_Ci_set, METH_VARARGS, (char *)"PolyhedralTopology_symmetry_Ci_set(PolyhedralTopology self, bool symmetry_Ci)"},
-	 { (char *)"PolyhedralTopology_symmetry_Ci_get", _wrap_PolyhedralTopology_symmetry_Ci_get, METH_VARARGS, (char *)"PolyhedralTopology_symmetry_Ci_get(PolyhedralTopology self) -> bool"},
-	 { (char *)"new_PolyhedralTopology", _wrap_new_PolyhedralTopology, METH_VARARGS, (char *)"\n"
+	 { "delete_PolygonalTopology", _wrap_delete_PolygonalTopology, METH_O, "delete_PolygonalTopology(PolygonalTopology self)"},
+	 { "PolygonalTopology_swigregister", PolygonalTopology_swigregister, METH_O, NULL},
+	 { "PolygonalTopology_swiginit", PolygonalTopology_swiginit, METH_VARARGS, NULL},
+	 { "PolyhedralTopology_faces_set", _wrap_PolyhedralTopology_faces_set, METH_VARARGS, "PolyhedralTopology_faces_set(PolyhedralTopology self, std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > * faces)"},
+	 { "PolyhedralTopology_faces_get", _wrap_PolyhedralTopology_faces_get, METH_O, "PolyhedralTopology_faces_get(PolyhedralTopology self) -> std::vector< PolygonalTopology,std::allocator< PolygonalTopology > > *"},
+	 { "PolyhedralTopology_symmetry_Ci_set", _wrap_PolyhedralTopology_symmetry_Ci_set, METH_VARARGS, "PolyhedralTopology_symmetry_Ci_set(PolyhedralTopology self, bool symmetry_Ci)"},
+	 { "PolyhedralTopology_symmetry_Ci_get", _wrap_PolyhedralTopology_symmetry_Ci_get, METH_O, "PolyhedralTopology_symmetry_Ci_get(PolyhedralTopology self) -> bool"},
+	 { "new_PolyhedralTopology", _wrap_new_PolyhedralTopology, METH_NOARGS, "\n"
 		"new_PolyhedralTopology() -> PolyhedralTopology\n"
 		"\n"
 		"\n"
-		"\n"
 		"For internal use in  FormFactorPolyhedron.\n"
 		"\n"
 		"C++ includes: FormFactorPolyhedron.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_PolyhedralTopology", _wrap_delete_PolyhedralTopology, METH_VARARGS, (char *)"delete_PolyhedralTopology(PolyhedralTopology self)"},
-	 { (char *)"PolyhedralTopology_swigregister", PolyhedralTopology_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_PolyhedralEdge", _wrap_new_PolyhedralEdge, METH_VARARGS, (char *)"\n"
+	 { "delete_PolyhedralTopology", _wrap_delete_PolyhedralTopology, METH_O, "delete_PolyhedralTopology(PolyhedralTopology self)"},
+	 { "PolyhedralTopology_swigregister", PolyhedralTopology_swigregister, METH_O, NULL},
+	 { "PolyhedralTopology_swiginit", PolyhedralTopology_swiginit, METH_VARARGS, NULL},
+	 { "new_PolyhedralEdge", _wrap_new_PolyhedralEdge, METH_VARARGS, "\n"
 		"new_PolyhedralEdge(kvector_t _Vlow, kvector_t _Vhig) -> PolyhedralEdge\n"
-		"\n"
 		"PolyhedralEdge::PolyhedralEdge(const kvector_t _Vlow, const kvector_t _Vhig)\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralEdge_E", _wrap_PolyhedralEdge_E, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralEdge_E", _wrap_PolyhedralEdge_E, METH_O, "\n"
 		"PolyhedralEdge_E(PolyhedralEdge self) -> kvector_t\n"
-		"\n"
 		"kvector_t PolyhedralEdge::E() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralEdge_R", _wrap_PolyhedralEdge_R, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralEdge_R", _wrap_PolyhedralEdge_R, METH_O, "\n"
 		"PolyhedralEdge_R(PolyhedralEdge self) -> kvector_t\n"
-		"\n"
 		"kvector_t PolyhedralEdge::R() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralEdge_qE", _wrap_PolyhedralEdge_qE, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralEdge_qE", _wrap_PolyhedralEdge_qE, METH_VARARGS, "\n"
 		"PolyhedralEdge_qE(PolyhedralEdge self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralEdge::qE(cvector_t q) const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralEdge_qR", _wrap_PolyhedralEdge_qR, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralEdge_qR", _wrap_PolyhedralEdge_qR, METH_VARARGS, "\n"
 		"PolyhedralEdge_qR(PolyhedralEdge self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralEdge::qR(cvector_t q) const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralEdge_contrib", _wrap_PolyhedralEdge_contrib, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralEdge_contrib", _wrap_PolyhedralEdge_contrib, METH_VARARGS, "\n"
 		"PolyhedralEdge_contrib(PolyhedralEdge self, int m, cvector_t qpa, complex_t qrperp) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralEdge::contrib(int m, cvector_t qpa, complex_t qrperp) const\n"
 		"\n"
 		"Returns sum_l=0^M/2 u^2l v^(M-2l) / (2l+1)!(M-2l)! - vperp^M/M! \n"
 		"\n"
 		""},
-	 { (char *)"delete_PolyhedralEdge", _wrap_delete_PolyhedralEdge, METH_VARARGS, (char *)"delete_PolyhedralEdge(PolyhedralEdge self)"},
-	 { (char *)"PolyhedralEdge_swigregister", PolyhedralEdge_swigregister, METH_VARARGS, NULL},
-	 { (char *)"PolyhedralFace_diameter", _wrap_PolyhedralFace_diameter, METH_VARARGS, (char *)"PolyhedralFace_diameter(vector_kvector_t V) -> double"},
-	 { (char *)"new_PolyhedralFace", _wrap_new_PolyhedralFace, METH_VARARGS, (char *)"\n"
-		"PolyhedralFace(vector_kvector_t _V, bool _sym_S2=False)\n"
-		"PolyhedralFace(vector_kvector_t _V)\n"
-		"new_PolyhedralFace() -> PolyhedralFace\n"
-		"\n"
+	 { "delete_PolyhedralEdge", _wrap_delete_PolyhedralEdge, METH_O, "delete_PolyhedralEdge(PolyhedralEdge self)"},
+	 { "PolyhedralEdge_swigregister", PolyhedralEdge_swigregister, METH_O, NULL},
+	 { "PolyhedralEdge_swiginit", PolyhedralEdge_swiginit, METH_VARARGS, NULL},
+	 { "PolyhedralFace_diameter", _wrap_PolyhedralFace_diameter, METH_O, "PolyhedralFace_diameter(vector_kvector_t V) -> double"},
+	 { "new_PolyhedralFace", _wrap_new_PolyhedralFace, METH_VARARGS, "\n"
+		"PolyhedralFace(vector_kvector_t _V=std::vector< kvector_t >(), bool _sym_S2=False)\n"
 		"PolyhedralFace::PolyhedralFace(const std::vector< kvector_t > &_V=std::vector< kvector_t >(), bool _sym_S2=false)\n"
 		"\n"
 		"Sets internal variables for given vertex chain.\n"
@@ -129773,175 +126661,154 @@ static PyMethodDef SwigMethods[] = {
 		"true if face has a perpedicular two-fold symmetry axis \n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_area", _wrap_PolyhedralFace_area, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_area", _wrap_PolyhedralFace_area, METH_O, "\n"
 		"PolyhedralFace_area(PolyhedralFace self) -> double\n"
-		"\n"
 		"double PolyhedralFace::area() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_center", _wrap_PolyhedralFace_center, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_center", _wrap_PolyhedralFace_center, METH_O, "\n"
 		"PolyhedralFace_center(PolyhedralFace self) -> kvector_t\n"
-		"\n"
 		"kvector_t PolyhedralFace::center() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_pyramidalVolume", _wrap_PolyhedralFace_pyramidalVolume, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_pyramidalVolume", _wrap_PolyhedralFace_pyramidalVolume, METH_O, "\n"
 		"PolyhedralFace_pyramidalVolume(PolyhedralFace self) -> double\n"
-		"\n"
 		"double PolyhedralFace::pyramidalVolume() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_radius3d", _wrap_PolyhedralFace_radius3d, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_radius3d", _wrap_PolyhedralFace_radius3d, METH_O, "\n"
 		"PolyhedralFace_radius3d(PolyhedralFace self) -> double\n"
-		"\n"
 		"double PolyhedralFace::radius3d() const\n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_normalProjectionConj", _wrap_PolyhedralFace_normalProjectionConj, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_normalProjectionConj", _wrap_PolyhedralFace_normalProjectionConj, METH_VARARGS, "\n"
 		"PolyhedralFace_normalProjectionConj(PolyhedralFace self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralFace::normalProjectionConj(cvector_t q) const\n"
 		"\n"
 		"Returns conj(q)*normal [ BasicVector3D::dot is antilinear in 'this' argument]. \n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_ff_n", _wrap_PolyhedralFace_ff_n, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_ff_n", _wrap_PolyhedralFace_ff_n, METH_VARARGS, "\n"
 		"PolyhedralFace_ff_n(PolyhedralFace self, int m, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralFace::ff_n(int m, cvector_t q) const\n"
 		"\n"
 		"Returns contribution qn*f_n [of order q^(n+1)] from this face to the polyhedral form factor. \n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_ff", _wrap_PolyhedralFace_ff, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_ff", _wrap_PolyhedralFace_ff, METH_VARARGS, "\n"
 		"PolyhedralFace_ff(PolyhedralFace self, cvector_t q, bool sym_Ci) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralFace::ff(cvector_t q, bool sym_Ci) const\n"
 		"\n"
 		"Returns the contribution ff(q) of this face to the polyhedral form factor. \n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_ff_2D", _wrap_PolyhedralFace_ff_2D, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_ff_2D", _wrap_PolyhedralFace_ff_2D, METH_VARARGS, "\n"
 		"PolyhedralFace_ff_2D(PolyhedralFace self, cvector_t qpa) -> complex_t\n"
-		"\n"
 		"complex_t PolyhedralFace::ff_2D(cvector_t qpa) const\n"
 		"\n"
 		"Returns the two-dimensional form factor of this face, for use in a prism. \n"
 		"\n"
 		""},
-	 { (char *)"PolyhedralFace_assert_Ci", _wrap_PolyhedralFace_assert_Ci, METH_VARARGS, (char *)"\n"
+	 { "PolyhedralFace_assert_Ci", _wrap_PolyhedralFace_assert_Ci, METH_VARARGS, "\n"
 		"PolyhedralFace_assert_Ci(PolyhedralFace self, PolyhedralFace other)\n"
-		"\n"
 		"void PolyhedralFace::assert_Ci(const PolyhedralFace &other) const\n"
 		"\n"
 		"Throws if deviation from inversion symmetry is detected. Does not check vertices. \n"
 		"\n"
 		""},
-	 { (char *)"delete_PolyhedralFace", _wrap_delete_PolyhedralFace, METH_VARARGS, (char *)"delete_PolyhedralFace(PolyhedralFace self)"},
-	 { (char *)"PolyhedralFace_swigregister", PolyhedralFace_swigregister, METH_VARARGS, NULL},
-	 { (char *)"FormFactorPolyhedron_evaluate_for_q", _wrap_FormFactorPolyhedron_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "delete_PolyhedralFace", _wrap_delete_PolyhedralFace, METH_O, "delete_PolyhedralFace(PolyhedralFace self)"},
+	 { "PolyhedralFace_swigregister", PolyhedralFace_swigregister, METH_O, NULL},
+	 { "PolyhedralFace_swiginit", PolyhedralFace_swiginit, METH_VARARGS, NULL},
+	 { "FormFactorPolyhedron_evaluate_for_q", _wrap_FormFactorPolyhedron_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorPolyhedron_evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns the form factor F(q) of this polyhedron, respecting the offset z_origin. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolyhedron_evaluate_centered", _wrap_FormFactorPolyhedron_evaluate_centered, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolyhedron_evaluate_centered", _wrap_FormFactorPolyhedron_evaluate_centered, METH_VARARGS, "\n"
 		"FormFactorPolyhedron_evaluate_centered(FormFactorPolyhedron self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorPolyhedron::evaluate_centered(cvector_t q) const\n"
 		"\n"
 		"Returns the form factor F(q) of this polyhedron, with origin at z=0. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolyhedron_volume", _wrap_FormFactorPolyhedron_volume, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolyhedron_volume", _wrap_FormFactorPolyhedron_volume, METH_O, "\n"
 		"FormFactorPolyhedron_volume(FormFactorPolyhedron self) -> double\n"
-		"\n"
 		"double FormFactorPolyhedron::volume() const override final\n"
 		"\n"
 		"Returns the total volume of the particle of this form factor's shape. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolyhedron_radialExtension", _wrap_FormFactorPolyhedron_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolyhedron_radialExtension", _wrap_FormFactorPolyhedron_radialExtension, METH_O, "\n"
 		"FormFactorPolyhedron_radialExtension(FormFactorPolyhedron self) -> double\n"
-		"\n"
 		"double FormFactorPolyhedron::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolyhedron_assert_platonic", _wrap_FormFactorPolyhedron_assert_platonic, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolyhedron_assert_platonic", _wrap_FormFactorPolyhedron_assert_platonic, METH_O, "\n"
 		"FormFactorPolyhedron_assert_platonic(FormFactorPolyhedron self)\n"
-		"\n"
 		"void FormFactorPolyhedron::assert_platonic() const\n"
 		"\n"
 		"Assertions for Platonic solid. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPolyhedron", _wrap_delete_FormFactorPolyhedron, METH_VARARGS, (char *)"delete_FormFactorPolyhedron(FormFactorPolyhedron self)"},
-	 { (char *)"FormFactorPolyhedron_swigregister", FormFactorPolyhedron_swigregister, METH_VARARGS, NULL},
-	 { (char *)"FormFactorPolygonalPrism_evaluate_for_q", _wrap_FormFactorPolygonalPrism_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPolyhedron", _wrap_delete_FormFactorPolyhedron, METH_O, "delete_FormFactorPolyhedron(FormFactorPolyhedron self)"},
+	 { "FormFactorPolyhedron_swigregister", FormFactorPolyhedron_swigregister, METH_O, NULL},
+	 { "FormFactorPolygonalPrism_evaluate_for_q", _wrap_FormFactorPolygonalPrism_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorPolygonalPrism_evaluate_for_q(FormFactorPolygonalPrism self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns the form factor F(q) of this polyhedron, respecting the offset height/2. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolygonalPrism_volume", _wrap_FormFactorPolygonalPrism_volume, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolygonalPrism_volume", _wrap_FormFactorPolygonalPrism_volume, METH_O, "\n"
 		"FormFactorPolygonalPrism_volume(FormFactorPolygonalPrism self) -> double\n"
-		"\n"
 		"double FormFactorPolygonalPrism::volume() const override final\n"
 		"\n"
 		"Returns the volume of this prism. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolygonalPrism_getHeight", _wrap_FormFactorPolygonalPrism_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolygonalPrism_getHeight", _wrap_FormFactorPolygonalPrism_getHeight, METH_O, "\n"
 		"FormFactorPolygonalPrism_getHeight(FormFactorPolygonalPrism self) -> double\n"
-		"\n"
 		"double FormFactorPolygonalPrism::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolygonalPrism_radialExtension", _wrap_FormFactorPolygonalPrism_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolygonalPrism_radialExtension", _wrap_FormFactorPolygonalPrism_radialExtension, METH_O, "\n"
 		"FormFactorPolygonalPrism_radialExtension(FormFactorPolygonalPrism self) -> double\n"
-		"\n"
 		"double FormFactorPolygonalPrism::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPolygonalPrism", _wrap_delete_FormFactorPolygonalPrism, METH_VARARGS, (char *)"delete_FormFactorPolygonalPrism(FormFactorPolygonalPrism self)"},
-	 { (char *)"FormFactorPolygonalPrism_swigregister", FormFactorPolygonalPrism_swigregister, METH_VARARGS, NULL},
-	 { (char *)"FormFactorPolygonalSurface_evaluate_for_q", _wrap_FormFactorPolygonalSurface_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPolygonalPrism", _wrap_delete_FormFactorPolygonalPrism, METH_O, "delete_FormFactorPolygonalPrism(FormFactorPolygonalPrism self)"},
+	 { "FormFactorPolygonalPrism_swigregister", FormFactorPolygonalPrism_swigregister, METH_O, NULL},
+	 { "FormFactorPolygonalSurface_evaluate_for_q", _wrap_FormFactorPolygonalSurface_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorPolygonalSurface_evaluate_for_q(FormFactorPolygonalSurface self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolygonalSurface_volume", _wrap_FormFactorPolygonalSurface_volume, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolygonalSurface_volume", _wrap_FormFactorPolygonalSurface_volume, METH_O, "\n"
 		"FormFactorPolygonalSurface_volume(FormFactorPolygonalSurface self) -> double\n"
-		"\n"
 		"double FormFactorPolygonalSurface::volume() const override\n"
 		"\n"
 		"Returns the total volume of the particle of this form factor's shape. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPolygonalSurface_radialExtension", _wrap_FormFactorPolygonalSurface_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPolygonalSurface_radialExtension", _wrap_FormFactorPolygonalSurface_radialExtension, METH_O, "\n"
 		"FormFactorPolygonalSurface_radialExtension(FormFactorPolygonalSurface self) -> double\n"
-		"\n"
 		"double FormFactorPolygonalSurface::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPolygonalSurface", _wrap_delete_FormFactorPolygonalSurface, METH_VARARGS, (char *)"delete_FormFactorPolygonalSurface(FormFactorPolygonalSurface self)"},
-	 { (char *)"FormFactorPolygonalSurface_swigregister", FormFactorPolygonalSurface_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorAnisoPyramid", _wrap_new_FormFactorAnisoPyramid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPolygonalSurface", _wrap_delete_FormFactorPolygonalSurface, METH_O, "delete_FormFactorPolygonalSurface(FormFactorPolygonalSurface self)"},
+	 { "FormFactorPolygonalSurface_swigregister", FormFactorPolygonalSurface_swigregister, METH_O, NULL},
+	 { "new_FormFactorAnisoPyramid", _wrap_new_FormFactorAnisoPyramid, METH_VARARGS, "\n"
 		"new_FormFactorAnisoPyramid(double length, double width, double height, double alpha) -> FormFactorAnisoPyramid\n"
-		"\n"
 		"FormFactorAnisoPyramid::FormFactorAnisoPyramid(double length, double width, double height, double alpha)\n"
 		"\n"
 		"Constructor of a truncated pyramid with a rectangular base.\n"
@@ -129962,51 +126829,45 @@ static PyMethodDef SwigMethods[] = {
 		"dihedral angle in radians between base and facet \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_clone", _wrap_FormFactorAnisoPyramid_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_clone", _wrap_FormFactorAnisoPyramid_clone, METH_O, "\n"
 		"FormFactorAnisoPyramid_clone(FormFactorAnisoPyramid self) -> FormFactorAnisoPyramid\n"
-		"\n"
 		"FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_accept", _wrap_FormFactorAnisoPyramid_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_accept", _wrap_FormFactorAnisoPyramid_accept, METH_VARARGS, "\n"
 		"FormFactorAnisoPyramid_accept(FormFactorAnisoPyramid self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_getLength", _wrap_FormFactorAnisoPyramid_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_getLength", _wrap_FormFactorAnisoPyramid_getLength, METH_O, "\n"
 		"FormFactorAnisoPyramid_getLength(FormFactorAnisoPyramid self) -> double\n"
-		"\n"
 		"double FormFactorAnisoPyramid::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_getWidth", _wrap_FormFactorAnisoPyramid_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_getWidth", _wrap_FormFactorAnisoPyramid_getWidth, METH_O, "\n"
 		"FormFactorAnisoPyramid_getWidth(FormFactorAnisoPyramid self) -> double\n"
-		"\n"
 		"double FormFactorAnisoPyramid::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_getHeight", _wrap_FormFactorAnisoPyramid_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_getHeight", _wrap_FormFactorAnisoPyramid_getHeight, METH_O, "\n"
 		"FormFactorAnisoPyramid_getHeight(FormFactorAnisoPyramid self) -> double\n"
-		"\n"
 		"double FormFactorAnisoPyramid::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorAnisoPyramid_getAlpha", _wrap_FormFactorAnisoPyramid_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorAnisoPyramid_getAlpha", _wrap_FormFactorAnisoPyramid_getAlpha, METH_O, "\n"
 		"FormFactorAnisoPyramid_getAlpha(FormFactorAnisoPyramid self) -> double\n"
-		"\n"
 		"double FormFactorAnisoPyramid::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorAnisoPyramid", _wrap_delete_FormFactorAnisoPyramid, METH_VARARGS, (char *)"delete_FormFactorAnisoPyramid(FormFactorAnisoPyramid self)"},
-	 { (char *)"FormFactorAnisoPyramid_swigregister", FormFactorAnisoPyramid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorBox", _wrap_new_FormFactorBox, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorAnisoPyramid", _wrap_delete_FormFactorAnisoPyramid, METH_O, "delete_FormFactorAnisoPyramid(FormFactorAnisoPyramid self)"},
+	 { "FormFactorAnisoPyramid_swigregister", FormFactorAnisoPyramid_swigregister, METH_O, NULL},
+	 { "FormFactorAnisoPyramid_swiginit", FormFactorAnisoPyramid_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorBox", _wrap_new_FormFactorBox, METH_VARARGS, "\n"
 		"new_FormFactorBox(double length, double width, double height) -> FormFactorBox\n"
-		"\n"
 		"FormFactorBox::FormFactorBox(double length, double width, double height)\n"
 		"\n"
 		"Constructor of a rectangular cuboid.\n"
@@ -130024,61 +126885,54 @@ static PyMethodDef SwigMethods[] = {
 		"height of the box in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_clone", _wrap_FormFactorBox_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_clone", _wrap_FormFactorBox_clone, METH_O, "\n"
 		"FormFactorBox_clone(FormFactorBox self) -> FormFactorBox\n"
-		"\n"
 		"FormFactorBox* FormFactorBox::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_accept", _wrap_FormFactorBox_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_accept", _wrap_FormFactorBox_accept, METH_VARARGS, "\n"
 		"FormFactorBox_accept(FormFactorBox self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorBox::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_getLength", _wrap_FormFactorBox_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_getLength", _wrap_FormFactorBox_getLength, METH_O, "\n"
 		"FormFactorBox_getLength(FormFactorBox self) -> double\n"
-		"\n"
 		"double FormFactorBox::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_getHeight", _wrap_FormFactorBox_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_getHeight", _wrap_FormFactorBox_getHeight, METH_O, "\n"
 		"FormFactorBox_getHeight(FormFactorBox self) -> double\n"
-		"\n"
 		"double FormFactorBox::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_getWidth", _wrap_FormFactorBox_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_getWidth", _wrap_FormFactorBox_getWidth, METH_O, "\n"
 		"FormFactorBox_getWidth(FormFactorBox self) -> double\n"
-		"\n"
 		"double FormFactorBox::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_radialExtension", _wrap_FormFactorBox_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_radialExtension", _wrap_FormFactorBox_radialExtension, METH_O, "\n"
 		"FormFactorBox_radialExtension(FormFactorBox self) -> double\n"
-		"\n"
 		"double FormFactorBox::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorBox_evaluate_for_q", _wrap_FormFactorBox_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorBox_evaluate_for_q", _wrap_FormFactorBox_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorBox_evaluate_for_q(FormFactorBox self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorBox::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorBox", _wrap_delete_FormFactorBox, METH_VARARGS, (char *)"delete_FormFactorBox(FormFactorBox self)"},
-	 { (char *)"FormFactorBox_swigregister", FormFactorBox_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorCone", _wrap_new_FormFactorCone, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorBox", _wrap_delete_FormFactorBox, METH_O, "delete_FormFactorBox(FormFactorBox self)"},
+	 { "FormFactorBox_swigregister", FormFactorBox_swigregister, METH_O, NULL},
+	 { "FormFactorBox_swiginit", FormFactorBox_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorCone", _wrap_new_FormFactorCone, METH_VARARGS, "\n"
 		"new_FormFactorCone(double radius, double height, double alpha) -> FormFactorCone\n"
-		"\n"
 		"FormFactorCone::FormFactorCone(double radius, double height, double alpha)\n"
 		"\n"
 		"Constructor of a truncated cone with circular base.\n"
@@ -130096,61 +126950,54 @@ static PyMethodDef SwigMethods[] = {
 		"angle between the base and the side surface in radians \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_clone", _wrap_FormFactorCone_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_clone", _wrap_FormFactorCone_clone, METH_O, "\n"
 		"FormFactorCone_clone(FormFactorCone self) -> FormFactorCone\n"
-		"\n"
 		"FormFactorCone* FormFactorCone::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_accept", _wrap_FormFactorCone_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_accept", _wrap_FormFactorCone_accept, METH_VARARGS, "\n"
 		"FormFactorCone_accept(FormFactorCone self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorCone::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_getHeight", _wrap_FormFactorCone_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_getHeight", _wrap_FormFactorCone_getHeight, METH_O, "\n"
 		"FormFactorCone_getHeight(FormFactorCone self) -> double\n"
-		"\n"
 		"double FormFactorCone::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_getAlpha", _wrap_FormFactorCone_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_getAlpha", _wrap_FormFactorCone_getAlpha, METH_O, "\n"
 		"FormFactorCone_getAlpha(FormFactorCone self) -> double\n"
-		"\n"
 		"double FormFactorCone::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_getRadius", _wrap_FormFactorCone_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_getRadius", _wrap_FormFactorCone_getRadius, METH_O, "\n"
 		"FormFactorCone_getRadius(FormFactorCone self) -> double\n"
-		"\n"
 		"double FormFactorCone::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_radialExtension", _wrap_FormFactorCone_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_radialExtension", _wrap_FormFactorCone_radialExtension, METH_O, "\n"
 		"FormFactorCone_radialExtension(FormFactorCone self) -> double\n"
-		"\n"
 		"double FormFactorCone::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone_evaluate_for_q", _wrap_FormFactorCone_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone_evaluate_for_q", _wrap_FormFactorCone_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorCone_evaluate_for_q(FormFactorCone self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorCone::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCone", _wrap_delete_FormFactorCone, METH_VARARGS, (char *)"delete_FormFactorCone(FormFactorCone self)"},
-	 { (char *)"FormFactorCone_swigregister", FormFactorCone_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorCone6", _wrap_new_FormFactorCone6, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorCone", _wrap_delete_FormFactorCone, METH_O, "delete_FormFactorCone(FormFactorCone self)"},
+	 { "FormFactorCone_swigregister", FormFactorCone_swigregister, METH_O, NULL},
+	 { "FormFactorCone_swiginit", FormFactorCone_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorCone6", _wrap_new_FormFactorCone6, METH_VARARGS, "\n"
 		"new_FormFactorCone6(double base_edge, double height, double alpha) -> FormFactorCone6\n"
-		"\n"
 		"FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)\n"
 		"\n"
 		"Constructor of a truncated pyramid, based on a regular hexagon\n"
@@ -130168,123 +127015,108 @@ static PyMethodDef SwigMethods[] = {
 		"dihedral angle in radians between base and facet \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone6_clone", _wrap_FormFactorCone6_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone6_clone", _wrap_FormFactorCone6_clone, METH_O, "\n"
 		"FormFactorCone6_clone(FormFactorCone6 self) -> FormFactorCone6\n"
-		"\n"
 		"FormFactorCone6* FormFactorCone6::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone6_accept", _wrap_FormFactorCone6_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone6_accept", _wrap_FormFactorCone6_accept, METH_VARARGS, "\n"
 		"FormFactorCone6_accept(FormFactorCone6 self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorCone6::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone6_getBaseEdge", _wrap_FormFactorCone6_getBaseEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone6_getBaseEdge", _wrap_FormFactorCone6_getBaseEdge, METH_O, "\n"
 		"FormFactorCone6_getBaseEdge(FormFactorCone6 self) -> double\n"
-		"\n"
 		"double FormFactorCone6::getBaseEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone6_getHeight", _wrap_FormFactorCone6_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone6_getHeight", _wrap_FormFactorCone6_getHeight, METH_O, "\n"
 		"FormFactorCone6_getHeight(FormFactorCone6 self) -> double\n"
-		"\n"
 		"double FormFactorCone6::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCone6_getAlpha", _wrap_FormFactorCone6_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCone6_getAlpha", _wrap_FormFactorCone6_getAlpha, METH_O, "\n"
 		"FormFactorCone6_getAlpha(FormFactorCone6 self) -> double\n"
-		"\n"
 		"double FormFactorCone6::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCone6", _wrap_delete_FormFactorCone6, METH_VARARGS, (char *)"delete_FormFactorCone6(FormFactorCone6 self)"},
-	 { (char *)"FormFactorCone6_swigregister", FormFactorCone6_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorCrystal", _wrap_new_FormFactorCrystal, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorCone6", _wrap_delete_FormFactorCone6, METH_O, "delete_FormFactorCone6(FormFactorCone6 self)"},
+	 { "FormFactorCone6_swigregister", FormFactorCone6_swigregister, METH_O, NULL},
+	 { "FormFactorCone6_swiginit", FormFactorCone6_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorCrystal", _wrap_new_FormFactorCrystal, METH_VARARGS, "\n"
 		"FormFactorCrystal(Lattice lattice, IFormFactor basis_form_factor, IFormFactor meso_form_factor, double position_variance=0.0)\n"
-		"new_FormFactorCrystal(Lattice lattice, IFormFactor basis_form_factor, IFormFactor meso_form_factor) -> FormFactorCrystal\n"
-		"\n"
 		"FormFactorCrystal::FormFactorCrystal(const Lattice &lattice, const IFormFactor &basis_form_factor, const IFormFactor &meso_form_factor, double position_variance=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCrystal", _wrap_delete_FormFactorCrystal, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorCrystal", _wrap_delete_FormFactorCrystal, METH_O, "\n"
 		"delete_FormFactorCrystal(FormFactorCrystal self)\n"
-		"\n"
 		"FormFactorCrystal::~FormFactorCrystal() override final\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_clone", _wrap_FormFactorCrystal_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_clone", _wrap_FormFactorCrystal_clone, METH_O, "\n"
 		"FormFactorCrystal_clone(FormFactorCrystal self) -> FormFactorCrystal\n"
-		"\n"
 		"FormFactorCrystal* FormFactorCrystal::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_accept", _wrap_FormFactorCrystal_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_accept", _wrap_FormFactorCrystal_accept, METH_VARARGS, "\n"
 		"FormFactorCrystal_accept(FormFactorCrystal self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorCrystal::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_setAmbientMaterial", _wrap_FormFactorCrystal_setAmbientMaterial, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_setAmbientMaterial", _wrap_FormFactorCrystal_setAmbientMaterial, METH_VARARGS, "\n"
 		"FormFactorCrystal_setAmbientMaterial(FormFactorCrystal self, Material material)\n"
-		"\n"
 		"void FormFactorCrystal::setAmbientMaterial(Material material) override\n"
 		"\n"
 		"Passes the material in which this particle is embedded. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_volume", _wrap_FormFactorCrystal_volume, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_volume", _wrap_FormFactorCrystal_volume, METH_O, "\n"
 		"FormFactorCrystal_volume(FormFactorCrystal self) -> double\n"
-		"\n"
 		"double FormFactorCrystal::volume() const override final\n"
 		"\n"
 		"Returns the total volume of the particle of this form factor's shape. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_radialExtension", _wrap_FormFactorCrystal_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_radialExtension", _wrap_FormFactorCrystal_radialExtension, METH_O, "\n"
 		"FormFactorCrystal_radialExtension(FormFactorCrystal self) -> double\n"
-		"\n"
 		"double FormFactorCrystal::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_bottomZ", _wrap_FormFactorCrystal_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_bottomZ", _wrap_FormFactorCrystal_bottomZ, METH_VARARGS, "\n"
 		"FormFactorCrystal_bottomZ(FormFactorCrystal self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorCrystal::bottomZ(const IRotation &rotation) const override\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_topZ", _wrap_FormFactorCrystal_topZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_topZ", _wrap_FormFactorCrystal_topZ, METH_VARARGS, "\n"
 		"FormFactorCrystal_topZ(FormFactorCrystal self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorCrystal::topZ(const IRotation &rotation) const override final\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_evaluate", _wrap_FormFactorCrystal_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_evaluate", _wrap_FormFactorCrystal_evaluate, METH_VARARGS, "\n"
 		"FormFactorCrystal_evaluate(FormFactorCrystal self, WavevectorInfo wavevectors) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex wavevectors ki, kf. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCrystal_swigregister", FormFactorCrystal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorCuboctahedron", _wrap_new_FormFactorCuboctahedron, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCrystal_swigregister", FormFactorCrystal_swigregister, METH_O, NULL},
+	 { "FormFactorCrystal_swiginit", FormFactorCrystal_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorCuboctahedron", _wrap_new_FormFactorCuboctahedron, METH_VARARGS, "\n"
 		"new_FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha) -> FormFactorCuboctahedron\n"
-		"\n"
 		"FormFactorCuboctahedron::FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha)\n"
 		"\n"
 		"Constructor of cuboctahedron (compound of two truncated pyramids with a common square base and opposite orientations).\n"
@@ -130305,51 +127137,45 @@ static PyMethodDef SwigMethods[] = {
 		"dihedral angle in radians between base and facet \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_clone", _wrap_FormFactorCuboctahedron_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_clone", _wrap_FormFactorCuboctahedron_clone, METH_O, "\n"
 		"FormFactorCuboctahedron_clone(FormFactorCuboctahedron self) -> FormFactorCuboctahedron\n"
-		"\n"
 		"FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_accept", _wrap_FormFactorCuboctahedron_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_accept", _wrap_FormFactorCuboctahedron_accept, METH_VARARGS, "\n"
 		"FormFactorCuboctahedron_accept(FormFactorCuboctahedron self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_getLength", _wrap_FormFactorCuboctahedron_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_getLength", _wrap_FormFactorCuboctahedron_getLength, METH_O, "\n"
 		"FormFactorCuboctahedron_getLength(FormFactorCuboctahedron self) -> double\n"
-		"\n"
 		"double FormFactorCuboctahedron::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_getHeight", _wrap_FormFactorCuboctahedron_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_getHeight", _wrap_FormFactorCuboctahedron_getHeight, METH_O, "\n"
 		"FormFactorCuboctahedron_getHeight(FormFactorCuboctahedron self) -> double\n"
-		"\n"
 		"double FormFactorCuboctahedron::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_getHeightRatio", _wrap_FormFactorCuboctahedron_getHeightRatio, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_getHeightRatio", _wrap_FormFactorCuboctahedron_getHeightRatio, METH_O, "\n"
 		"FormFactorCuboctahedron_getHeightRatio(FormFactorCuboctahedron self) -> double\n"
-		"\n"
 		"double FormFactorCuboctahedron::getHeightRatio() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCuboctahedron_getAlpha", _wrap_FormFactorCuboctahedron_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCuboctahedron_getAlpha", _wrap_FormFactorCuboctahedron_getAlpha, METH_O, "\n"
 		"FormFactorCuboctahedron_getAlpha(FormFactorCuboctahedron self) -> double\n"
-		"\n"
 		"double FormFactorCuboctahedron::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCuboctahedron", _wrap_delete_FormFactorCuboctahedron, METH_VARARGS, (char *)"delete_FormFactorCuboctahedron(FormFactorCuboctahedron self)"},
-	 { (char *)"FormFactorCuboctahedron_swigregister", FormFactorCuboctahedron_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorCylinder", _wrap_new_FormFactorCylinder, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorCuboctahedron", _wrap_delete_FormFactorCuboctahedron, METH_O, "delete_FormFactorCuboctahedron(FormFactorCuboctahedron self)"},
+	 { "FormFactorCuboctahedron_swigregister", FormFactorCuboctahedron_swigregister, METH_O, NULL},
+	 { "FormFactorCuboctahedron_swiginit", FormFactorCuboctahedron_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorCylinder", _wrap_new_FormFactorCylinder, METH_VARARGS, "\n"
 		"new_FormFactorCylinder(double radius, double height) -> FormFactorCylinder\n"
-		"\n"
 		"FormFactorCylinder::FormFactorCylinder(double radius, double height)\n"
 		"\n"
 		"Constructor of a cylinder with a circular base.\n"
@@ -130364,95 +127190,85 @@ static PyMethodDef SwigMethods[] = {
 		"height of the cylinder in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_clone", _wrap_FormFactorCylinder_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_clone", _wrap_FormFactorCylinder_clone, METH_O, "\n"
 		"FormFactorCylinder_clone(FormFactorCylinder self) -> FormFactorCylinder\n"
-		"\n"
 		"FormFactorCylinder* FormFactorCylinder::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_accept", _wrap_FormFactorCylinder_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_accept", _wrap_FormFactorCylinder_accept, METH_VARARGS, "\n"
 		"FormFactorCylinder_accept(FormFactorCylinder self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorCylinder::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_getHeight", _wrap_FormFactorCylinder_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_getHeight", _wrap_FormFactorCylinder_getHeight, METH_O, "\n"
 		"FormFactorCylinder_getHeight(FormFactorCylinder self) -> double\n"
-		"\n"
 		"double FormFactorCylinder::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_getRadius", _wrap_FormFactorCylinder_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_getRadius", _wrap_FormFactorCylinder_getRadius, METH_O, "\n"
 		"FormFactorCylinder_getRadius(FormFactorCylinder self) -> double\n"
-		"\n"
 		"double FormFactorCylinder::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_radialExtension", _wrap_FormFactorCylinder_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_radialExtension", _wrap_FormFactorCylinder_radialExtension, METH_O, "\n"
 		"FormFactorCylinder_radialExtension(FormFactorCylinder self) -> double\n"
-		"\n"
 		"double FormFactorCylinder::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorCylinder_evaluate_for_q", _wrap_FormFactorCylinder_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorCylinder_evaluate_for_q", _wrap_FormFactorCylinder_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorCylinder_evaluate_for_q(FormFactorCylinder self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorCylinder", _wrap_delete_FormFactorCylinder, METH_VARARGS, (char *)"delete_FormFactorCylinder(FormFactorCylinder self)"},
-	 { (char *)"FormFactorCylinder_swigregister", FormFactorCylinder_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorDebyeBueche", _wrap_new_FormFactorDebyeBueche, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorCylinder", _wrap_delete_FormFactorCylinder, METH_O, "delete_FormFactorCylinder(FormFactorCylinder self)"},
+	 { "FormFactorCylinder_swigregister", FormFactorCylinder_swigregister, METH_O, NULL},
+	 { "FormFactorCylinder_swiginit", FormFactorCylinder_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorDebyeBueche", _wrap_new_FormFactorDebyeBueche, METH_VARARGS, "\n"
 		"new_FormFactorDebyeBueche(double I0, double xi) -> FormFactorDebyeBueche\n"
-		"\n"
 		"FormFactorDebyeBueche::FormFactorDebyeBueche(double I0, double xi)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDebyeBueche_clone", _wrap_FormFactorDebyeBueche_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDebyeBueche_clone", _wrap_FormFactorDebyeBueche_clone, METH_O, "\n"
 		"FormFactorDebyeBueche_clone(FormFactorDebyeBueche self) -> FormFactorDebyeBueche\n"
-		"\n"
 		"FormFactorDebyeBueche* FormFactorDebyeBueche::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDebyeBueche_accept", _wrap_FormFactorDebyeBueche_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDebyeBueche_accept", _wrap_FormFactorDebyeBueche_accept, METH_VARARGS, "\n"
 		"FormFactorDebyeBueche_accept(FormFactorDebyeBueche self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorDebyeBueche::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDebyeBueche_radialExtension", _wrap_FormFactorDebyeBueche_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDebyeBueche_radialExtension", _wrap_FormFactorDebyeBueche_radialExtension, METH_O, "\n"
 		"FormFactorDebyeBueche_radialExtension(FormFactorDebyeBueche self) -> double\n"
-		"\n"
 		"double FormFactorDebyeBueche::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDebyeBueche_evaluate_for_q", _wrap_FormFactorDebyeBueche_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDebyeBueche_evaluate_for_q", _wrap_FormFactorDebyeBueche_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorDebyeBueche_evaluate_for_q(FormFactorDebyeBueche self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorDebyeBueche::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorDebyeBueche", _wrap_delete_FormFactorDebyeBueche, METH_VARARGS, (char *)"delete_FormFactorDebyeBueche(FormFactorDebyeBueche self)"},
-	 { (char *)"FormFactorDebyeBueche_swigregister", FormFactorDebyeBueche_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorDodecahedron", _wrap_new_FormFactorDodecahedron, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorDebyeBueche", _wrap_delete_FormFactorDebyeBueche, METH_O, "delete_FormFactorDebyeBueche(FormFactorDebyeBueche self)"},
+	 { "FormFactorDebyeBueche_swigregister", FormFactorDebyeBueche_swigregister, METH_O, NULL},
+	 { "FormFactorDebyeBueche_swiginit", FormFactorDebyeBueche_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorDodecahedron", _wrap_new_FormFactorDodecahedron, METH_O, "\n"
 		"new_FormFactorDodecahedron(double edge) -> FormFactorDodecahedron\n"
-		"\n"
 		"FormFactorDodecahedron::FormFactorDodecahedron(double edge)\n"
 		"\n"
 		"Constructs a regular dodecahedron.\n"
@@ -130472,73 +127288,66 @@ static PyMethodDef SwigMethods[] = {
 		"length of the edge in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDodecahedron_clone", _wrap_FormFactorDodecahedron_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDodecahedron_clone", _wrap_FormFactorDodecahedron_clone, METH_O, "\n"
 		"FormFactorDodecahedron_clone(FormFactorDodecahedron self) -> FormFactorDodecahedron\n"
-		"\n"
 		"FormFactorDodecahedron* FormFactorDodecahedron::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDodecahedron_accept", _wrap_FormFactorDodecahedron_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDodecahedron_accept", _wrap_FormFactorDodecahedron_accept, METH_VARARGS, "\n"
 		"FormFactorDodecahedron_accept(FormFactorDodecahedron self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorDodecahedron::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDodecahedron_getEdge", _wrap_FormFactorDodecahedron_getEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDodecahedron_getEdge", _wrap_FormFactorDodecahedron_getEdge, METH_O, "\n"
 		"FormFactorDodecahedron_getEdge(FormFactorDodecahedron self) -> double\n"
-		"\n"
 		"double FormFactorDodecahedron::getEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorDodecahedron", _wrap_delete_FormFactorDodecahedron, METH_VARARGS, (char *)"delete_FormFactorDodecahedron(FormFactorDodecahedron self)"},
-	 { (char *)"FormFactorDodecahedron_swigregister", FormFactorDodecahedron_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorDot", _wrap_new_FormFactorDot, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorDodecahedron", _wrap_delete_FormFactorDodecahedron, METH_O, "delete_FormFactorDodecahedron(FormFactorDodecahedron self)"},
+	 { "FormFactorDodecahedron_swigregister", FormFactorDodecahedron_swigregister, METH_O, NULL},
+	 { "FormFactorDodecahedron_swiginit", FormFactorDodecahedron_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorDot", _wrap_new_FormFactorDot, METH_NOARGS, "\n"
 		"new_FormFactorDot() -> FormFactorDot\n"
-		"\n"
 		"FormFactorDot::FormFactorDot()\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDot_clone", _wrap_FormFactorDot_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDot_clone", _wrap_FormFactorDot_clone, METH_O, "\n"
 		"FormFactorDot_clone(FormFactorDot self) -> FormFactorDot\n"
-		"\n"
 		"FormFactorDot* FormFactorDot::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDot_accept", _wrap_FormFactorDot_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDot_accept", _wrap_FormFactorDot_accept, METH_VARARGS, "\n"
 		"FormFactorDot_accept(FormFactorDot self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorDot::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDot_radialExtension", _wrap_FormFactorDot_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorDot_radialExtension", _wrap_FormFactorDot_radialExtension, METH_O, "\n"
 		"FormFactorDot_radialExtension(FormFactorDot self) -> double\n"
-		"\n"
 		"double FormFactorDot::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorDot_evaluate_for_q", _wrap_FormFactorDot_evaluate_for_q, METH_VARARGS, (char *)"\n"
-		"FormFactorDot_evaluate_for_q(FormFactorDot self, cvector_t arg3) -> complex_t\n"
-		"\n"
+	 { "FormFactorDot_evaluate_for_q", _wrap_FormFactorDot_evaluate_for_q, METH_VARARGS, "\n"
+		"FormFactorDot_evaluate_for_q(FormFactorDot self, cvector_t arg2) -> complex_t\n"
 		"complex_t FormFactorDot::evaluate_for_q(cvector_t) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorDot", _wrap_delete_FormFactorDot, METH_VARARGS, (char *)"delete_FormFactorDot(FormFactorDot self)"},
-	 { (char *)"FormFactorDot_swigregister", FormFactorDot_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorEllipsoidalCylinder", _wrap_new_FormFactorEllipsoidalCylinder, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorDot", _wrap_delete_FormFactorDot, METH_O, "delete_FormFactorDot(FormFactorDot self)"},
+	 { "FormFactorDot_swigregister", FormFactorDot_swigregister, METH_O, NULL},
+	 { "FormFactorDot_swiginit", FormFactorDot_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorEllipsoidalCylinder", _wrap_new_FormFactorEllipsoidalCylinder, METH_VARARGS, "\n"
 		"new_FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height) -> FormFactorEllipsoidalCylinder\n"
-		"\n"
 		"FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height)\n"
 		"\n"
 		"Constructor of a cylinder with an ellipse cross section.\n"
@@ -130556,62 +127365,54 @@ static PyMethodDef SwigMethods[] = {
 		"height of the ellipsoidal cylinder in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_clone", _wrap_FormFactorEllipsoidalCylinder_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_clone", _wrap_FormFactorEllipsoidalCylinder_clone, METH_O, "\n"
 		"FormFactorEllipsoidalCylinder_clone(FormFactorEllipsoidalCylinder self) -> FormFactorEllipsoidalCylinder\n"
-		"\n"
 		"FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_accept", _wrap_FormFactorEllipsoidalCylinder_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_accept", _wrap_FormFactorEllipsoidalCylinder_accept, METH_VARARGS, "\n"
 		"FormFactorEllipsoidalCylinder_accept(FormFactorEllipsoidalCylinder self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_getRadiusX", _wrap_FormFactorEllipsoidalCylinder_getRadiusX, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_getRadiusX", _wrap_FormFactorEllipsoidalCylinder_getRadiusX, METH_O, "\n"
 		"FormFactorEllipsoidalCylinder_getRadiusX(FormFactorEllipsoidalCylinder self) -> double\n"
-		"\n"
 		"double FormFactorEllipsoidalCylinder::getRadiusX() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_getRadiusY", _wrap_FormFactorEllipsoidalCylinder_getRadiusY, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_getRadiusY", _wrap_FormFactorEllipsoidalCylinder_getRadiusY, METH_O, "\n"
 		"FormFactorEllipsoidalCylinder_getRadiusY(FormFactorEllipsoidalCylinder self) -> double\n"
-		"\n"
 		"double FormFactorEllipsoidalCylinder::getRadiusY() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_getHeight", _wrap_FormFactorEllipsoidalCylinder_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_getHeight", _wrap_FormFactorEllipsoidalCylinder_getHeight, METH_O, "\n"
 		"FormFactorEllipsoidalCylinder_getHeight(FormFactorEllipsoidalCylinder self) -> double\n"
-		"\n"
 		"double FormFactorEllipsoidalCylinder::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_radialExtension", _wrap_FormFactorEllipsoidalCylinder_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_radialExtension", _wrap_FormFactorEllipsoidalCylinder_radialExtension, METH_O, "\n"
 		"FormFactorEllipsoidalCylinder_radialExtension(FormFactorEllipsoidalCylinder self) -> double\n"
-		"\n"
 		"double FormFactorEllipsoidalCylinder::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorEllipsoidalCylinder_evaluate_for_q", _wrap_FormFactorEllipsoidalCylinder_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorEllipsoidalCylinder_evaluate_for_q", _wrap_FormFactorEllipsoidalCylinder_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorEllipsoidalCylinder_evaluate_for_q(FormFactorEllipsoidalCylinder self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorEllipsoidalCylinder", _wrap_delete_FormFactorEllipsoidalCylinder, METH_VARARGS, (char *)"delete_FormFactorEllipsoidalCylinder(FormFactorEllipsoidalCylinder self)"},
-	 { (char *)"FormFactorEllipsoidalCylinder_swigregister", FormFactorEllipsoidalCylinder_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorFullSphere", _wrap_new_FormFactorFullSphere, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorEllipsoidalCylinder", _wrap_delete_FormFactorEllipsoidalCylinder, METH_O, "delete_FormFactorEllipsoidalCylinder(FormFactorEllipsoidalCylinder self)"},
+	 { "FormFactorEllipsoidalCylinder_swigregister", FormFactorEllipsoidalCylinder_swigregister, METH_O, NULL},
+	 { "FormFactorEllipsoidalCylinder_swiginit", FormFactorEllipsoidalCylinder_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorFullSphere", _wrap_new_FormFactorFullSphere, METH_VARARGS, "\n"
 		"FormFactorFullSphere(double radius, bool position_at_center=False)\n"
-		"new_FormFactorFullSphere(double radius) -> FormFactorFullSphere\n"
-		"\n"
 		"FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center=false)\n"
 		"\n"
 		"Constructor of a full sphere.\n"
@@ -130623,65 +127424,58 @@ static PyMethodDef SwigMethods[] = {
 		"radius of the sphere in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_clone", _wrap_FormFactorFullSphere_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_clone", _wrap_FormFactorFullSphere_clone, METH_O, "\n"
 		"FormFactorFullSphere_clone(FormFactorFullSphere self) -> FormFactorFullSphere\n"
-		"\n"
 		"FormFactorFullSphere* FormFactorFullSphere::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_accept", _wrap_FormFactorFullSphere_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_accept", _wrap_FormFactorFullSphere_accept, METH_VARARGS, "\n"
 		"FormFactorFullSphere_accept(FormFactorFullSphere self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorFullSphere::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_getRadius", _wrap_FormFactorFullSphere_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_getRadius", _wrap_FormFactorFullSphere_getRadius, METH_O, "\n"
 		"FormFactorFullSphere_getRadius(FormFactorFullSphere self) -> double\n"
-		"\n"
 		"double FormFactorFullSphere::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_radialExtension", _wrap_FormFactorFullSphere_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_radialExtension", _wrap_FormFactorFullSphere_radialExtension, METH_O, "\n"
 		"FormFactorFullSphere_radialExtension(FormFactorFullSphere self) -> double\n"
-		"\n"
 		"double FormFactorFullSphere::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_bottomZ", _wrap_FormFactorFullSphere_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_bottomZ", _wrap_FormFactorFullSphere_bottomZ, METH_VARARGS, "\n"
 		"FormFactorFullSphere_bottomZ(FormFactorFullSphere self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorFullSphere::bottomZ(const IRotation &rotation) const override final\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_topZ", _wrap_FormFactorFullSphere_topZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_topZ", _wrap_FormFactorFullSphere_topZ, METH_VARARGS, "\n"
 		"FormFactorFullSphere_topZ(FormFactorFullSphere self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorFullSphere::topZ(const IRotation &rotation) const override final\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSphere_evaluate_for_q", _wrap_FormFactorFullSphere_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSphere_evaluate_for_q", _wrap_FormFactorFullSphere_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorFullSphere_evaluate_for_q(FormFactorFullSphere self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorFullSphere", _wrap_delete_FormFactorFullSphere, METH_VARARGS, (char *)"delete_FormFactorFullSphere(FormFactorFullSphere self)"},
-	 { (char *)"FormFactorFullSphere_swigregister", FormFactorFullSphere_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorFullSpheroid", _wrap_new_FormFactorFullSpheroid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorFullSphere", _wrap_delete_FormFactorFullSphere, METH_O, "delete_FormFactorFullSphere(FormFactorFullSphere self)"},
+	 { "FormFactorFullSphere_swigregister", FormFactorFullSphere_swigregister, METH_O, NULL},
+	 { "FormFactorFullSphere_swiginit", FormFactorFullSphere_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorFullSpheroid", _wrap_new_FormFactorFullSpheroid, METH_VARARGS, "\n"
 		"new_FormFactorFullSpheroid(double radius, double height) -> FormFactorFullSpheroid\n"
-		"\n"
 		"FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)\n"
 		"\n"
 		"Constructor of full spheroid.\n"
@@ -130696,108 +127490,96 @@ static PyMethodDef SwigMethods[] = {
 		"height of the full spheroid in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_clone", _wrap_FormFactorFullSpheroid_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_clone", _wrap_FormFactorFullSpheroid_clone, METH_O, "\n"
 		"FormFactorFullSpheroid_clone(FormFactorFullSpheroid self) -> FormFactorFullSpheroid\n"
-		"\n"
 		"FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_accept", _wrap_FormFactorFullSpheroid_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_accept", _wrap_FormFactorFullSpheroid_accept, METH_VARARGS, "\n"
 		"FormFactorFullSpheroid_accept(FormFactorFullSpheroid self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_getHeight", _wrap_FormFactorFullSpheroid_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_getHeight", _wrap_FormFactorFullSpheroid_getHeight, METH_O, "\n"
 		"FormFactorFullSpheroid_getHeight(FormFactorFullSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorFullSpheroid::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_getRadius", _wrap_FormFactorFullSpheroid_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_getRadius", _wrap_FormFactorFullSpheroid_getRadius, METH_O, "\n"
 		"FormFactorFullSpheroid_getRadius(FormFactorFullSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorFullSpheroid::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_radialExtension", _wrap_FormFactorFullSpheroid_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_radialExtension", _wrap_FormFactorFullSpheroid_radialExtension, METH_O, "\n"
 		"FormFactorFullSpheroid_radialExtension(FormFactorFullSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorFullSpheroid::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorFullSpheroid_evaluate_for_q", _wrap_FormFactorFullSpheroid_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorFullSpheroid_evaluate_for_q", _wrap_FormFactorFullSpheroid_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorFullSpheroid_evaluate_for_q(FormFactorFullSpheroid self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorFullSpheroid", _wrap_delete_FormFactorFullSpheroid, METH_VARARGS, (char *)"delete_FormFactorFullSpheroid(FormFactorFullSpheroid self)"},
-	 { (char *)"FormFactorFullSpheroid_swigregister", FormFactorFullSpheroid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorGauss", _wrap_new_FormFactorGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorFullSpheroid", _wrap_delete_FormFactorFullSpheroid, METH_O, "delete_FormFactorFullSpheroid(FormFactorFullSpheroid self)"},
+	 { "FormFactorFullSpheroid_swigregister", FormFactorFullSpheroid_swigregister, METH_O, NULL},
+	 { "FormFactorFullSpheroid_swiginit", FormFactorFullSpheroid_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorGauss", _wrap_new_FormFactorGauss, METH_VARARGS, "\n"
 		"FormFactorGauss(double length)\n"
 		"new_FormFactorGauss(double width, double height) -> FormFactorGauss\n"
-		"\n"
 		"FormFactorGauss::FormFactorGauss(double width, double height)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_clone", _wrap_FormFactorGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_clone", _wrap_FormFactorGauss_clone, METH_O, "\n"
 		"FormFactorGauss_clone(FormFactorGauss self) -> FormFactorGauss\n"
-		"\n"
 		"FormFactorGauss* FormFactorGauss::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_accept", _wrap_FormFactorGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_accept", _wrap_FormFactorGauss_accept, METH_VARARGS, "\n"
 		"FormFactorGauss_accept(FormFactorGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorGauss::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_getWidth", _wrap_FormFactorGauss_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_getWidth", _wrap_FormFactorGauss_getWidth, METH_O, "\n"
 		"FormFactorGauss_getWidth(FormFactorGauss self) -> double\n"
-		"\n"
 		"double FormFactorGauss::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_getHeight", _wrap_FormFactorGauss_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_getHeight", _wrap_FormFactorGauss_getHeight, METH_O, "\n"
 		"FormFactorGauss_getHeight(FormFactorGauss self) -> double\n"
-		"\n"
 		"double FormFactorGauss::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_radialExtension", _wrap_FormFactorGauss_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_radialExtension", _wrap_FormFactorGauss_radialExtension, METH_O, "\n"
 		"FormFactorGauss_radialExtension(FormFactorGauss self) -> double\n"
-		"\n"
 		"double FormFactorGauss::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorGauss_evaluate_for_q", _wrap_FormFactorGauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorGauss_evaluate_for_q", _wrap_FormFactorGauss_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorGauss_evaluate_for_q(FormFactorGauss self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorGauss", _wrap_delete_FormFactorGauss, METH_VARARGS, (char *)"delete_FormFactorGauss(FormFactorGauss self)"},
-	 { (char *)"FormFactorGauss_swigregister", FormFactorGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorHemiEllipsoid", _wrap_new_FormFactorHemiEllipsoid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorGauss", _wrap_delete_FormFactorGauss, METH_O, "delete_FormFactorGauss(FormFactorGauss self)"},
+	 { "FormFactorGauss_swigregister", FormFactorGauss_swigregister, METH_O, NULL},
+	 { "FormFactorGauss_swiginit", FormFactorGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorHemiEllipsoid", _wrap_new_FormFactorHemiEllipsoid, METH_VARARGS, "\n"
 		"new_FormFactorHemiEllipsoid(double radius_x, double radius_y, double height) -> FormFactorHemiEllipsoid\n"
-		"\n"
 		"FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)\n"
 		"\n"
 		"Constructor of horizontally oriented ellipsoid, truncated at the central plane.\n"
@@ -130815,66 +127597,58 @@ static PyMethodDef SwigMethods[] = {
 		"height of the hemi ellipsoid in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorHemiEllipsoid", _wrap_delete_FormFactorHemiEllipsoid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorHemiEllipsoid", _wrap_delete_FormFactorHemiEllipsoid, METH_O, "\n"
 		"delete_FormFactorHemiEllipsoid(FormFactorHemiEllipsoid self)\n"
-		"\n"
 		"virtual FormFactorHemiEllipsoid::~FormFactorHemiEllipsoid()\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_clone", _wrap_FormFactorHemiEllipsoid_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_clone", _wrap_FormFactorHemiEllipsoid_clone, METH_O, "\n"
 		"FormFactorHemiEllipsoid_clone(FormFactorHemiEllipsoid self) -> FormFactorHemiEllipsoid\n"
-		"\n"
 		"FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_accept", _wrap_FormFactorHemiEllipsoid_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_accept", _wrap_FormFactorHemiEllipsoid_accept, METH_VARARGS, "\n"
 		"FormFactorHemiEllipsoid_accept(FormFactorHemiEllipsoid self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_getHeight", _wrap_FormFactorHemiEllipsoid_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_getHeight", _wrap_FormFactorHemiEllipsoid_getHeight, METH_O, "\n"
 		"FormFactorHemiEllipsoid_getHeight(FormFactorHemiEllipsoid self) -> double\n"
-		"\n"
 		"double FormFactorHemiEllipsoid::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_getRadiusX", _wrap_FormFactorHemiEllipsoid_getRadiusX, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_getRadiusX", _wrap_FormFactorHemiEllipsoid_getRadiusX, METH_O, "\n"
 		"FormFactorHemiEllipsoid_getRadiusX(FormFactorHemiEllipsoid self) -> double\n"
-		"\n"
 		"double FormFactorHemiEllipsoid::getRadiusX() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_getRadiusY", _wrap_FormFactorHemiEllipsoid_getRadiusY, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_getRadiusY", _wrap_FormFactorHemiEllipsoid_getRadiusY, METH_O, "\n"
 		"FormFactorHemiEllipsoid_getRadiusY(FormFactorHemiEllipsoid self) -> double\n"
-		"\n"
 		"double FormFactorHemiEllipsoid::getRadiusY() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_radialExtension", _wrap_FormFactorHemiEllipsoid_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_radialExtension", _wrap_FormFactorHemiEllipsoid_radialExtension, METH_O, "\n"
 		"FormFactorHemiEllipsoid_radialExtension(FormFactorHemiEllipsoid self) -> double\n"
-		"\n"
 		"double FormFactorHemiEllipsoid::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_evaluate_for_q", _wrap_FormFactorHemiEllipsoid_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_evaluate_for_q", _wrap_FormFactorHemiEllipsoid_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorHemiEllipsoid_evaluate_for_q(FormFactorHemiEllipsoid self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorHemiEllipsoid_swigregister", FormFactorHemiEllipsoid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorIcosahedron", _wrap_new_FormFactorIcosahedron, METH_VARARGS, (char *)"\n"
+	 { "FormFactorHemiEllipsoid_swigregister", FormFactorHemiEllipsoid_swigregister, METH_O, NULL},
+	 { "FormFactorHemiEllipsoid_swiginit", FormFactorHemiEllipsoid_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorIcosahedron", _wrap_new_FormFactorIcosahedron, METH_O, "\n"
 		"new_FormFactorIcosahedron(double edge) -> FormFactorIcosahedron\n"
-		"\n"
 		"FormFactorIcosahedron::FormFactorIcosahedron(double edge)\n"
 		"\n"
 		"Constructor of a icosahedron.\n"
@@ -130886,33 +127660,30 @@ static PyMethodDef SwigMethods[] = {
 		"length of the edge in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorIcosahedron_clone", _wrap_FormFactorIcosahedron_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorIcosahedron_clone", _wrap_FormFactorIcosahedron_clone, METH_O, "\n"
 		"FormFactorIcosahedron_clone(FormFactorIcosahedron self) -> FormFactorIcosahedron\n"
-		"\n"
 		"FormFactorIcosahedron* FormFactorIcosahedron::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorIcosahedron_accept", _wrap_FormFactorIcosahedron_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorIcosahedron_accept", _wrap_FormFactorIcosahedron_accept, METH_VARARGS, "\n"
 		"FormFactorIcosahedron_accept(FormFactorIcosahedron self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorIcosahedron::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorIcosahedron_getEdge", _wrap_FormFactorIcosahedron_getEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorIcosahedron_getEdge", _wrap_FormFactorIcosahedron_getEdge, METH_O, "\n"
 		"FormFactorIcosahedron_getEdge(FormFactorIcosahedron self) -> double\n"
-		"\n"
 		"double FormFactorIcosahedron::getEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorIcosahedron", _wrap_delete_FormFactorIcosahedron, METH_VARARGS, (char *)"delete_FormFactorIcosahedron(FormFactorIcosahedron self)"},
-	 { (char *)"FormFactorIcosahedron_swigregister", FormFactorIcosahedron_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongBox", _wrap_new_FormFactorLongBox, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorIcosahedron", _wrap_delete_FormFactorIcosahedron, METH_O, "delete_FormFactorIcosahedron(FormFactorIcosahedron self)"},
+	 { "FormFactorIcosahedron_swigregister", FormFactorIcosahedron_swigregister, METH_O, NULL},
+	 { "FormFactorIcosahedron_swiginit", FormFactorIcosahedron_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongBox", _wrap_new_FormFactorLongBox, METH_VARARGS, "\n"
 		"new_FormFactorLongBox(double length, double width, double height) -> FormFactorLongBox\n"
-		"\n"
 		"FormFactorLongBox::FormFactorLongBox(double length, double width, double height)\n"
 		"\n"
 		"Box constructor.\n"
@@ -130930,61 +127701,54 @@ static PyMethodDef SwigMethods[] = {
 		"of  Box\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_clone", _wrap_FormFactorLongBox_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_clone", _wrap_FormFactorLongBox_clone, METH_O, "\n"
 		"FormFactorLongBox_clone(FormFactorLongBox self) -> FormFactorLongBox\n"
-		"\n"
 		"FormFactorLongBox* FormFactorLongBox::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_accept", _wrap_FormFactorLongBox_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_accept", _wrap_FormFactorLongBox_accept, METH_VARARGS, "\n"
 		"FormFactorLongBox_accept(FormFactorLongBox self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongBox::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_getLength", _wrap_FormFactorLongBox_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_getLength", _wrap_FormFactorLongBox_getLength, METH_O, "\n"
 		"FormFactorLongBox_getLength(FormFactorLongBox self) -> double\n"
-		"\n"
 		"double FormFactorLongBox::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_getHeight", _wrap_FormFactorLongBox_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_getHeight", _wrap_FormFactorLongBox_getHeight, METH_O, "\n"
 		"FormFactorLongBox_getHeight(FormFactorLongBox self) -> double\n"
-		"\n"
 		"double FormFactorLongBox::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_getWidth", _wrap_FormFactorLongBox_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_getWidth", _wrap_FormFactorLongBox_getWidth, METH_O, "\n"
 		"FormFactorLongBox_getWidth(FormFactorLongBox self) -> double\n"
-		"\n"
 		"double FormFactorLongBox::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_radialExtension", _wrap_FormFactorLongBox_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_radialExtension", _wrap_FormFactorLongBox_radialExtension, METH_O, "\n"
 		"FormFactorLongBox_radialExtension(FormFactorLongBox self) -> double\n"
-		"\n"
 		"double FormFactorLongBox::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBox_evaluate_for_q", _wrap_FormFactorLongBox_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBox_evaluate_for_q", _wrap_FormFactorLongBox_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongBox_evaluate_for_q(FormFactorLongBox self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongBox::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongBox", _wrap_delete_FormFactorLongBox, METH_VARARGS, (char *)"delete_FormFactorLongBox(FormFactorLongBox self)"},
-	 { (char *)"FormFactorLongBox_swigregister", FormFactorLongBox_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongBoxGauss", _wrap_new_FormFactorLongBoxGauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongBox", _wrap_delete_FormFactorLongBox, METH_O, "delete_FormFactorLongBox(FormFactorLongBox self)"},
+	 { "FormFactorLongBox_swigregister", FormFactorLongBox_swigregister, METH_O, NULL},
+	 { "FormFactorLongBox_swiginit", FormFactorLongBox_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongBoxGauss", _wrap_new_FormFactorLongBoxGauss, METH_VARARGS, "\n"
 		"new_FormFactorLongBoxGauss(double length, double width, double height) -> FormFactorLongBoxGauss\n"
-		"\n"
 		"FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)\n"
 		"\n"
 		"Box constructor.\n"
@@ -131002,61 +127766,54 @@ static PyMethodDef SwigMethods[] = {
 		"of  Box\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_clone", _wrap_FormFactorLongBoxGauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_clone", _wrap_FormFactorLongBoxGauss_clone, METH_O, "\n"
 		"FormFactorLongBoxGauss_clone(FormFactorLongBoxGauss self) -> FormFactorLongBoxGauss\n"
-		"\n"
 		"FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_accept", _wrap_FormFactorLongBoxGauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_accept", _wrap_FormFactorLongBoxGauss_accept, METH_VARARGS, "\n"
 		"FormFactorLongBoxGauss_accept(FormFactorLongBoxGauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_getLength", _wrap_FormFactorLongBoxGauss_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_getLength", _wrap_FormFactorLongBoxGauss_getLength, METH_O, "\n"
 		"FormFactorLongBoxGauss_getLength(FormFactorLongBoxGauss self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxGauss::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_getHeight", _wrap_FormFactorLongBoxGauss_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_getHeight", _wrap_FormFactorLongBoxGauss_getHeight, METH_O, "\n"
 		"FormFactorLongBoxGauss_getHeight(FormFactorLongBoxGauss self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxGauss::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_getWidth", _wrap_FormFactorLongBoxGauss_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_getWidth", _wrap_FormFactorLongBoxGauss_getWidth, METH_O, "\n"
 		"FormFactorLongBoxGauss_getWidth(FormFactorLongBoxGauss self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxGauss::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_radialExtension", _wrap_FormFactorLongBoxGauss_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_radialExtension", _wrap_FormFactorLongBoxGauss_radialExtension, METH_O, "\n"
 		"FormFactorLongBoxGauss_radialExtension(FormFactorLongBoxGauss self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxGauss::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxGauss_evaluate_for_q", _wrap_FormFactorLongBoxGauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxGauss_evaluate_for_q", _wrap_FormFactorLongBoxGauss_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongBoxGauss_evaluate_for_q(FormFactorLongBoxGauss self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongBoxGauss", _wrap_delete_FormFactorLongBoxGauss, METH_VARARGS, (char *)"delete_FormFactorLongBoxGauss(FormFactorLongBoxGauss self)"},
-	 { (char *)"FormFactorLongBoxGauss_swigregister", FormFactorLongBoxGauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongBoxLorentz", _wrap_new_FormFactorLongBoxLorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongBoxGauss", _wrap_delete_FormFactorLongBoxGauss, METH_O, "delete_FormFactorLongBoxGauss(FormFactorLongBoxGauss self)"},
+	 { "FormFactorLongBoxGauss_swigregister", FormFactorLongBoxGauss_swigregister, METH_O, NULL},
+	 { "FormFactorLongBoxGauss_swiginit", FormFactorLongBoxGauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongBoxLorentz", _wrap_new_FormFactorLongBoxLorentz, METH_VARARGS, "\n"
 		"new_FormFactorLongBoxLorentz(double length, double width, double height) -> FormFactorLongBoxLorentz\n"
-		"\n"
 		"FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)\n"
 		"\n"
 		"Box constructor.\n"
@@ -131074,61 +127831,54 @@ static PyMethodDef SwigMethods[] = {
 		"of  Box\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_clone", _wrap_FormFactorLongBoxLorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_clone", _wrap_FormFactorLongBoxLorentz_clone, METH_O, "\n"
 		"FormFactorLongBoxLorentz_clone(FormFactorLongBoxLorentz self) -> FormFactorLongBoxLorentz\n"
-		"\n"
 		"FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_accept", _wrap_FormFactorLongBoxLorentz_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_accept", _wrap_FormFactorLongBoxLorentz_accept, METH_VARARGS, "\n"
 		"FormFactorLongBoxLorentz_accept(FormFactorLongBoxLorentz self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_getLength", _wrap_FormFactorLongBoxLorentz_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_getLength", _wrap_FormFactorLongBoxLorentz_getLength, METH_O, "\n"
 		"FormFactorLongBoxLorentz_getLength(FormFactorLongBoxLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxLorentz::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_getHeight", _wrap_FormFactorLongBoxLorentz_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_getHeight", _wrap_FormFactorLongBoxLorentz_getHeight, METH_O, "\n"
 		"FormFactorLongBoxLorentz_getHeight(FormFactorLongBoxLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxLorentz::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_getWidth", _wrap_FormFactorLongBoxLorentz_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_getWidth", _wrap_FormFactorLongBoxLorentz_getWidth, METH_O, "\n"
 		"FormFactorLongBoxLorentz_getWidth(FormFactorLongBoxLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxLorentz::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_radialExtension", _wrap_FormFactorLongBoxLorentz_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_radialExtension", _wrap_FormFactorLongBoxLorentz_radialExtension, METH_O, "\n"
 		"FormFactorLongBoxLorentz_radialExtension(FormFactorLongBoxLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongBoxLorentz::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongBoxLorentz_evaluate_for_q", _wrap_FormFactorLongBoxLorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongBoxLorentz_evaluate_for_q", _wrap_FormFactorLongBoxLorentz_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongBoxLorentz_evaluate_for_q(FormFactorLongBoxLorentz self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongBoxLorentz", _wrap_delete_FormFactorLongBoxLorentz, METH_VARARGS, (char *)"delete_FormFactorLongBoxLorentz(FormFactorLongBoxLorentz self)"},
-	 { (char *)"FormFactorLongBoxLorentz_swigregister", FormFactorLongBoxLorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongRipple1Gauss", _wrap_new_FormFactorLongRipple1Gauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongBoxLorentz", _wrap_delete_FormFactorLongBoxLorentz, METH_O, "delete_FormFactorLongBoxLorentz(FormFactorLongBoxLorentz self)"},
+	 { "FormFactorLongBoxLorentz_swigregister", FormFactorLongBoxLorentz_swigregister, METH_O, NULL},
+	 { "FormFactorLongBoxLorentz_swiginit", FormFactorLongBoxLorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongRipple1Gauss", _wrap_new_FormFactorLongRipple1Gauss, METH_VARARGS, "\n"
 		"new_FormFactorLongRipple1Gauss(double length, double width, double height) -> FormFactorLongRipple1Gauss\n"
-		"\n"
 		"FormFactorLongRipple1Gauss::FormFactorLongRipple1Gauss(double length, double width, double height)\n"
 		"\n"
 		"Ripple1 constructor.\n"
@@ -131146,61 +127896,54 @@ static PyMethodDef SwigMethods[] = {
 		"of cosine cross section \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_clone", _wrap_FormFactorLongRipple1Gauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_clone", _wrap_FormFactorLongRipple1Gauss_clone, METH_O, "\n"
 		"FormFactorLongRipple1Gauss_clone(FormFactorLongRipple1Gauss self) -> FormFactorLongRipple1Gauss\n"
-		"\n"
 		"FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_accept", _wrap_FormFactorLongRipple1Gauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_accept", _wrap_FormFactorLongRipple1Gauss_accept, METH_VARARGS, "\n"
 		"FormFactorLongRipple1Gauss_accept(FormFactorLongRipple1Gauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_getHeight", _wrap_FormFactorLongRipple1Gauss_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_getHeight", _wrap_FormFactorLongRipple1Gauss_getHeight, METH_O, "\n"
 		"FormFactorLongRipple1Gauss_getHeight(FormFactorLongRipple1Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Gauss::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_getWidth", _wrap_FormFactorLongRipple1Gauss_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_getWidth", _wrap_FormFactorLongRipple1Gauss_getWidth, METH_O, "\n"
 		"FormFactorLongRipple1Gauss_getWidth(FormFactorLongRipple1Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Gauss::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_getLength", _wrap_FormFactorLongRipple1Gauss_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_getLength", _wrap_FormFactorLongRipple1Gauss_getLength, METH_O, "\n"
 		"FormFactorLongRipple1Gauss_getLength(FormFactorLongRipple1Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Gauss::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_radialExtension", _wrap_FormFactorLongRipple1Gauss_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_radialExtension", _wrap_FormFactorLongRipple1Gauss_radialExtension, METH_O, "\n"
 		"FormFactorLongRipple1Gauss_radialExtension(FormFactorLongRipple1Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Gauss::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Gauss_evaluate_for_q", _wrap_FormFactorLongRipple1Gauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Gauss_evaluate_for_q", _wrap_FormFactorLongRipple1Gauss_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongRipple1Gauss_evaluate_for_q(FormFactorLongRipple1Gauss self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple1Gauss", _wrap_delete_FormFactorLongRipple1Gauss, METH_VARARGS, (char *)"delete_FormFactorLongRipple1Gauss(FormFactorLongRipple1Gauss self)"},
-	 { (char *)"FormFactorLongRipple1Gauss_swigregister", FormFactorLongRipple1Gauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongRipple1Lorentz", _wrap_new_FormFactorLongRipple1Lorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongRipple1Gauss", _wrap_delete_FormFactorLongRipple1Gauss, METH_O, "delete_FormFactorLongRipple1Gauss(FormFactorLongRipple1Gauss self)"},
+	 { "FormFactorLongRipple1Gauss_swigregister", FormFactorLongRipple1Gauss_swigregister, METH_O, NULL},
+	 { "FormFactorLongRipple1Gauss_swiginit", FormFactorLongRipple1Gauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongRipple1Lorentz", _wrap_new_FormFactorLongRipple1Lorentz, METH_VARARGS, "\n"
 		"new_FormFactorLongRipple1Lorentz(double length, double width, double height) -> FormFactorLongRipple1Lorentz\n"
-		"\n"
 		"FormFactorLongRipple1Lorentz::FormFactorLongRipple1Lorentz(double length, double width, double height)\n"
 		"\n"
 		"FormFactorLongRipple1Lorentz constructor.\n"
@@ -131218,61 +127961,54 @@ static PyMethodDef SwigMethods[] = {
 		"of cosine cross section \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_clone", _wrap_FormFactorLongRipple1Lorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_clone", _wrap_FormFactorLongRipple1Lorentz_clone, METH_O, "\n"
 		"FormFactorLongRipple1Lorentz_clone(FormFactorLongRipple1Lorentz self) -> FormFactorLongRipple1Lorentz\n"
-		"\n"
 		"FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_accept", _wrap_FormFactorLongRipple1Lorentz_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_accept", _wrap_FormFactorLongRipple1Lorentz_accept, METH_VARARGS, "\n"
 		"FormFactorLongRipple1Lorentz_accept(FormFactorLongRipple1Lorentz self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_radialExtension", _wrap_FormFactorLongRipple1Lorentz_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_radialExtension", _wrap_FormFactorLongRipple1Lorentz_radialExtension, METH_O, "\n"
 		"FormFactorLongRipple1Lorentz_radialExtension(FormFactorLongRipple1Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Lorentz::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_getHeight", _wrap_FormFactorLongRipple1Lorentz_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_getHeight", _wrap_FormFactorLongRipple1Lorentz_getHeight, METH_O, "\n"
 		"FormFactorLongRipple1Lorentz_getHeight(FormFactorLongRipple1Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Lorentz::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_getWidth", _wrap_FormFactorLongRipple1Lorentz_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_getWidth", _wrap_FormFactorLongRipple1Lorentz_getWidth, METH_O, "\n"
 		"FormFactorLongRipple1Lorentz_getWidth(FormFactorLongRipple1Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Lorentz::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_getLength", _wrap_FormFactorLongRipple1Lorentz_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_getLength", _wrap_FormFactorLongRipple1Lorentz_getLength, METH_O, "\n"
 		"FormFactorLongRipple1Lorentz_getLength(FormFactorLongRipple1Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple1Lorentz::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple1Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple1Lorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple1Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple1Lorentz_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongRipple1Lorentz_evaluate_for_q(FormFactorLongRipple1Lorentz self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple1Lorentz", _wrap_delete_FormFactorLongRipple1Lorentz, METH_VARARGS, (char *)"delete_FormFactorLongRipple1Lorentz(FormFactorLongRipple1Lorentz self)"},
-	 { (char *)"FormFactorLongRipple1Lorentz_swigregister", FormFactorLongRipple1Lorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongRipple2Gauss", _wrap_new_FormFactorLongRipple2Gauss, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongRipple1Lorentz", _wrap_delete_FormFactorLongRipple1Lorentz, METH_O, "delete_FormFactorLongRipple1Lorentz(FormFactorLongRipple1Lorentz self)"},
+	 { "FormFactorLongRipple1Lorentz_swigregister", FormFactorLongRipple1Lorentz_swigregister, METH_O, NULL},
+	 { "FormFactorLongRipple1Lorentz_swiginit", FormFactorLongRipple1Lorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongRipple2Gauss", _wrap_new_FormFactorLongRipple2Gauss, METH_VARARGS, "\n"
 		"new_FormFactorLongRipple2Gauss(double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Gauss\n"
-		"\n"
 		"FormFactorLongRipple2Gauss::FormFactorLongRipple2Gauss(double length, double width, double height, double asymmetry)\n"
 		"\n"
 		"FormFactorLongRipple2Gauss constructor.\n"
@@ -131293,67 +128029,59 @@ static PyMethodDef SwigMethods[] = {
 		"length of triangular cross section \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_clone", _wrap_FormFactorLongRipple2Gauss_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_clone", _wrap_FormFactorLongRipple2Gauss_clone, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_clone(FormFactorLongRipple2Gauss self) -> FormFactorLongRipple2Gauss\n"
-		"\n"
 		"FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_accept", _wrap_FormFactorLongRipple2Gauss_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_accept", _wrap_FormFactorLongRipple2Gauss_accept, METH_VARARGS, "\n"
 		"FormFactorLongRipple2Gauss_accept(FormFactorLongRipple2Gauss self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_getHeight", _wrap_FormFactorLongRipple2Gauss_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_getHeight", _wrap_FormFactorLongRipple2Gauss_getHeight, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_getHeight(FormFactorLongRipple2Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Gauss::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_getWidth", _wrap_FormFactorLongRipple2Gauss_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_getWidth", _wrap_FormFactorLongRipple2Gauss_getWidth, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_getWidth(FormFactorLongRipple2Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Gauss::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_getLength", _wrap_FormFactorLongRipple2Gauss_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_getLength", _wrap_FormFactorLongRipple2Gauss_getLength, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_getLength(FormFactorLongRipple2Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Gauss::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_getAsymmetry", _wrap_FormFactorLongRipple2Gauss_getAsymmetry, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_getAsymmetry", _wrap_FormFactorLongRipple2Gauss_getAsymmetry, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_getAsymmetry(FormFactorLongRipple2Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Gauss::getAsymmetry() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_radialExtension", _wrap_FormFactorLongRipple2Gauss_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_radialExtension", _wrap_FormFactorLongRipple2Gauss_radialExtension, METH_O, "\n"
 		"FormFactorLongRipple2Gauss_radialExtension(FormFactorLongRipple2Gauss self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Gauss::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Gauss_evaluate_for_q", _wrap_FormFactorLongRipple2Gauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Gauss_evaluate_for_q", _wrap_FormFactorLongRipple2Gauss_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongRipple2Gauss_evaluate_for_q(FormFactorLongRipple2Gauss self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple2Gauss", _wrap_delete_FormFactorLongRipple2Gauss, METH_VARARGS, (char *)"delete_FormFactorLongRipple2Gauss(FormFactorLongRipple2Gauss self)"},
-	 { (char *)"FormFactorLongRipple2Gauss_swigregister", FormFactorLongRipple2Gauss_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLongRipple2Lorentz", _wrap_new_FormFactorLongRipple2Lorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongRipple2Gauss", _wrap_delete_FormFactorLongRipple2Gauss, METH_O, "delete_FormFactorLongRipple2Gauss(FormFactorLongRipple2Gauss self)"},
+	 { "FormFactorLongRipple2Gauss_swigregister", FormFactorLongRipple2Gauss_swigregister, METH_O, NULL},
+	 { "FormFactorLongRipple2Gauss_swiginit", FormFactorLongRipple2Gauss_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLongRipple2Lorentz", _wrap_new_FormFactorLongRipple2Lorentz, METH_VARARGS, "\n"
 		"new_FormFactorLongRipple2Lorentz(double length, double width, double height, double asymmetry) -> FormFactorLongRipple2Lorentz\n"
-		"\n"
 		"FormFactorLongRipple2Lorentz::FormFactorLongRipple2Lorentz(double length, double width, double height, double asymmetry)\n"
 		"\n"
 		"Parameters:\n"
@@ -131372,160 +128100,142 @@ static PyMethodDef SwigMethods[] = {
 		"length of triangular cross section \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_clone", _wrap_FormFactorLongRipple2Lorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_clone", _wrap_FormFactorLongRipple2Lorentz_clone, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_clone(FormFactorLongRipple2Lorentz self) -> FormFactorLongRipple2Lorentz\n"
-		"\n"
 		"FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_accept", _wrap_FormFactorLongRipple2Lorentz_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_accept", _wrap_FormFactorLongRipple2Lorentz_accept, METH_VARARGS, "\n"
 		"FormFactorLongRipple2Lorentz_accept(FormFactorLongRipple2Lorentz self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_getHeight", _wrap_FormFactorLongRipple2Lorentz_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_getHeight", _wrap_FormFactorLongRipple2Lorentz_getHeight, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_getHeight(FormFactorLongRipple2Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Lorentz::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_getWidth", _wrap_FormFactorLongRipple2Lorentz_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_getWidth", _wrap_FormFactorLongRipple2Lorentz_getWidth, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_getWidth(FormFactorLongRipple2Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Lorentz::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_getLength", _wrap_FormFactorLongRipple2Lorentz_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_getLength", _wrap_FormFactorLongRipple2Lorentz_getLength, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_getLength(FormFactorLongRipple2Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Lorentz::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_getAsymmetry", _wrap_FormFactorLongRipple2Lorentz_getAsymmetry, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_getAsymmetry", _wrap_FormFactorLongRipple2Lorentz_getAsymmetry, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_getAsymmetry(FormFactorLongRipple2Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Lorentz::getAsymmetry() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_radialExtension", _wrap_FormFactorLongRipple2Lorentz_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_radialExtension", _wrap_FormFactorLongRipple2Lorentz_radialExtension, METH_O, "\n"
 		"FormFactorLongRipple2Lorentz_radialExtension(FormFactorLongRipple2Lorentz self) -> double\n"
-		"\n"
 		"double FormFactorLongRipple2Lorentz::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLongRipple2Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple2Lorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLongRipple2Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple2Lorentz_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLongRipple2Lorentz_evaluate_for_q(FormFactorLongRipple2Lorentz self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLongRipple2Lorentz", _wrap_delete_FormFactorLongRipple2Lorentz, METH_VARARGS, (char *)"delete_FormFactorLongRipple2Lorentz(FormFactorLongRipple2Lorentz self)"},
-	 { (char *)"FormFactorLongRipple2Lorentz_swigregister", FormFactorLongRipple2Lorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorLorentz", _wrap_new_FormFactorLorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLongRipple2Lorentz", _wrap_delete_FormFactorLongRipple2Lorentz, METH_O, "delete_FormFactorLongRipple2Lorentz(FormFactorLongRipple2Lorentz self)"},
+	 { "FormFactorLongRipple2Lorentz_swigregister", FormFactorLongRipple2Lorentz_swigregister, METH_O, NULL},
+	 { "FormFactorLongRipple2Lorentz_swiginit", FormFactorLongRipple2Lorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorLorentz", _wrap_new_FormFactorLorentz, METH_VARARGS, "\n"
 		"FormFactorLorentz(double length)\n"
 		"new_FormFactorLorentz(double width, double height) -> FormFactorLorentz\n"
-		"\n"
 		"FormFactorLorentz::FormFactorLorentz(double width, double height)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_clone", _wrap_FormFactorLorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_clone", _wrap_FormFactorLorentz_clone, METH_O, "\n"
 		"FormFactorLorentz_clone(FormFactorLorentz self) -> FormFactorLorentz\n"
-		"\n"
 		"FormFactorLorentz* FormFactorLorentz::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_accept", _wrap_FormFactorLorentz_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_accept", _wrap_FormFactorLorentz_accept, METH_VARARGS, "\n"
 		"FormFactorLorentz_accept(FormFactorLorentz self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorLorentz::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_getWidth", _wrap_FormFactorLorentz_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_getWidth", _wrap_FormFactorLorentz_getWidth, METH_O, "\n"
 		"FormFactorLorentz_getWidth(FormFactorLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLorentz::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_getHeight", _wrap_FormFactorLorentz_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_getHeight", _wrap_FormFactorLorentz_getHeight, METH_O, "\n"
 		"FormFactorLorentz_getHeight(FormFactorLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLorentz::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_radialExtension", _wrap_FormFactorLorentz_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_radialExtension", _wrap_FormFactorLorentz_radialExtension, METH_O, "\n"
 		"FormFactorLorentz_radialExtension(FormFactorLorentz self) -> double\n"
-		"\n"
 		"double FormFactorLorentz::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorLorentz_evaluate_for_q", _wrap_FormFactorLorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorLorentz_evaluate_for_q", _wrap_FormFactorLorentz_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorLorentz_evaluate_for_q(FormFactorLorentz self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorLorentz", _wrap_delete_FormFactorLorentz, METH_VARARGS, (char *)"delete_FormFactorLorentz(FormFactorLorentz self)"},
-	 { (char *)"FormFactorLorentz_swigregister", FormFactorLorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorOrnsteinZernike", _wrap_new_FormFactorOrnsteinZernike, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorLorentz", _wrap_delete_FormFactorLorentz, METH_O, "delete_FormFactorLorentz(FormFactorLorentz self)"},
+	 { "FormFactorLorentz_swigregister", FormFactorLorentz_swigregister, METH_O, NULL},
+	 { "FormFactorLorentz_swiginit", FormFactorLorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorOrnsteinZernike", _wrap_new_FormFactorOrnsteinZernike, METH_VARARGS, "\n"
 		"new_FormFactorOrnsteinZernike(double I0, double xi_xy, double xi_z) -> FormFactorOrnsteinZernike\n"
-		"\n"
 		"FormFactorOrnsteinZernike::FormFactorOrnsteinZernike(double I0, double xi_xy, double xi_z)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorOrnsteinZernike_clone", _wrap_FormFactorOrnsteinZernike_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorOrnsteinZernike_clone", _wrap_FormFactorOrnsteinZernike_clone, METH_O, "\n"
 		"FormFactorOrnsteinZernike_clone(FormFactorOrnsteinZernike self) -> FormFactorOrnsteinZernike\n"
-		"\n"
 		"FormFactorOrnsteinZernike* FormFactorOrnsteinZernike::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorOrnsteinZernike_accept", _wrap_FormFactorOrnsteinZernike_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorOrnsteinZernike_accept", _wrap_FormFactorOrnsteinZernike_accept, METH_VARARGS, "\n"
 		"FormFactorOrnsteinZernike_accept(FormFactorOrnsteinZernike self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorOrnsteinZernike::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorOrnsteinZernike_radialExtension", _wrap_FormFactorOrnsteinZernike_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorOrnsteinZernike_radialExtension", _wrap_FormFactorOrnsteinZernike_radialExtension, METH_O, "\n"
 		"FormFactorOrnsteinZernike_radialExtension(FormFactorOrnsteinZernike self) -> double\n"
-		"\n"
 		"double FormFactorOrnsteinZernike::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorOrnsteinZernike_evaluate_for_q", _wrap_FormFactorOrnsteinZernike_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorOrnsteinZernike_evaluate_for_q", _wrap_FormFactorOrnsteinZernike_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorOrnsteinZernike_evaluate_for_q(FormFactorOrnsteinZernike self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorOrnsteinZernike::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorOrnsteinZernike", _wrap_delete_FormFactorOrnsteinZernike, METH_VARARGS, (char *)"delete_FormFactorOrnsteinZernike(FormFactorOrnsteinZernike self)"},
-	 { (char *)"FormFactorOrnsteinZernike_swigregister", FormFactorOrnsteinZernike_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorPrism3", _wrap_new_FormFactorPrism3, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorOrnsteinZernike", _wrap_delete_FormFactorOrnsteinZernike, METH_O, "delete_FormFactorOrnsteinZernike(FormFactorOrnsteinZernike self)"},
+	 { "FormFactorOrnsteinZernike_swigregister", FormFactorOrnsteinZernike_swigregister, METH_O, NULL},
+	 { "FormFactorOrnsteinZernike_swiginit", FormFactorOrnsteinZernike_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorPrism3", _wrap_new_FormFactorPrism3, METH_VARARGS, "\n"
 		"new_FormFactorPrism3(double base_edge, double height) -> FormFactorPrism3\n"
-		"\n"
 		"FormFactorPrism3::FormFactorPrism3(double base_edge, double height)\n"
 		"\n"
 		"Constructor of a prism with an equilaterial triangle base.\n"
@@ -131540,33 +128250,30 @@ static PyMethodDef SwigMethods[] = {
 		"height in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism3_clone", _wrap_FormFactorPrism3_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism3_clone", _wrap_FormFactorPrism3_clone, METH_O, "\n"
 		"FormFactorPrism3_clone(FormFactorPrism3 self) -> FormFactorPrism3\n"
-		"\n"
 		"FormFactorPrism3* FormFactorPrism3::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism3_accept", _wrap_FormFactorPrism3_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism3_accept", _wrap_FormFactorPrism3_accept, METH_VARARGS, "\n"
 		"FormFactorPrism3_accept(FormFactorPrism3 self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorPrism3::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism3_getBaseEdge", _wrap_FormFactorPrism3_getBaseEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism3_getBaseEdge", _wrap_FormFactorPrism3_getBaseEdge, METH_O, "\n"
 		"FormFactorPrism3_getBaseEdge(FormFactorPrism3 self) -> double\n"
-		"\n"
 		"double FormFactorPrism3::getBaseEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPrism3", _wrap_delete_FormFactorPrism3, METH_VARARGS, (char *)"delete_FormFactorPrism3(FormFactorPrism3 self)"},
-	 { (char *)"FormFactorPrism3_swigregister", FormFactorPrism3_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorPrism6", _wrap_new_FormFactorPrism6, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPrism3", _wrap_delete_FormFactorPrism3, METH_O, "delete_FormFactorPrism3(FormFactorPrism3 self)"},
+	 { "FormFactorPrism3_swigregister", FormFactorPrism3_swigregister, METH_O, NULL},
+	 { "FormFactorPrism3_swiginit", FormFactorPrism3_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorPrism6", _wrap_new_FormFactorPrism6, METH_VARARGS, "\n"
 		"new_FormFactorPrism6(double base_edge, double height) -> FormFactorPrism6\n"
-		"\n"
 		"FormFactorPrism6::FormFactorPrism6(double base_edge, double height)\n"
 		"\n"
 		"Constructor of a prism with a regular hexagonal base.\n"
@@ -131581,33 +128288,30 @@ static PyMethodDef SwigMethods[] = {
 		"height in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism6_clone", _wrap_FormFactorPrism6_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism6_clone", _wrap_FormFactorPrism6_clone, METH_O, "\n"
 		"FormFactorPrism6_clone(FormFactorPrism6 self) -> FormFactorPrism6\n"
-		"\n"
 		"FormFactorPrism6* FormFactorPrism6::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism6_accept", _wrap_FormFactorPrism6_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism6_accept", _wrap_FormFactorPrism6_accept, METH_VARARGS, "\n"
 		"FormFactorPrism6_accept(FormFactorPrism6 self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorPrism6::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPrism6_getBaseEdge", _wrap_FormFactorPrism6_getBaseEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPrism6_getBaseEdge", _wrap_FormFactorPrism6_getBaseEdge, METH_O, "\n"
 		"FormFactorPrism6_getBaseEdge(FormFactorPrism6 self) -> double\n"
-		"\n"
 		"double FormFactorPrism6::getBaseEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPrism6", _wrap_delete_FormFactorPrism6, METH_VARARGS, (char *)"delete_FormFactorPrism6(FormFactorPrism6 self)"},
-	 { (char *)"FormFactorPrism6_swigregister", FormFactorPrism6_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorPyramid", _wrap_new_FormFactorPyramid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPrism6", _wrap_delete_FormFactorPrism6, METH_O, "delete_FormFactorPrism6(FormFactorPrism6 self)"},
+	 { "FormFactorPrism6_swigregister", FormFactorPrism6_swigregister, METH_O, NULL},
+	 { "FormFactorPrism6_swiginit", FormFactorPrism6_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorPyramid", _wrap_new_FormFactorPyramid, METH_VARARGS, "\n"
 		"new_FormFactorPyramid(double base_edge, double height, double alpha) -> FormFactorPyramid\n"
-		"\n"
 		"FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)\n"
 		"\n"
 		"Constructor of a truncated pyramid with a square base\n"
@@ -131625,45 +128329,40 @@ static PyMethodDef SwigMethods[] = {
 		"dihedral angle between the base and a side face in radians \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPyramid_clone", _wrap_FormFactorPyramid_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPyramid_clone", _wrap_FormFactorPyramid_clone, METH_O, "\n"
 		"FormFactorPyramid_clone(FormFactorPyramid self) -> FormFactorPyramid\n"
-		"\n"
 		"FormFactorPyramid* FormFactorPyramid::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPyramid_accept", _wrap_FormFactorPyramid_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPyramid_accept", _wrap_FormFactorPyramid_accept, METH_VARARGS, "\n"
 		"FormFactorPyramid_accept(FormFactorPyramid self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorPyramid::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPyramid_getHeight", _wrap_FormFactorPyramid_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPyramid_getHeight", _wrap_FormFactorPyramid_getHeight, METH_O, "\n"
 		"FormFactorPyramid_getHeight(FormFactorPyramid self) -> double\n"
-		"\n"
 		"double FormFactorPyramid::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPyramid_getBaseEdge", _wrap_FormFactorPyramid_getBaseEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPyramid_getBaseEdge", _wrap_FormFactorPyramid_getBaseEdge, METH_O, "\n"
 		"FormFactorPyramid_getBaseEdge(FormFactorPyramid self) -> double\n"
-		"\n"
 		"double FormFactorPyramid::getBaseEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorPyramid_getAlpha", _wrap_FormFactorPyramid_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorPyramid_getAlpha", _wrap_FormFactorPyramid_getAlpha, METH_O, "\n"
 		"FormFactorPyramid_getAlpha(FormFactorPyramid self) -> double\n"
-		"\n"
 		"double FormFactorPyramid::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorPyramid", _wrap_delete_FormFactorPyramid, METH_VARARGS, (char *)"delete_FormFactorPyramid(FormFactorPyramid self)"},
-	 { (char *)"FormFactorPyramid_swigregister", FormFactorPyramid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorRipple1", _wrap_new_FormFactorRipple1, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorPyramid", _wrap_delete_FormFactorPyramid, METH_O, "delete_FormFactorPyramid(FormFactorPyramid self)"},
+	 { "FormFactorPyramid_swigregister", FormFactorPyramid_swigregister, METH_O, NULL},
+	 { "FormFactorPyramid_swiginit", FormFactorPyramid_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorRipple1", _wrap_new_FormFactorRipple1, METH_VARARGS, "\n"
 		"new_FormFactorRipple1(double length, double width, double height) -> FormFactorRipple1\n"
-		"\n"
 		"FormFactorRipple1::FormFactorRipple1(double length, double width, double height)\n"
 		"\n"
 		"Constructor of cosine ripple.\n"
@@ -131681,61 +128380,54 @@ static PyMethodDef SwigMethods[] = {
 		"height of the ripple in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_clone", _wrap_FormFactorRipple1_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_clone", _wrap_FormFactorRipple1_clone, METH_O, "\n"
 		"FormFactorRipple1_clone(FormFactorRipple1 self) -> FormFactorRipple1\n"
-		"\n"
 		"FormFactorRipple1* FormFactorRipple1::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_accept", _wrap_FormFactorRipple1_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_accept", _wrap_FormFactorRipple1_accept, METH_VARARGS, "\n"
 		"FormFactorRipple1_accept(FormFactorRipple1 self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorRipple1::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_getLength", _wrap_FormFactorRipple1_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_getLength", _wrap_FormFactorRipple1_getLength, METH_O, "\n"
 		"FormFactorRipple1_getLength(FormFactorRipple1 self) -> double\n"
-		"\n"
 		"double FormFactorRipple1::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_getHeight", _wrap_FormFactorRipple1_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_getHeight", _wrap_FormFactorRipple1_getHeight, METH_O, "\n"
 		"FormFactorRipple1_getHeight(FormFactorRipple1 self) -> double\n"
-		"\n"
 		"double FormFactorRipple1::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_getWidth", _wrap_FormFactorRipple1_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_getWidth", _wrap_FormFactorRipple1_getWidth, METH_O, "\n"
 		"FormFactorRipple1_getWidth(FormFactorRipple1 self) -> double\n"
-		"\n"
 		"double FormFactorRipple1::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_radialExtension", _wrap_FormFactorRipple1_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_radialExtension", _wrap_FormFactorRipple1_radialExtension, METH_O, "\n"
 		"FormFactorRipple1_radialExtension(FormFactorRipple1 self) -> double\n"
-		"\n"
 		"double FormFactorRipple1::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple1_evaluate_for_q", _wrap_FormFactorRipple1_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple1_evaluate_for_q", _wrap_FormFactorRipple1_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorRipple1_evaluate_for_q(FormFactorRipple1 self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorRipple1", _wrap_delete_FormFactorRipple1, METH_VARARGS, (char *)"delete_FormFactorRipple1(FormFactorRipple1 self)"},
-	 { (char *)"FormFactorRipple1_swigregister", FormFactorRipple1_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorRipple2", _wrap_new_FormFactorRipple2, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorRipple1", _wrap_delete_FormFactorRipple1, METH_O, "delete_FormFactorRipple1(FormFactorRipple1 self)"},
+	 { "FormFactorRipple1_swigregister", FormFactorRipple1_swigregister, METH_O, NULL},
+	 { "FormFactorRipple1_swiginit", FormFactorRipple1_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorRipple2", _wrap_new_FormFactorRipple2, METH_VARARGS, "\n"
 		"new_FormFactorRipple2(double length, double width, double height, double asymmetry) -> FormFactorRipple2\n"
-		"\n"
 		"FormFactorRipple2::FormFactorRipple2(double length, double width, double height, double asymmetry)\n"
 		"\n"
 		"Constructor of a triangular ripple.\n"
@@ -131756,187 +128448,167 @@ static PyMethodDef SwigMethods[] = {
 		"asymmetry length of the triangular profile in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_clone", _wrap_FormFactorRipple2_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_clone", _wrap_FormFactorRipple2_clone, METH_O, "\n"
 		"FormFactorRipple2_clone(FormFactorRipple2 self) -> FormFactorRipple2\n"
-		"\n"
 		"FormFactorRipple2* FormFactorRipple2::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_accept", _wrap_FormFactorRipple2_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_accept", _wrap_FormFactorRipple2_accept, METH_VARARGS, "\n"
 		"FormFactorRipple2_accept(FormFactorRipple2 self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorRipple2::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_getHeight", _wrap_FormFactorRipple2_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_getHeight", _wrap_FormFactorRipple2_getHeight, METH_O, "\n"
 		"FormFactorRipple2_getHeight(FormFactorRipple2 self) -> double\n"
-		"\n"
 		"double FormFactorRipple2::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_getWidth", _wrap_FormFactorRipple2_getWidth, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_getWidth", _wrap_FormFactorRipple2_getWidth, METH_O, "\n"
 		"FormFactorRipple2_getWidth(FormFactorRipple2 self) -> double\n"
-		"\n"
 		"double FormFactorRipple2::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_getLength", _wrap_FormFactorRipple2_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_getLength", _wrap_FormFactorRipple2_getLength, METH_O, "\n"
 		"FormFactorRipple2_getLength(FormFactorRipple2 self) -> double\n"
-		"\n"
 		"double FormFactorRipple2::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_getAsymmetry", _wrap_FormFactorRipple2_getAsymmetry, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_getAsymmetry", _wrap_FormFactorRipple2_getAsymmetry, METH_O, "\n"
 		"FormFactorRipple2_getAsymmetry(FormFactorRipple2 self) -> double\n"
-		"\n"
 		"double FormFactorRipple2::getAsymmetry() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_radialExtension", _wrap_FormFactorRipple2_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_radialExtension", _wrap_FormFactorRipple2_radialExtension, METH_O, "\n"
 		"FormFactorRipple2_radialExtension(FormFactorRipple2 self) -> double\n"
-		"\n"
 		"double FormFactorRipple2::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorRipple2_evaluate_for_q", _wrap_FormFactorRipple2_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorRipple2_evaluate_for_q", _wrap_FormFactorRipple2_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorRipple2_evaluate_for_q(FormFactorRipple2 self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorRipple2", _wrap_delete_FormFactorRipple2, METH_VARARGS, (char *)"delete_FormFactorRipple2(FormFactorRipple2 self)"},
-	 { (char *)"FormFactorRipple2_swigregister", FormFactorRipple2_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorSphereGaussianRadius", _wrap_new_FormFactorSphereGaussianRadius, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorRipple2", _wrap_delete_FormFactorRipple2, METH_O, "delete_FormFactorRipple2(FormFactorRipple2 self)"},
+	 { "FormFactorRipple2_swigregister", FormFactorRipple2_swigregister, METH_O, NULL},
+	 { "FormFactorRipple2_swiginit", FormFactorRipple2_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorSphereGaussianRadius", _wrap_new_FormFactorSphereGaussianRadius, METH_VARARGS, "\n"
 		"new_FormFactorSphereGaussianRadius(double mean, double sigma) -> FormFactorSphereGaussianRadius\n"
-		"\n"
 		"FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereGaussianRadius_clone", _wrap_FormFactorSphereGaussianRadius_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereGaussianRadius_clone", _wrap_FormFactorSphereGaussianRadius_clone, METH_O, "\n"
 		"FormFactorSphereGaussianRadius_clone(FormFactorSphereGaussianRadius self) -> FormFactorSphereGaussianRadius\n"
-		"\n"
 		"FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereGaussianRadius_accept", _wrap_FormFactorSphereGaussianRadius_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereGaussianRadius_accept", _wrap_FormFactorSphereGaussianRadius_accept, METH_VARARGS, "\n"
 		"FormFactorSphereGaussianRadius_accept(FormFactorSphereGaussianRadius self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereGaussianRadius_radialExtension", _wrap_FormFactorSphereGaussianRadius_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereGaussianRadius_radialExtension", _wrap_FormFactorSphereGaussianRadius_radialExtension, METH_O, "\n"
 		"FormFactorSphereGaussianRadius_radialExtension(FormFactorSphereGaussianRadius self) -> double\n"
-		"\n"
 		"double FormFactorSphereGaussianRadius::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereGaussianRadius_evaluate_for_q", _wrap_FormFactorSphereGaussianRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereGaussianRadius_evaluate_for_q", _wrap_FormFactorSphereGaussianRadius_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorSphereGaussianRadius_evaluate_for_q(FormFactorSphereGaussianRadius self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorSphereGaussianRadius", _wrap_delete_FormFactorSphereGaussianRadius, METH_VARARGS, (char *)"delete_FormFactorSphereGaussianRadius(FormFactorSphereGaussianRadius self)"},
-	 { (char *)"FormFactorSphereGaussianRadius_swigregister", FormFactorSphereGaussianRadius_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorSphereLogNormalRadius", _wrap_new_FormFactorSphereLogNormalRadius, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorSphereGaussianRadius", _wrap_delete_FormFactorSphereGaussianRadius, METH_O, "delete_FormFactorSphereGaussianRadius(FormFactorSphereGaussianRadius self)"},
+	 { "FormFactorSphereGaussianRadius_swigregister", FormFactorSphereGaussianRadius_swigregister, METH_O, NULL},
+	 { "FormFactorSphereGaussianRadius_swiginit", FormFactorSphereGaussianRadius_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorSphereLogNormalRadius", _wrap_new_FormFactorSphereLogNormalRadius, METH_VARARGS, "\n"
 		"new_FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples) -> FormFactorSphereLogNormalRadius\n"
-		"\n"
 		"FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereLogNormalRadius_clone", _wrap_FormFactorSphereLogNormalRadius_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereLogNormalRadius_clone", _wrap_FormFactorSphereLogNormalRadius_clone, METH_O, "\n"
 		"FormFactorSphereLogNormalRadius_clone(FormFactorSphereLogNormalRadius self) -> FormFactorSphereLogNormalRadius\n"
-		"\n"
 		"FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereLogNormalRadius_accept", _wrap_FormFactorSphereLogNormalRadius_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereLogNormalRadius_accept", _wrap_FormFactorSphereLogNormalRadius_accept, METH_VARARGS, "\n"
 		"FormFactorSphereLogNormalRadius_accept(FormFactorSphereLogNormalRadius self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereLogNormalRadius_radialExtension", _wrap_FormFactorSphereLogNormalRadius_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereLogNormalRadius_radialExtension", _wrap_FormFactorSphereLogNormalRadius_radialExtension, METH_O, "\n"
 		"FormFactorSphereLogNormalRadius_radialExtension(FormFactorSphereLogNormalRadius self) -> double\n"
-		"\n"
 		"double FormFactorSphereLogNormalRadius::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereLogNormalRadius_evaluate_for_q", _wrap_FormFactorSphereLogNormalRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereLogNormalRadius_evaluate_for_q", _wrap_FormFactorSphereLogNormalRadius_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorSphereLogNormalRadius_evaluate_for_q(FormFactorSphereLogNormalRadius self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorSphereLogNormalRadius", _wrap_delete_FormFactorSphereLogNormalRadius, METH_VARARGS, (char *)"delete_FormFactorSphereLogNormalRadius(FormFactorSphereLogNormalRadius self)"},
-	 { (char *)"FormFactorSphereLogNormalRadius_swigregister", FormFactorSphereLogNormalRadius_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorSphereUniformRadius", _wrap_new_FormFactorSphereUniformRadius, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorSphereLogNormalRadius", _wrap_delete_FormFactorSphereLogNormalRadius, METH_O, "delete_FormFactorSphereLogNormalRadius(FormFactorSphereLogNormalRadius self)"},
+	 { "FormFactorSphereLogNormalRadius_swigregister", FormFactorSphereLogNormalRadius_swigregister, METH_O, NULL},
+	 { "FormFactorSphereLogNormalRadius_swiginit", FormFactorSphereLogNormalRadius_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorSphereUniformRadius", _wrap_new_FormFactorSphereUniformRadius, METH_VARARGS, "\n"
 		"new_FormFactorSphereUniformRadius(double mean, double full_width) -> FormFactorSphereUniformRadius\n"
-		"\n"
 		"FormFactorSphereUniformRadius::FormFactorSphereUniformRadius(double mean, double full_width)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereUniformRadius_clone", _wrap_FormFactorSphereUniformRadius_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereUniformRadius_clone", _wrap_FormFactorSphereUniformRadius_clone, METH_O, "\n"
 		"FormFactorSphereUniformRadius_clone(FormFactorSphereUniformRadius self) -> FormFactorSphereUniformRadius\n"
-		"\n"
 		"FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereUniformRadius_accept", _wrap_FormFactorSphereUniformRadius_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereUniformRadius_accept", _wrap_FormFactorSphereUniformRadius_accept, METH_VARARGS, "\n"
 		"FormFactorSphereUniformRadius_accept(FormFactorSphereUniformRadius self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereUniformRadius_radialExtension", _wrap_FormFactorSphereUniformRadius_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereUniformRadius_radialExtension", _wrap_FormFactorSphereUniformRadius_radialExtension, METH_O, "\n"
 		"FormFactorSphereUniformRadius_radialExtension(FormFactorSphereUniformRadius self) -> double\n"
-		"\n"
 		"double FormFactorSphereUniformRadius::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorSphereUniformRadius_evaluate_for_q", _wrap_FormFactorSphereUniformRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorSphereUniformRadius_evaluate_for_q", _wrap_FormFactorSphereUniformRadius_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorSphereUniformRadius_evaluate_for_q(FormFactorSphereUniformRadius self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorSphereUniformRadius", _wrap_delete_FormFactorSphereUniformRadius, METH_VARARGS, (char *)"delete_FormFactorSphereUniformRadius(FormFactorSphereUniformRadius self)"},
-	 { (char *)"FormFactorSphereUniformRadius_swigregister", FormFactorSphereUniformRadius_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorTetrahedron", _wrap_new_FormFactorTetrahedron, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorSphereUniformRadius", _wrap_delete_FormFactorSphereUniformRadius, METH_O, "delete_FormFactorSphereUniformRadius(FormFactorSphereUniformRadius self)"},
+	 { "FormFactorSphereUniformRadius_swigregister", FormFactorSphereUniformRadius_swigregister, METH_O, NULL},
+	 { "FormFactorSphereUniformRadius_swiginit", FormFactorSphereUniformRadius_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorTetrahedron", _wrap_new_FormFactorTetrahedron, METH_VARARGS, "\n"
 		"new_FormFactorTetrahedron(double base_edge, double height, double alpha) -> FormFactorTetrahedron\n"
-		"\n"
 		"FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)\n"
 		"\n"
 		"Constructor of a truncated tethrahedron.\n"
@@ -131954,45 +128626,40 @@ static PyMethodDef SwigMethods[] = {
 		"dihedral angle in radians between base and facet \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTetrahedron_clone", _wrap_FormFactorTetrahedron_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTetrahedron_clone", _wrap_FormFactorTetrahedron_clone, METH_O, "\n"
 		"FormFactorTetrahedron_clone(FormFactorTetrahedron self) -> FormFactorTetrahedron\n"
-		"\n"
 		"FormFactorTetrahedron* FormFactorTetrahedron::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTetrahedron_accept", _wrap_FormFactorTetrahedron_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTetrahedron_accept", _wrap_FormFactorTetrahedron_accept, METH_VARARGS, "\n"
 		"FormFactorTetrahedron_accept(FormFactorTetrahedron self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorTetrahedron::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTetrahedron_getBaseEdge", _wrap_FormFactorTetrahedron_getBaseEdge, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTetrahedron_getBaseEdge", _wrap_FormFactorTetrahedron_getBaseEdge, METH_O, "\n"
 		"FormFactorTetrahedron_getBaseEdge(FormFactorTetrahedron self) -> double\n"
-		"\n"
 		"double FormFactorTetrahedron::getBaseEdge() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTetrahedron_getHeight", _wrap_FormFactorTetrahedron_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTetrahedron_getHeight", _wrap_FormFactorTetrahedron_getHeight, METH_O, "\n"
 		"FormFactorTetrahedron_getHeight(FormFactorTetrahedron self) -> double\n"
-		"\n"
 		"double FormFactorTetrahedron::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTetrahedron_getAlpha", _wrap_FormFactorTetrahedron_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTetrahedron_getAlpha", _wrap_FormFactorTetrahedron_getAlpha, METH_O, "\n"
 		"FormFactorTetrahedron_getAlpha(FormFactorTetrahedron self) -> double\n"
-		"\n"
 		"double FormFactorTetrahedron::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTetrahedron", _wrap_delete_FormFactorTetrahedron, METH_VARARGS, (char *)"delete_FormFactorTetrahedron(FormFactorTetrahedron self)"},
-	 { (char *)"FormFactorTetrahedron_swigregister", FormFactorTetrahedron_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorTruncatedCube", _wrap_new_FormFactorTruncatedCube, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorTetrahedron", _wrap_delete_FormFactorTetrahedron, METH_O, "delete_FormFactorTetrahedron(FormFactorTetrahedron self)"},
+	 { "FormFactorTetrahedron_swigregister", FormFactorTetrahedron_swigregister, METH_O, NULL},
+	 { "FormFactorTetrahedron_swiginit", FormFactorTetrahedron_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorTruncatedCube", _wrap_new_FormFactorTruncatedCube, METH_VARARGS, "\n"
 		"new_FormFactorTruncatedCube(double length, double removed_length) -> FormFactorTruncatedCube\n"
-		"\n"
 		"FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)\n"
 		"\n"
 		"Constructor of a truncated cube.\n"
@@ -132007,40 +128674,35 @@ static PyMethodDef SwigMethods[] = {
 		"removed length from each edge of the cube in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedCube_clone", _wrap_FormFactorTruncatedCube_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedCube_clone", _wrap_FormFactorTruncatedCube_clone, METH_O, "\n"
 		"FormFactorTruncatedCube_clone(FormFactorTruncatedCube self) -> FormFactorTruncatedCube\n"
-		"\n"
 		"FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedCube_accept", _wrap_FormFactorTruncatedCube_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedCube_accept", _wrap_FormFactorTruncatedCube_accept, METH_VARARGS, "\n"
 		"FormFactorTruncatedCube_accept(FormFactorTruncatedCube self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedCube_getLength", _wrap_FormFactorTruncatedCube_getLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedCube_getLength", _wrap_FormFactorTruncatedCube_getLength, METH_O, "\n"
 		"FormFactorTruncatedCube_getLength(FormFactorTruncatedCube self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedCube::getLength() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedCube_getRemovedLength", _wrap_FormFactorTruncatedCube_getRemovedLength, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedCube_getRemovedLength", _wrap_FormFactorTruncatedCube_getRemovedLength, METH_O, "\n"
 		"FormFactorTruncatedCube_getRemovedLength(FormFactorTruncatedCube self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedCube::getRemovedLength() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTruncatedCube", _wrap_delete_FormFactorTruncatedCube, METH_VARARGS, (char *)"delete_FormFactorTruncatedCube(FormFactorTruncatedCube self)"},
-	 { (char *)"FormFactorTruncatedCube_swigregister", FormFactorTruncatedCube_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorTruncatedSphere", _wrap_new_FormFactorTruncatedSphere, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorTruncatedCube", _wrap_delete_FormFactorTruncatedCube, METH_O, "delete_FormFactorTruncatedCube(FormFactorTruncatedCube self)"},
+	 { "FormFactorTruncatedCube_swigregister", FormFactorTruncatedCube_swigregister, METH_O, NULL},
+	 { "FormFactorTruncatedCube_swiginit", FormFactorTruncatedCube_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorTruncatedSphere", _wrap_new_FormFactorTruncatedSphere, METH_VARARGS, "\n"
 		"FormFactorTruncatedSphere(double radius, double height, double dh=0.0)\n"
-		"new_FormFactorTruncatedSphere(double radius, double height) -> FormFactorTruncatedSphere\n"
-		"\n"
 		"FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh=0.0)\n"
 		"\n"
 		"Constructor of a spherical dome.\n"
@@ -132058,62 +128720,54 @@ static PyMethodDef SwigMethods[] = {
 		"length of cup truncated from the top \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_clone", _wrap_FormFactorTruncatedSphere_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_clone", _wrap_FormFactorTruncatedSphere_clone, METH_O, "\n"
 		"FormFactorTruncatedSphere_clone(FormFactorTruncatedSphere self) -> FormFactorTruncatedSphere\n"
-		"\n"
 		"FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_accept", _wrap_FormFactorTruncatedSphere_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_accept", _wrap_FormFactorTruncatedSphere_accept, METH_VARARGS, "\n"
 		"FormFactorTruncatedSphere_accept(FormFactorTruncatedSphere self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_getHeight", _wrap_FormFactorTruncatedSphere_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_getHeight", _wrap_FormFactorTruncatedSphere_getHeight, METH_O, "\n"
 		"FormFactorTruncatedSphere_getHeight(FormFactorTruncatedSphere self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSphere::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_getRadius", _wrap_FormFactorTruncatedSphere_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_getRadius", _wrap_FormFactorTruncatedSphere_getRadius, METH_O, "\n"
 		"FormFactorTruncatedSphere_getRadius(FormFactorTruncatedSphere self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSphere::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_getRemovedTop", _wrap_FormFactorTruncatedSphere_getRemovedTop, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_getRemovedTop", _wrap_FormFactorTruncatedSphere_getRemovedTop, METH_O, "\n"
 		"FormFactorTruncatedSphere_getRemovedTop(FormFactorTruncatedSphere self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSphere::getRemovedTop() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_radialExtension", _wrap_FormFactorTruncatedSphere_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_radialExtension", _wrap_FormFactorTruncatedSphere_radialExtension, METH_O, "\n"
 		"FormFactorTruncatedSphere_radialExtension(FormFactorTruncatedSphere self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSphere::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSphere_evaluate_for_q", _wrap_FormFactorTruncatedSphere_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSphere_evaluate_for_q", _wrap_FormFactorTruncatedSphere_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorTruncatedSphere_evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Complex formfactor. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTruncatedSphere", _wrap_delete_FormFactorTruncatedSphere, METH_VARARGS, (char *)"delete_FormFactorTruncatedSphere(FormFactorTruncatedSphere self)"},
-	 { (char *)"FormFactorTruncatedSphere_swigregister", FormFactorTruncatedSphere_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorTruncatedSpheroid", _wrap_new_FormFactorTruncatedSpheroid, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorTruncatedSphere", _wrap_delete_FormFactorTruncatedSphere, METH_O, "delete_FormFactorTruncatedSphere(FormFactorTruncatedSphere self)"},
+	 { "FormFactorTruncatedSphere_swigregister", FormFactorTruncatedSphere_swigregister, METH_O, NULL},
+	 { "FormFactorTruncatedSphere_swiginit", FormFactorTruncatedSphere_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorTruncatedSpheroid", _wrap_new_FormFactorTruncatedSpheroid, METH_VARARGS, "\n"
 		"FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh=0.0)\n"
-		"new_FormFactorTruncatedSpheroid(double radius, double height, double height_flattening) -> FormFactorTruncatedSpheroid\n"
-		"\n"
 		"FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh=0.0)\n"
 		"\n"
 		"Constructor of a spheroidal dome.\n"
@@ -132134,280 +128788,245 @@ static PyMethodDef SwigMethods[] = {
 		"length of cup truncated from the top \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_clone", _wrap_FormFactorTruncatedSpheroid_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_clone", _wrap_FormFactorTruncatedSpheroid_clone, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_clone(FormFactorTruncatedSpheroid self) -> FormFactorTruncatedSpheroid\n"
-		"\n"
 		"FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_accept", _wrap_FormFactorTruncatedSpheroid_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_accept", _wrap_FormFactorTruncatedSpheroid_accept, METH_VARARGS, "\n"
 		"FormFactorTruncatedSpheroid_accept(FormFactorTruncatedSpheroid self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_getRadius", _wrap_FormFactorTruncatedSpheroid_getRadius, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_getRadius", _wrap_FormFactorTruncatedSpheroid_getRadius, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_getRadius(FormFactorTruncatedSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSpheroid::getRadius() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_getHeight", _wrap_FormFactorTruncatedSpheroid_getHeight, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_getHeight", _wrap_FormFactorTruncatedSpheroid_getHeight, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_getHeight(FormFactorTruncatedSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSpheroid::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_getHeightFlattening", _wrap_FormFactorTruncatedSpheroid_getHeightFlattening, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_getHeightFlattening", _wrap_FormFactorTruncatedSpheroid_getHeightFlattening, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_getHeightFlattening(FormFactorTruncatedSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSpheroid::getHeightFlattening() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_getRemovedTop", _wrap_FormFactorTruncatedSpheroid_getRemovedTop, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_getRemovedTop", _wrap_FormFactorTruncatedSpheroid_getRemovedTop, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_getRemovedTop(FormFactorTruncatedSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSpheroid::getRemovedTop() const\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_radialExtension", _wrap_FormFactorTruncatedSpheroid_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_radialExtension", _wrap_FormFactorTruncatedSpheroid_radialExtension, METH_O, "\n"
 		"FormFactorTruncatedSpheroid_radialExtension(FormFactorTruncatedSpheroid self) -> double\n"
-		"\n"
 		"double FormFactorTruncatedSpheroid::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorTruncatedSpheroid_evaluate_for_q", _wrap_FormFactorTruncatedSpheroid_evaluate_for_q, METH_VARARGS, (char *)"\n"
+	 { "FormFactorTruncatedSpheroid_evaluate_for_q", _wrap_FormFactorTruncatedSpheroid_evaluate_for_q, METH_VARARGS, "\n"
 		"FormFactorTruncatedSpheroid_evaluate_for_q(FormFactorTruncatedSpheroid self, cvector_t q) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorTruncatedSpheroid", _wrap_delete_FormFactorTruncatedSpheroid, METH_VARARGS, (char *)"delete_FormFactorTruncatedSpheroid(FormFactorTruncatedSpheroid self)"},
-	 { (char *)"FormFactorTruncatedSpheroid_swigregister", FormFactorTruncatedSpheroid_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FormFactorWeighted", _wrap_new_FormFactorWeighted, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorTruncatedSpheroid", _wrap_delete_FormFactorTruncatedSpheroid, METH_O, "delete_FormFactorTruncatedSpheroid(FormFactorTruncatedSpheroid self)"},
+	 { "FormFactorTruncatedSpheroid_swigregister", FormFactorTruncatedSpheroid_swigregister, METH_O, NULL},
+	 { "FormFactorTruncatedSpheroid_swiginit", FormFactorTruncatedSpheroid_swiginit, METH_VARARGS, NULL},
+	 { "new_FormFactorWeighted", _wrap_new_FormFactorWeighted, METH_NOARGS, "\n"
 		"new_FormFactorWeighted() -> FormFactorWeighted\n"
-		"\n"
 		"FormFactorWeighted::FormFactorWeighted()\n"
 		"\n"
 		""},
-	 { (char *)"delete_FormFactorWeighted", _wrap_delete_FormFactorWeighted, METH_VARARGS, (char *)"\n"
+	 { "delete_FormFactorWeighted", _wrap_delete_FormFactorWeighted, METH_O, "\n"
 		"delete_FormFactorWeighted(FormFactorWeighted self)\n"
-		"\n"
 		"FormFactorWeighted::~FormFactorWeighted() override final\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_clone", _wrap_FormFactorWeighted_clone, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_clone", _wrap_FormFactorWeighted_clone, METH_O, "\n"
 		"FormFactorWeighted_clone(FormFactorWeighted self) -> FormFactorWeighted\n"
-		"\n"
 		"FormFactorWeighted * FormFactorWeighted::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_accept", _wrap_FormFactorWeighted_accept, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_accept", _wrap_FormFactorWeighted_accept, METH_VARARGS, "\n"
 		"FormFactorWeighted_accept(FormFactorWeighted self, INodeVisitor visitor)\n"
-		"\n"
 		"void FormFactorWeighted::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_radialExtension", _wrap_FormFactorWeighted_radialExtension, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_radialExtension", _wrap_FormFactorWeighted_radialExtension, METH_O, "\n"
 		"FormFactorWeighted_radialExtension(FormFactorWeighted self) -> double\n"
-		"\n"
 		"double FormFactorWeighted::radialExtension() const override final\n"
 		"\n"
 		"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_bottomZ", _wrap_FormFactorWeighted_bottomZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_bottomZ", _wrap_FormFactorWeighted_bottomZ, METH_VARARGS, "\n"
 		"FormFactorWeighted_bottomZ(FormFactorWeighted self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorWeighted::bottomZ(const IRotation &rotation) const override final\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_topZ", _wrap_FormFactorWeighted_topZ, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_topZ", _wrap_FormFactorWeighted_topZ, METH_VARARGS, "\n"
 		"FormFactorWeighted_topZ(FormFactorWeighted self, IRotation rotation) -> double\n"
-		"\n"
 		"double FormFactorWeighted::topZ(const IRotation &rotation) const override final\n"
 		"\n"
 		"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_addFormFactor", _wrap_FormFactorWeighted_addFormFactor, METH_VARARGS, (char *)"\n"
-		"addFormFactor(IFormFactor form_factor, double weight=1.0)\n"
-		"FormFactorWeighted_addFormFactor(FormFactorWeighted self, IFormFactor form_factor)\n"
-		"\n"
+	 { "FormFactorWeighted_addFormFactor", _wrap_FormFactorWeighted_addFormFactor, METH_VARARGS, "\n"
+		"FormFactorWeighted_addFormFactor(FormFactorWeighted self, IFormFactor form_factor, double weight=1.0)\n"
 		"void FormFactorWeighted::addFormFactor(const IFormFactor &form_factor, double weight=1.0)\n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_setAmbientMaterial", _wrap_FormFactorWeighted_setAmbientMaterial, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_setAmbientMaterial", _wrap_FormFactorWeighted_setAmbientMaterial, METH_VARARGS, "\n"
 		"FormFactorWeighted_setAmbientMaterial(FormFactorWeighted self, Material material)\n"
-		"\n"
 		"void FormFactorWeighted::setAmbientMaterial(Material material) override final\n"
 		"\n"
 		"Passes the material in which this particle is embedded. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_evaluate", _wrap_FormFactorWeighted_evaluate, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_evaluate", _wrap_FormFactorWeighted_evaluate, METH_VARARGS, "\n"
 		"FormFactorWeighted_evaluate(FormFactorWeighted self, WavevectorInfo wavevectors) -> complex_t\n"
-		"\n"
 		"complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const override final\n"
 		"\n"
 		"Returns scattering amplitude for complex wavevectors ki, kf. \n"
 		"\n"
 		""},
-	 { (char *)"FormFactorWeighted_swigregister", FormFactorWeighted_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IFootprintFactor", _wrap_delete_IFootprintFactor, METH_VARARGS, (char *)"\n"
+	 { "FormFactorWeighted_swigregister", FormFactorWeighted_swigregister, METH_O, NULL},
+	 { "FormFactorWeighted_swiginit", FormFactorWeighted_swiginit, METH_VARARGS, NULL},
+	 { "delete_IFootprintFactor", _wrap_delete_IFootprintFactor, METH_O, "\n"
 		"delete_IFootprintFactor(IFootprintFactor self)\n"
-		"\n"
 		"IFootprintFactor::~IFootprintFactor()\n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor_clone", _wrap_IFootprintFactor_clone, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor_clone", _wrap_IFootprintFactor_clone, METH_O, "\n"
 		"IFootprintFactor_clone(IFootprintFactor self) -> IFootprintFactor\n"
-		"\n"
 		"virtual IFootprintFactor* IFootprintFactor::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor_setWidthRatio", _wrap_IFootprintFactor_setWidthRatio, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor_setWidthRatio", _wrap_IFootprintFactor_setWidthRatio, METH_VARARGS, "\n"
 		"IFootprintFactor_setWidthRatio(IFootprintFactor self, double width_ratio)\n"
-		"\n"
 		"void IFootprintFactor::setWidthRatio(double width_ratio)\n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor_widthRatio", _wrap_IFootprintFactor_widthRatio, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor_widthRatio", _wrap_IFootprintFactor_widthRatio, METH_O, "\n"
 		"IFootprintFactor_widthRatio(IFootprintFactor self) -> double\n"
-		"\n"
 		"double IFootprintFactor::widthRatio() const\n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor_calculate", _wrap_IFootprintFactor_calculate, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor_calculate", _wrap_IFootprintFactor_calculate, METH_VARARGS, "\n"
 		"IFootprintFactor_calculate(IFootprintFactor self, double alpha) -> double\n"
-		"\n"
 		"virtual double IFootprintFactor::calculate(double alpha) const =0\n"
 		"\n"
 		"Calculate footprint correction coefficient from the beam incident angle  alpha. \n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor__print", _wrap_IFootprintFactor__print, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor__print", _wrap_IFootprintFactor__print, METH_O, "\n"
 		"IFootprintFactor__print(IFootprintFactor self) -> std::string\n"
-		"\n"
 		"virtual std::string IFootprintFactor::print() const =0\n"
 		"\n"
 		"Print python-formatted footprint definition. \n"
 		"\n"
 		""},
-	 { (char *)"IFootprintFactor_swigregister", IFootprintFactor_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FootprintFactorGaussian", _wrap_new_FootprintFactorGaussian, METH_VARARGS, (char *)"\n"
+	 { "IFootprintFactor_swigregister", IFootprintFactor_swigregister, METH_O, NULL},
+	 { "new_FootprintFactorGaussian", _wrap_new_FootprintFactorGaussian, METH_O, "\n"
 		"new_FootprintFactorGaussian(double width_ratio) -> FootprintFactorGaussian\n"
-		"\n"
 		"FootprintFactorGaussian::FootprintFactorGaussian(double width_ratio)\n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorGaussian_accept", _wrap_FootprintFactorGaussian_accept, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorGaussian_accept", _wrap_FootprintFactorGaussian_accept, METH_VARARGS, "\n"
 		"FootprintFactorGaussian_accept(FootprintFactorGaussian self, INodeVisitor visitor)\n"
-		"\n"
 		"void FootprintFactorGaussian::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorGaussian_clone", _wrap_FootprintFactorGaussian_clone, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorGaussian_clone", _wrap_FootprintFactorGaussian_clone, METH_O, "\n"
 		"FootprintFactorGaussian_clone(FootprintFactorGaussian self) -> FootprintFactorGaussian\n"
-		"\n"
 		"FootprintFactorGaussian * FootprintFactorGaussian::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorGaussian_calculate", _wrap_FootprintFactorGaussian_calculate, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorGaussian_calculate", _wrap_FootprintFactorGaussian_calculate, METH_VARARGS, "\n"
 		"FootprintFactorGaussian_calculate(FootprintFactorGaussian self, double alpha) -> double\n"
-		"\n"
 		"double FootprintFactorGaussian::calculate(double alpha) const override\n"
 		"\n"
 		"Calculate footprint correction coefficient from the beam incident angle  alpha. \n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorGaussian__print", _wrap_FootprintFactorGaussian__print, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorGaussian__print", _wrap_FootprintFactorGaussian__print, METH_O, "\n"
 		"FootprintFactorGaussian__print(FootprintFactorGaussian self) -> std::string\n"
-		"\n"
 		"std::string FootprintFactorGaussian::print() const override\n"
 		"\n"
 		"Print python-formatted footprint definition. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FootprintFactorGaussian", _wrap_delete_FootprintFactorGaussian, METH_VARARGS, (char *)"delete_FootprintFactorGaussian(FootprintFactorGaussian self)"},
-	 { (char *)"FootprintFactorGaussian_swigregister", FootprintFactorGaussian_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_FootprintFactorSquare", _wrap_new_FootprintFactorSquare, METH_VARARGS, (char *)"\n"
+	 { "delete_FootprintFactorGaussian", _wrap_delete_FootprintFactorGaussian, METH_O, "delete_FootprintFactorGaussian(FootprintFactorGaussian self)"},
+	 { "FootprintFactorGaussian_swigregister", FootprintFactorGaussian_swigregister, METH_O, NULL},
+	 { "FootprintFactorGaussian_swiginit", FootprintFactorGaussian_swiginit, METH_VARARGS, NULL},
+	 { "new_FootprintFactorSquare", _wrap_new_FootprintFactorSquare, METH_O, "\n"
 		"new_FootprintFactorSquare(double width_ratio) -> FootprintFactorSquare\n"
-		"\n"
 		"FootprintFactorSquare::FootprintFactorSquare(double width_ratio)\n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorSquare_accept", _wrap_FootprintFactorSquare_accept, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorSquare_accept", _wrap_FootprintFactorSquare_accept, METH_VARARGS, "\n"
 		"FootprintFactorSquare_accept(FootprintFactorSquare self, INodeVisitor visitor)\n"
-		"\n"
 		"void FootprintFactorSquare::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorSquare_clone", _wrap_FootprintFactorSquare_clone, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorSquare_clone", _wrap_FootprintFactorSquare_clone, METH_O, "\n"
 		"FootprintFactorSquare_clone(FootprintFactorSquare self) -> FootprintFactorSquare\n"
-		"\n"
 		"FootprintFactorSquare * FootprintFactorSquare::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorSquare_calculate", _wrap_FootprintFactorSquare_calculate, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorSquare_calculate", _wrap_FootprintFactorSquare_calculate, METH_VARARGS, "\n"
 		"FootprintFactorSquare_calculate(FootprintFactorSquare self, double alpha) -> double\n"
-		"\n"
 		"double FootprintFactorSquare::calculate(double alpha) const override\n"
 		"\n"
 		"Calculate footprint correction coefficient from the beam incident angle  alpha. \n"
 		"\n"
 		""},
-	 { (char *)"FootprintFactorSquare__print", _wrap_FootprintFactorSquare__print, METH_VARARGS, (char *)"\n"
+	 { "FootprintFactorSquare__print", _wrap_FootprintFactorSquare__print, METH_O, "\n"
 		"FootprintFactorSquare__print(FootprintFactorSquare self) -> std::string\n"
-		"\n"
 		"std::string FootprintFactorSquare::print() const override\n"
 		"\n"
 		"Print python-formatted footprint definition. \n"
 		"\n"
 		""},
-	 { (char *)"delete_FootprintFactorSquare", _wrap_delete_FootprintFactorSquare, METH_VARARGS, (char *)"delete_FootprintFactorSquare(FootprintFactorSquare self)"},
-	 { (char *)"FootprintFactorSquare_swigregister", FootprintFactorSquare_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_Simulation", _wrap_delete_Simulation, METH_VARARGS, (char *)"\n"
+	 { "delete_FootprintFactorSquare", _wrap_delete_FootprintFactorSquare, METH_O, "delete_FootprintFactorSquare(FootprintFactorSquare self)"},
+	 { "FootprintFactorSquare_swigregister", FootprintFactorSquare_swigregister, METH_O, NULL},
+	 { "FootprintFactorSquare_swiginit", FootprintFactorSquare_swiginit, METH_VARARGS, NULL},
+	 { "delete_Simulation", _wrap_delete_Simulation, METH_O, "\n"
 		"delete_Simulation(Simulation self)\n"
-		"\n"
 		"Simulation::~Simulation()\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_clone", _wrap_Simulation_clone, METH_VARARGS, (char *)"\n"
+	 { "Simulation_clone", _wrap_Simulation_clone, METH_O, "\n"
 		"Simulation_clone(Simulation self) -> Simulation\n"
-		"\n"
 		"virtual Simulation* Simulation::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_prepareSimulation", _wrap_Simulation_prepareSimulation, METH_VARARGS, (char *)"\n"
+	 { "Simulation_prepareSimulation", _wrap_Simulation_prepareSimulation, METH_O, "\n"
 		"Simulation_prepareSimulation(Simulation self)\n"
-		"\n"
 		"void Simulation::prepareSimulation()\n"
 		"\n"
 		"Put into a clean state for running a simulation. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_runSimulation", _wrap_Simulation_runSimulation, METH_VARARGS, (char *)"\n"
+	 { "Simulation_runSimulation", _wrap_Simulation_runSimulation, METH_O, "\n"
 		"Simulation_runSimulation(Simulation self)\n"
-		"\n"
 		"void Simulation::runSimulation()\n"
 		"\n"
 		"Run a simulation, possibly averaged over parameter distributions.\n"
@@ -132415,189 +129034,160 @@ static PyMethodDef SwigMethods[] = {
 		"Run simulation with possible averaging over parameter distributions. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_runMPISimulation", _wrap_Simulation_runMPISimulation, METH_VARARGS, (char *)"\n"
+	 { "Simulation_runMPISimulation", _wrap_Simulation_runMPISimulation, METH_O, "\n"
 		"Simulation_runMPISimulation(Simulation self)\n"
-		"\n"
 		"void Simulation::runMPISimulation()\n"
 		"\n"
 		"Run a simulation in a MPI environment. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setInstrument", _wrap_Simulation_setInstrument, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setInstrument", _wrap_Simulation_setInstrument, METH_VARARGS, "\n"
 		"Simulation_setInstrument(Simulation self, Instrument instrument)\n"
-		"\n"
 		"void Simulation::setInstrument(const Instrument &instrument)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_getInstrument", _wrap_Simulation_getInstrument, METH_VARARGS, (char *)"\n"
-		"getInstrument() -> Instrument\n"
+	 { "Simulation_getInstrument", _wrap_Simulation_getInstrument, METH_VARARGS, "\n"
+		"Simulation_getInstrument(Simulation self) -> Instrument\n"
 		"Simulation_getInstrument(Simulation self) -> Instrument\n"
-		"\n"
 		"Instrument& Simulation::getInstrument()\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setBeamIntensity", _wrap_Simulation_setBeamIntensity, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setBeamIntensity", _wrap_Simulation_setBeamIntensity, METH_VARARGS, "\n"
 		"Simulation_setBeamIntensity(Simulation self, double intensity)\n"
-		"\n"
 		"void Simulation::setBeamIntensity(double intensity)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_getBeamIntensity", _wrap_Simulation_getBeamIntensity, METH_VARARGS, (char *)"\n"
+	 { "Simulation_getBeamIntensity", _wrap_Simulation_getBeamIntensity, METH_O, "\n"
 		"Simulation_getBeamIntensity(Simulation self) -> double\n"
-		"\n"
 		"double Simulation::getBeamIntensity() const\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setBeamPolarization", _wrap_Simulation_setBeamPolarization, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setBeamPolarization", _wrap_Simulation_setBeamPolarization, METH_VARARGS, "\n"
 		"Simulation_setBeamPolarization(Simulation self, kvector_t bloch_vector)\n"
-		"\n"
 		"void Simulation::setBeamPolarization(const kvector_t bloch_vector)\n"
 		"\n"
 		"Sets the beam polarization according to the given Bloch vector. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setDetectorResolutionFunction", _wrap_Simulation_setDetectorResolutionFunction, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setDetectorResolutionFunction", _wrap_Simulation_setDetectorResolutionFunction, METH_VARARGS, "\n"
 		"Simulation_setDetectorResolutionFunction(Simulation self, IResolutionFunction2D resolution_function)\n"
-		"\n"
 		"void Simulation::setDetectorResolutionFunction(const IResolutionFunction2D &resolution_function)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_removeDetectorResolutionFunction", _wrap_Simulation_removeDetectorResolutionFunction, METH_VARARGS, (char *)"\n"
+	 { "Simulation_removeDetectorResolutionFunction", _wrap_Simulation_removeDetectorResolutionFunction, METH_O, "\n"
 		"Simulation_removeDetectorResolutionFunction(Simulation self)\n"
-		"\n"
 		"void Simulation::removeDetectorResolutionFunction()\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setAnalyzerProperties", _wrap_Simulation_setAnalyzerProperties, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setAnalyzerProperties", _wrap_Simulation_setAnalyzerProperties, METH_VARARGS, "\n"
 		"Simulation_setAnalyzerProperties(Simulation self, kvector_t direction, double efficiency, double total_transmission)\n"
-		"\n"
 		"void Simulation::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)\n"
 		"\n"
 		"Sets the polarization analyzer characteristics of the detector. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setSample", _wrap_Simulation_setSample, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setSample", _wrap_Simulation_setSample, METH_VARARGS, "\n"
 		"Simulation_setSample(Simulation self, MultiLayer sample)\n"
-		"\n"
 		"void Simulation::setSample(const MultiLayer &sample)\n"
 		"\n"
 		"The  MultiLayer object will not be owned by the  Simulation object. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_sample", _wrap_Simulation_sample, METH_VARARGS, (char *)"\n"
+	 { "Simulation_sample", _wrap_Simulation_sample, METH_O, "\n"
 		"Simulation_sample(Simulation self) -> MultiLayer\n"
-		"\n"
 		"const MultiLayer * Simulation::sample() const\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setSampleBuilderCpp", _wrap_Simulation_setSampleBuilderCpp, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setSampleBuilderCpp", _wrap_Simulation_setSampleBuilderCpp, METH_VARARGS, "\n"
 		"Simulation_setSampleBuilderCpp(Simulation self, std::shared_ptr< IMultiLayerBuilder > const sample_builder)\n"
-		"\n"
 		"void Simulation::setSampleBuilder(const std::shared_ptr< IMultiLayerBuilder > sample_builder)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setBackground", _wrap_Simulation_setBackground, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setBackground", _wrap_Simulation_setBackground, METH_VARARGS, "\n"
 		"Simulation_setBackground(Simulation self, IBackground bg)\n"
-		"\n"
 		"void Simulation::setBackground(const IBackground &bg)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_background", _wrap_Simulation_background, METH_VARARGS, (char *)"\n"
+	 { "Simulation_background", _wrap_Simulation_background, METH_O, "\n"
 		"Simulation_background(Simulation self) -> IBackground\n"
-		"\n"
 		"const IBackground* Simulation::background() const\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_intensityMapSize", _wrap_Simulation_intensityMapSize, METH_VARARGS, (char *)"\n"
+	 { "Simulation_intensityMapSize", _wrap_Simulation_intensityMapSize, METH_O, "\n"
 		"Simulation_intensityMapSize(Simulation self) -> size_t\n"
-		"\n"
 		"virtual size_t Simulation::intensityMapSize() const =0\n"
 		"\n"
 		"Returns the total number of the intensity values in the simulation result. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_result", _wrap_Simulation_result, METH_VARARGS, (char *)"\n"
+	 { "Simulation_result", _wrap_Simulation_result, METH_O, "\n"
 		"Simulation_result(Simulation self) -> SimulationResult\n"
-		"\n"
 		"virtual SimulationResult Simulation::result() const =0\n"
 		"\n"
 		"Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_addParameterDistribution", _wrap_Simulation_addParameterDistribution, METH_VARARGS, (char *)"\n"
-		"addParameterDistribution(std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits)\n"
-		"addParameterDistribution(std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0)\n"
-		"addParameterDistribution(std::string const & param_name, IDistribution1D distribution, size_t nbr_samples)\n"
+	 { "Simulation_addParameterDistribution", _wrap_Simulation_addParameterDistribution, METH_VARARGS, "\n"
+		"Simulation_addParameterDistribution(Simulation self, std::string const & param_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits=RealLimits())\n"
 		"Simulation_addParameterDistribution(Simulation self, ParameterDistribution par_distr)\n"
-		"\n"
 		"void Simulation::addParameterDistribution(const ParameterDistribution &par_distr)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_getDistributionHandler", _wrap_Simulation_getDistributionHandler, METH_VARARGS, (char *)"\n"
+	 { "Simulation_getDistributionHandler", _wrap_Simulation_getDistributionHandler, METH_O, "\n"
 		"Simulation_getDistributionHandler(Simulation self) -> DistributionHandler const &\n"
-		"\n"
 		"const DistributionHandler& Simulation::getDistributionHandler() const\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setOptions", _wrap_Simulation_setOptions, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setOptions", _wrap_Simulation_setOptions, METH_VARARGS, "\n"
 		"Simulation_setOptions(Simulation self, SimulationOptions options)\n"
-		"\n"
 		"void Simulation::setOptions(const SimulationOptions &options)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_getOptions", _wrap_Simulation_getOptions, METH_VARARGS, (char *)"\n"
-		"getOptions() -> SimulationOptions\n"
+	 { "Simulation_getOptions", _wrap_Simulation_getOptions, METH_VARARGS, "\n"
+		"Simulation_getOptions(Simulation self) -> SimulationOptions\n"
 		"Simulation_getOptions(Simulation self) -> SimulationOptions\n"
-		"\n"
 		"SimulationOptions& Simulation::getOptions()\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_subscribe", _wrap_Simulation_subscribe, METH_VARARGS, (char *)"\n"
+	 { "Simulation_subscribe", _wrap_Simulation_subscribe, METH_VARARGS, "\n"
 		"Simulation_subscribe(Simulation self, ProgressHandler::Callback_t inform)\n"
-		"\n"
 		"void Simulation::subscribe(ProgressHandler::Callback_t inform)\n"
 		"\n"
 		""},
-	 { (char *)"Simulation_setTerminalProgressMonitor", _wrap_Simulation_setTerminalProgressMonitor, METH_VARARGS, (char *)"\n"
+	 { "Simulation_setTerminalProgressMonitor", _wrap_Simulation_setTerminalProgressMonitor, METH_O, "\n"
 		"Simulation_setTerminalProgressMonitor(Simulation self)\n"
-		"\n"
 		"void Simulation::setTerminalProgressMonitor()\n"
 		"\n"
 		"Initializes a progress monitor that prints to stdout. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_getChildren", _wrap_Simulation_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Simulation_getChildren", _wrap_Simulation_getChildren, METH_O, "\n"
 		"Simulation_getChildren(Simulation self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Simulation::getChildren() const\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"Simulation_swigregister", Simulation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_Simulation2D", _wrap_delete_Simulation2D, METH_VARARGS, (char *)"\n"
+	 { "Simulation_swigregister", Simulation_swigregister, METH_O, NULL},
+	 { "delete_Simulation2D", _wrap_delete_Simulation2D, METH_O, "\n"
 		"delete_Simulation2D(Simulation2D self)\n"
-		"\n"
 		"Simulation2D::~Simulation2D() override\n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_clone", _wrap_Simulation2D_clone, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_clone", _wrap_Simulation2D_clone, METH_O, "\n"
 		"Simulation2D_clone(Simulation2D self) -> Simulation2D\n"
-		"\n"
 		"Simulation2D* Simulation2D::clone() const override=0\n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_prepareSimulation", _wrap_Simulation2D_prepareSimulation, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_prepareSimulation", _wrap_Simulation2D_prepareSimulation, METH_O, "\n"
 		"Simulation2D_prepareSimulation(Simulation2D self)\n"
-		"\n"
 		"void Simulation2D::prepareSimulation() override\n"
 		"\n"
 		"Put into a clean state for running a simulation. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_setDetectorParameters", _wrap_Simulation2D_setDetectorParameters, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_setDetectorParameters", _wrap_Simulation2D_setDetectorParameters, METH_VARARGS, "\n"
 		"Simulation2D_setDetectorParameters(Simulation2D self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
-		"\n"
 		"void Simulation2D::setDetectorParameters(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
 		"\n"
 		"Sets spherical detector parameters using angle ranges\n"
@@ -132624,26 +129214,22 @@ static PyMethodDef SwigMethods[] = {
 		"upper edge of last alpha-bin \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_setDetector", _wrap_Simulation2D_setDetector, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_setDetector", _wrap_Simulation2D_setDetector, METH_VARARGS, "\n"
 		"Simulation2D_setDetector(Simulation2D self, IDetector2D detector)\n"
-		"\n"
 		"void Simulation2D::setDetector(const IDetector2D &detector)\n"
 		"\n"
 		"Sets the detector (axes can be overwritten later) \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_removeMasks", _wrap_Simulation2D_removeMasks, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_removeMasks", _wrap_Simulation2D_removeMasks, METH_O, "\n"
 		"Simulation2D_removeMasks(Simulation2D self)\n"
-		"\n"
 		"void Simulation2D::removeMasks()\n"
 		"\n"
 		"removes all masks from the detector \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_addMask", _wrap_Simulation2D_addMask, METH_VARARGS, (char *)"\n"
-		"addMask(IShape2D shape, bool mask_value=True)\n"
-		"Simulation2D_addMask(Simulation2D self, IShape2D shape)\n"
-		"\n"
+	 { "Simulation2D_addMask", _wrap_Simulation2D_addMask, METH_VARARGS, "\n"
+		"Simulation2D_addMask(Simulation2D self, IShape2D shape, bool mask_value=True)\n"
 		"void Simulation2D::addMask(const IShape2D &shape, bool mask_value=true)\n"
 		"\n"
 		"Adds mask of given shape to the stack of detector masks. The mask value 'true' means that the channel will be excluded from the simulation. The mask which is added last has priority.\n"
@@ -132658,46 +129244,38 @@ static PyMethodDef SwigMethods[] = {
 		"The value of mask \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_maskAll", _wrap_Simulation2D_maskAll, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_maskAll", _wrap_Simulation2D_maskAll, METH_O, "\n"
 		"Simulation2D_maskAll(Simulation2D self)\n"
-		"\n"
 		"void Simulation2D::maskAll()\n"
 		"\n"
 		"Put the mask for all detector channels (i.e. exclude whole detector from the analysis) \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_setRegionOfInterest", _wrap_Simulation2D_setRegionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_setRegionOfInterest", _wrap_Simulation2D_setRegionOfInterest, METH_VARARGS, "\n"
 		"Simulation2D_setRegionOfInterest(Simulation2D self, double xlow, double ylow, double xup, double yup)\n"
-		"\n"
 		"void Simulation2D::setRegionOfInterest(double xlow, double ylow, double xup, double yup)\n"
 		"\n"
 		"Sets rectangular region of interest with lower left and upper right corners defined. \n"
 		"\n"
 		""},
-	 { (char *)"Simulation2D_swigregister", Simulation2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SimulationOptions", _wrap_new_SimulationOptions, METH_VARARGS, (char *)"\n"
+	 { "Simulation2D_swigregister", Simulation2D_swigregister, METH_O, NULL},
+	 { "new_SimulationOptions", _wrap_new_SimulationOptions, METH_NOARGS, "\n"
 		"new_SimulationOptions() -> SimulationOptions\n"
-		"\n"
 		"SimulationOptions::SimulationOptions()\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_isIntegrate", _wrap_SimulationOptions_isIntegrate, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_isIntegrate", _wrap_SimulationOptions_isIntegrate, METH_O, "\n"
 		"SimulationOptions_isIntegrate(SimulationOptions self) -> bool\n"
-		"\n"
 		"bool SimulationOptions::isIntegrate() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_getMcPoints", _wrap_SimulationOptions_getMcPoints, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_getMcPoints", _wrap_SimulationOptions_getMcPoints, METH_O, "\n"
 		"SimulationOptions_getMcPoints(SimulationOptions self) -> size_t\n"
-		"\n"
 		"size_t SimulationOptions::getMcPoints() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setMonteCarloIntegration", _wrap_SimulationOptions_setMonteCarloIntegration, METH_VARARGS, (char *)"\n"
-		"setMonteCarloIntegration(bool flag=True, size_t mc_points=50)\n"
-		"setMonteCarloIntegration(bool flag=True)\n"
-		"SimulationOptions_setMonteCarloIntegration(SimulationOptions self)\n"
-		"\n"
+	 { "SimulationOptions_setMonteCarloIntegration", _wrap_SimulationOptions_setMonteCarloIntegration, METH_VARARGS, "\n"
+		"SimulationOptions_setMonteCarloIntegration(SimulationOptions self, bool flag=True, size_t mc_points=50)\n"
 		"void SimulationOptions::setMonteCarloIntegration(bool flag=true, size_t mc_points=50)\n"
 		"\n"
 		"Enables/disables MonetCarlo integration.\n"
@@ -132712,237 +129290,206 @@ static PyMethodDef SwigMethods[] = {
 		"Number of points for MonteCarlo integrator \n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setNumberOfThreads", _wrap_SimulationOptions_setNumberOfThreads, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_setNumberOfThreads", _wrap_SimulationOptions_setNumberOfThreads, METH_VARARGS, "\n"
 		"SimulationOptions_setNumberOfThreads(SimulationOptions self, int nthreads)\n"
-		"\n"
 		"void SimulationOptions::setNumberOfThreads(int nthreads)\n"
 		"\n"
 		"Sets number of threads to use during the simulation (0 - take the default value from the hardware) \n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_getNumberOfThreads", _wrap_SimulationOptions_getNumberOfThreads, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_getNumberOfThreads", _wrap_SimulationOptions_getNumberOfThreads, METH_O, "\n"
 		"SimulationOptions_getNumberOfThreads(SimulationOptions self) -> unsigned int\n"
-		"\n"
 		"unsigned SimulationOptions::getNumberOfThreads() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setNumberOfBatches", _wrap_SimulationOptions_setNumberOfBatches, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_setNumberOfBatches", _wrap_SimulationOptions_setNumberOfBatches, METH_VARARGS, "\n"
 		"SimulationOptions_setNumberOfBatches(SimulationOptions self, int nbatches)\n"
-		"\n"
 		"void SimulationOptions::setNumberOfBatches(int nbatches)\n"
 		"\n"
 		"Sets number of batches to split. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_getNumberOfBatches", _wrap_SimulationOptions_getNumberOfBatches, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_getNumberOfBatches", _wrap_SimulationOptions_getNumberOfBatches, METH_O, "\n"
 		"SimulationOptions_getNumberOfBatches(SimulationOptions self) -> unsigned int\n"
-		"\n"
 		"unsigned SimulationOptions::getNumberOfBatches() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_getCurrentBatch", _wrap_SimulationOptions_getCurrentBatch, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_getCurrentBatch", _wrap_SimulationOptions_getCurrentBatch, METH_O, "\n"
 		"SimulationOptions_getCurrentBatch(SimulationOptions self) -> unsigned int\n"
-		"\n"
 		"unsigned SimulationOptions::getCurrentBatch() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setThreadInfo", _wrap_SimulationOptions_setThreadInfo, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_setThreadInfo", _wrap_SimulationOptions_setThreadInfo, METH_VARARGS, "\n"
 		"SimulationOptions_setThreadInfo(SimulationOptions self, ThreadInfo thread_info)\n"
-		"\n"
 		"void SimulationOptions::setThreadInfo(const ThreadInfo &thread_info)\n"
 		"\n"
 		"Sets the batch and thread information to be used. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_getHardwareConcurrency", _wrap_SimulationOptions_getHardwareConcurrency, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_getHardwareConcurrency", _wrap_SimulationOptions_getHardwareConcurrency, METH_O, "\n"
 		"SimulationOptions_getHardwareConcurrency(SimulationOptions self) -> unsigned int\n"
-		"\n"
 		"unsigned SimulationOptions::getHardwareConcurrency() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setIncludeSpecular", _wrap_SimulationOptions_setIncludeSpecular, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_setIncludeSpecular", _wrap_SimulationOptions_setIncludeSpecular, METH_VARARGS, "\n"
 		"SimulationOptions_setIncludeSpecular(SimulationOptions self, bool include_specular)\n"
-		"\n"
 		"void SimulationOptions::setIncludeSpecular(bool include_specular)\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_includeSpecular", _wrap_SimulationOptions_includeSpecular, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_includeSpecular", _wrap_SimulationOptions_includeSpecular, METH_O, "\n"
 		"SimulationOptions_includeSpecular(SimulationOptions self) -> bool\n"
-		"\n"
 		"bool SimulationOptions::includeSpecular() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_setUseAvgMaterials", _wrap_SimulationOptions_setUseAvgMaterials, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_setUseAvgMaterials", _wrap_SimulationOptions_setUseAvgMaterials, METH_VARARGS, "\n"
 		"SimulationOptions_setUseAvgMaterials(SimulationOptions self, bool use_avg_materials)\n"
-		"\n"
 		"void SimulationOptions::setUseAvgMaterials(bool use_avg_materials)\n"
 		"\n"
 		""},
-	 { (char *)"SimulationOptions_useAvgMaterials", _wrap_SimulationOptions_useAvgMaterials, METH_VARARGS, (char *)"\n"
+	 { "SimulationOptions_useAvgMaterials", _wrap_SimulationOptions_useAvgMaterials, METH_O, "\n"
 		"SimulationOptions_useAvgMaterials(SimulationOptions self) -> bool\n"
-		"\n"
 		"bool SimulationOptions::useAvgMaterials() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_SimulationOptions", _wrap_delete_SimulationOptions, METH_VARARGS, (char *)"delete_SimulationOptions(SimulationOptions self)"},
-	 { (char *)"SimulationOptions_swigregister", SimulationOptions_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_GISASSimulation", _wrap_new_GISASSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_SimulationOptions", _wrap_delete_SimulationOptions, METH_O, "delete_SimulationOptions(SimulationOptions self)"},
+	 { "SimulationOptions_swigregister", SimulationOptions_swigregister, METH_O, NULL},
+	 { "SimulationOptions_swiginit", SimulationOptions_swiginit, METH_VARARGS, NULL},
+	 { "new_GISASSimulation", _wrap_new_GISASSimulation, METH_VARARGS, "\n"
 		"GISASSimulation()\n"
 		"GISASSimulation(MultiLayer p_sample)\n"
 		"new_GISASSimulation(std::shared_ptr< IMultiLayerBuilder > const p_sample_builder) -> GISASSimulation\n"
-		"\n"
 		"GISASSimulation::GISASSimulation(const std::shared_ptr< IMultiLayerBuilder > p_sample_builder)\n"
 		"\n"
 		""},
-	 { (char *)"delete_GISASSimulation", _wrap_delete_GISASSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_GISASSimulation", _wrap_delete_GISASSimulation, METH_O, "\n"
 		"delete_GISASSimulation(GISASSimulation self)\n"
-		"\n"
 		"GISASSimulation::~GISASSimulation()\n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_clone", _wrap_GISASSimulation_clone, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_clone", _wrap_GISASSimulation_clone, METH_O, "\n"
 		"GISASSimulation_clone(GISASSimulation self) -> GISASSimulation\n"
-		"\n"
 		"GISASSimulation* GISASSimulation::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_accept", _wrap_GISASSimulation_accept, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_accept", _wrap_GISASSimulation_accept, METH_VARARGS, "\n"
 		"GISASSimulation_accept(GISASSimulation self, INodeVisitor visitor)\n"
-		"\n"
 		"void GISASSimulation::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_prepareSimulation", _wrap_GISASSimulation_prepareSimulation, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_prepareSimulation", _wrap_GISASSimulation_prepareSimulation, METH_O, "\n"
 		"GISASSimulation_prepareSimulation(GISASSimulation self)\n"
-		"\n"
 		"void GISASSimulation::prepareSimulation() override\n"
 		"\n"
 		"Put into a clean state for running a simulation. \n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_result", _wrap_GISASSimulation_result, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_result", _wrap_GISASSimulation_result, METH_O, "\n"
 		"GISASSimulation_result(GISASSimulation self) -> SimulationResult\n"
-		"\n"
 		"SimulationResult GISASSimulation::result() const override\n"
 		"\n"
 		"Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays \n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_setBeamParameters", _wrap_GISASSimulation_setBeamParameters, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_setBeamParameters", _wrap_GISASSimulation_setBeamParameters, METH_VARARGS, "\n"
 		"GISASSimulation_setBeamParameters(GISASSimulation self, double wavelength, double alpha_i, double phi_i)\n"
-		"\n"
 		"void GISASSimulation::setBeamParameters(double wavelength, double alpha_i, double phi_i)\n"
 		"\n"
 		"Sets beam parameters from here (forwarded to  Instrument) \n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_intensityMapSize", _wrap_GISASSimulation_intensityMapSize, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_intensityMapSize", _wrap_GISASSimulation_intensityMapSize, METH_O, "\n"
 		"GISASSimulation_intensityMapSize(GISASSimulation self) -> size_t\n"
-		"\n"
 		"size_t GISASSimulation::intensityMapSize() const override\n"
 		"\n"
 		"Returns the total number of the intensity values in the simulation result. \n"
 		"\n"
 		""},
-	 { (char *)"GISASSimulation_swigregister", GISASSimulation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IHistogram", _wrap_delete_IHistogram, METH_VARARGS, (char *)"\n"
+	 { "GISASSimulation_swigregister", GISASSimulation_swigregister, METH_O, NULL},
+	 { "GISASSimulation_swiginit", GISASSimulation_swiginit, METH_VARARGS, NULL},
+	 { "delete_IHistogram", _wrap_delete_IHistogram, METH_O, "\n"
 		"delete_IHistogram(IHistogram self)\n"
-		"\n"
 		"virtual IHistogram::~IHistogram()\n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_clone", _wrap_IHistogram_clone, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_clone", _wrap_IHistogram_clone, METH_O, "\n"
 		"IHistogram_clone(IHistogram self) -> IHistogram\n"
-		"\n"
 		"virtual IHistogram* IHistogram::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getRank", _wrap_IHistogram_getRank, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getRank", _wrap_IHistogram_getRank, METH_O, "\n"
 		"IHistogram_getRank(IHistogram self) -> size_t\n"
-		"\n"
 		"virtual size_t IHistogram::getRank() const =0\n"
 		"\n"
 		"Returns number of histogram dimensions. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getTotalNumberOfBins", _wrap_IHistogram_getTotalNumberOfBins, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getTotalNumberOfBins", _wrap_IHistogram_getTotalNumberOfBins, METH_O, "\n"
 		"IHistogram_getTotalNumberOfBins(IHistogram self) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getTotalNumberOfBins() const\n"
 		"\n"
 		"Returns total number of histogram bins. For 2D histograms the result will be the product of bin numbers along X and Y axes. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getXaxis", _wrap_IHistogram_getXaxis, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getXaxis", _wrap_IHistogram_getXaxis, METH_O, "\n"
 		"IHistogram_getXaxis(IHistogram self) -> IAxis\n"
-		"\n"
 		"const IAxis & IHistogram::getXaxis() const\n"
 		"\n"
 		"returns x-axis \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getYaxis", _wrap_IHistogram_getYaxis, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getYaxis", _wrap_IHistogram_getYaxis, METH_O, "\n"
 		"IHistogram_getYaxis(IHistogram self) -> IAxis\n"
-		"\n"
 		"const IAxis & IHistogram::getYaxis() const\n"
 		"\n"
 		"returns y-axis for 2D histograms \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getXmin", _wrap_IHistogram_getXmin, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getXmin", _wrap_IHistogram_getXmin, METH_O, "\n"
 		"IHistogram_getXmin(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getXmin() const\n"
 		"\n"
 		"Returns x-axis min (lower edge of first bin). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getXmax", _wrap_IHistogram_getXmax, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getXmax", _wrap_IHistogram_getXmax, METH_O, "\n"
 		"IHistogram_getXmax(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getXmax() const\n"
 		"\n"
 		"Returns x-axis max (upper edge of last bin). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getNbinsX", _wrap_IHistogram_getNbinsX, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getNbinsX", _wrap_IHistogram_getNbinsX, METH_O, "\n"
 		"IHistogram_getNbinsX(IHistogram self) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getNbinsX() const\n"
 		"\n"
 		"Returns number of bins on x-axis. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getYmin", _wrap_IHistogram_getYmin, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getYmin", _wrap_IHistogram_getYmin, METH_O, "\n"
 		"IHistogram_getYmin(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getYmin() const\n"
 		"\n"
 		"Returns y-axis min (lower edge of first bin) for 2D histograms. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getYmax", _wrap_IHistogram_getYmax, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getYmax", _wrap_IHistogram_getYmax, METH_O, "\n"
 		"IHistogram_getYmax(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getYmax() const\n"
 		"\n"
 		"Returns y-axis max (upper edge of last bin) for 2D histograms. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getNbinsY", _wrap_IHistogram_getNbinsY, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getNbinsY", _wrap_IHistogram_getNbinsY, METH_O, "\n"
 		"IHistogram_getNbinsY(IHistogram self) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getNbinsY() const\n"
 		"\n"
 		"Returns number of bins on y-axis. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getGlobalBin", _wrap_IHistogram_getGlobalBin, METH_VARARGS, (char *)"\n"
-		"getGlobalBin(size_t binx, size_t biny=0) -> size_t\n"
-		"IHistogram_getGlobalBin(IHistogram self, size_t binx) -> size_t\n"
-		"\n"
+	 { "IHistogram_getGlobalBin", _wrap_IHistogram_getGlobalBin, METH_VARARGS, "\n"
+		"IHistogram_getGlobalBin(IHistogram self, size_t binx, size_t biny=0) -> size_t\n"
 		"size_t IHistogram::getGlobalBin(size_t binx, size_t biny=0) const\n"
 		"\n"
 		"Returns global bin index for given axes indices. For 1D histogram the global bin index coinside with x-axis index.\n"
@@ -132959,9 +129506,8 @@ static PyMethodDef SwigMethods[] = {
 		"The global bin index \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_findGlobalBin", _wrap_IHistogram_findGlobalBin, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_findGlobalBin", _wrap_IHistogram_findGlobalBin, METH_VARARGS, "\n"
 		"IHistogram_findGlobalBin(IHistogram self, double x, double y) -> size_t\n"
-		"\n"
 		"size_t IHistogram::findGlobalBin(double x, double y) const\n"
 		"\n"
 		"Returns closest global bin index for given axes coordinates. For 1D.\n"
@@ -132978,25 +129524,22 @@ static PyMethodDef SwigMethods[] = {
 		"Closest global bin index \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getXaxisIndex", _wrap_IHistogram_getXaxisIndex, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getXaxisIndex", _wrap_IHistogram_getXaxisIndex, METH_VARARGS, "\n"
 		"IHistogram_getXaxisIndex(IHistogram self, size_t i) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getXaxisIndex(size_t i) const\n"
 		"\n"
 		"Returns x-axis bin index for given globalbin. For 1D histograms returned value conicide with globalbin value. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getYaxisIndex", _wrap_IHistogram_getYaxisIndex, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getYaxisIndex", _wrap_IHistogram_getYaxisIndex, METH_VARARGS, "\n"
 		"IHistogram_getYaxisIndex(IHistogram self, size_t i) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getYaxisIndex(size_t i) const\n"
 		"\n"
 		"Returns y-axis bin index for given globalbin (for 2D histograms). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getXaxisValue", _wrap_IHistogram_getXaxisValue, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getXaxisValue", _wrap_IHistogram_getXaxisValue, METH_VARARGS, "\n"
 		"IHistogram_getXaxisValue(IHistogram self, size_t i) -> double\n"
-		"\n"
 		"double IHistogram::getXaxisValue(size_t i)\n"
 		"\n"
 		"Returns the value on x-axis corresponding to the global bin index.\n"
@@ -133010,9 +129553,8 @@ static PyMethodDef SwigMethods[] = {
 		"The center of corresponding bin of the axis \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getYaxisValue", _wrap_IHistogram_getYaxisValue, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getYaxisValue", _wrap_IHistogram_getYaxisValue, METH_VARARGS, "\n"
 		"IHistogram_getYaxisValue(IHistogram self, size_t i) -> double\n"
-		"\n"
 		"double IHistogram::getYaxisValue(size_t i)\n"
 		"\n"
 		"Returns the value on y-axis corresponding to the 2D histogram global bin index.\n"
@@ -133026,17 +129568,15 @@ static PyMethodDef SwigMethods[] = {
 		"The center of corresponding bin of the axis \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getData", _wrap_IHistogram_getData, METH_VARARGS, (char *)"\n"
-		"getData() -> OutputData< CumulativeValue > const\n"
+	 { "IHistogram_getData", _wrap_IHistogram_getData, METH_VARARGS, "\n"
+		"IHistogram_getData(IHistogram self) -> OutputData< CumulativeValue > const\n"
 		"IHistogram_getData(IHistogram self) -> OutputData< CumulativeValue > &\n"
-		"\n"
 		"OutputData<CumulativeValue>& IHistogram::getData()\n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getBinContent", _wrap_IHistogram_getBinContent, METH_VARARGS, (char *)"\n"
-		"getBinContent(size_t i) -> double\n"
+	 { "IHistogram_getBinContent", _wrap_IHistogram_getBinContent, METH_VARARGS, "\n"
+		"IHistogram_getBinContent(IHistogram self, size_t i) -> double\n"
 		"IHistogram_getBinContent(IHistogram self, size_t binx, size_t biny) -> double\n"
-		"\n"
 		"double IHistogram::getBinContent(size_t binx, size_t biny) const\n"
 		"\n"
 		"Returns content (accumulated value) of the 2D histogram bin with given indices.\n"
@@ -133053,133 +129593,115 @@ static PyMethodDef SwigMethods[] = {
 		"The value accumulated by the bin (integral) \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_setBinContent", _wrap_IHistogram_setBinContent, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_setBinContent", _wrap_IHistogram_setBinContent, METH_VARARGS, "\n"
 		"IHistogram_setBinContent(IHistogram self, size_t i, double value)\n"
-		"\n"
 		"void IHistogram::setBinContent(size_t i, double value)\n"
 		"\n"
 		"Sets content of the bin corresponding to the globalbin number. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_addBinContent", _wrap_IHistogram_addBinContent, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_addBinContent", _wrap_IHistogram_addBinContent, METH_VARARGS, "\n"
 		"IHistogram_addBinContent(IHistogram self, size_t i, double value)\n"
-		"\n"
 		"void IHistogram::addBinContent(size_t i, double value)\n"
 		"\n"
 		"Add the value to the bin. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getBinError", _wrap_IHistogram_getBinError, METH_VARARGS, (char *)"\n"
-		"getBinError(size_t i) -> double\n"
+	 { "IHistogram_getBinError", _wrap_IHistogram_getBinError, METH_VARARGS, "\n"
+		"IHistogram_getBinError(IHistogram self, size_t i) -> double\n"
 		"IHistogram_getBinError(IHistogram self, size_t binx, size_t biny) -> double\n"
-		"\n"
 		"double IHistogram::getBinError(size_t binx, size_t biny) const\n"
 		"\n"
 		"Returns error of the bin with given indices (for 2D histograms). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getBinAverage", _wrap_IHistogram_getBinAverage, METH_VARARGS, (char *)"\n"
-		"getBinAverage(size_t i) -> double\n"
+	 { "IHistogram_getBinAverage", _wrap_IHistogram_getBinAverage, METH_VARARGS, "\n"
+		"IHistogram_getBinAverage(IHistogram self, size_t i) -> double\n"
 		"IHistogram_getBinAverage(IHistogram self, size_t binx, size_t biny) -> double\n"
-		"\n"
 		"double IHistogram::getBinAverage(size_t binx, size_t biny) const\n"
 		"\n"
 		"Returns average value of the bin with given indices (for 2D histograms). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getBinNumberOfEntries", _wrap_IHistogram_getBinNumberOfEntries, METH_VARARGS, (char *)"\n"
-		"getBinNumberOfEntries(size_t i) -> int\n"
+	 { "IHistogram_getBinNumberOfEntries", _wrap_IHistogram_getBinNumberOfEntries, METH_VARARGS, "\n"
+		"IHistogram_getBinNumberOfEntries(IHistogram self, size_t i) -> int\n"
 		"IHistogram_getBinNumberOfEntries(IHistogram self, size_t binx, size_t biny) -> int\n"
-		"\n"
 		"int IHistogram::getBinNumberOfEntries(size_t binx, size_t biny) const\n"
 		"\n"
 		"Returns number of entries in the bin with given indices (for 2D histograms). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getMaximum", _wrap_IHistogram_getMaximum, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getMaximum", _wrap_IHistogram_getMaximum, METH_O, "\n"
 		"IHistogram_getMaximum(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getMaximum() const\n"
 		"\n"
 		"Returns histogram maximum value (maximum of  getBinContent() over all bins) \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getMaximumBinIndex", _wrap_IHistogram_getMaximumBinIndex, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getMaximumBinIndex", _wrap_IHistogram_getMaximumBinIndex, METH_O, "\n"
 		"IHistogram_getMaximumBinIndex(IHistogram self) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getMaximumBinIndex() const\n"
 		"\n"
 		"Returns globalbin index with maximum content. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getMinimum", _wrap_IHistogram_getMinimum, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getMinimum", _wrap_IHistogram_getMinimum, METH_O, "\n"
 		"IHistogram_getMinimum(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::getMinimum() const\n"
 		"\n"
 		"Returns histogram minimum value (minimum of  getBinContent() over all bins) \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getMinimumBinIndex", _wrap_IHistogram_getMinimumBinIndex, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_getMinimumBinIndex", _wrap_IHistogram_getMinimumBinIndex, METH_O, "\n"
 		"IHistogram_getMinimumBinIndex(IHistogram self) -> size_t\n"
-		"\n"
 		"size_t IHistogram::getMinimumBinIndex() const\n"
 		"\n"
 		"Returns globalbin index with minimum content. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_scale", _wrap_IHistogram_scale, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_scale", _wrap_IHistogram_scale, METH_VARARGS, "\n"
 		"IHistogram_scale(IHistogram self, double value)\n"
-		"\n"
 		"void IHistogram::scale(double value)\n"
 		"\n"
 		"Multiply this histogram (every bin content value) by a constant. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_integral", _wrap_IHistogram_integral, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_integral", _wrap_IHistogram_integral, METH_O, "\n"
 		"IHistogram_integral(IHistogram self) -> double\n"
-		"\n"
 		"double IHistogram::integral() const\n"
 		"\n"
 		"Returns integral of bins content (computed as a sum of all bin content). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_array", _wrap_IHistogram_array, METH_VARARGS, (char *)"\n"
-		"array(IHistogram::DataType dataType) -> PyObject\n"
-		"IHistogram_array(IHistogram self) -> PyObject *\n"
-		"\n"
+	 { "IHistogram_array", _wrap_IHistogram_array, METH_VARARGS, "\n"
+		"IHistogram_array(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> PyObject\n"
 		"PyObject * IHistogram::array(DataType dataType=DataType::INTEGRAL) const\n"
 		"\n"
 		"Returns numpy array with bin content (accumulated values). \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_getArrayObsolete", _wrap_IHistogram_getArrayObsolete, METH_VARARGS, (char *)"\n"
-		"getArrayObsolete(IHistogram::DataType dataType) -> PyObject\n"
-		"IHistogram_getArrayObsolete(IHistogram self) -> PyObject *\n"
-		"\n"
+	 { "IHistogram_getArrayObsolete", _wrap_IHistogram_getArrayObsolete, METH_VARARGS, "\n"
+		"IHistogram_getArrayObsolete(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> PyObject\n"
 		"PyObject * IHistogram::getArray(DataType dataType=DataType::INTEGRAL) const\n"
 		"\n"
 		"Deprecated\n"
 		"Use  array() instead. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_reset", _wrap_IHistogram_reset, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_reset", _wrap_IHistogram_reset, METH_O, "\n"
 		"IHistogram_reset(IHistogram self)\n"
-		"\n"
 		"void IHistogram::reset()\n"
 		"\n"
 		"Reset histogram content (axes remains) \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_createHistogram", _wrap_IHistogram_createHistogram, METH_VARARGS, (char *)"IHistogram_createHistogram(IntensityData source) -> IHistogram"},
-	 { (char *)"IHistogram_createFrom", _wrap_IHistogram_createFrom, METH_VARARGS, (char *)"\n"
-		"createFrom(std::string const & filename) -> IHistogram\n"
+	 { "IHistogram_createHistogram", _wrap_IHistogram_createHistogram, METH_O, "IHistogram_createHistogram(IntensityData source) -> IHistogram"},
+	 { "IHistogram_createFrom", _wrap_IHistogram_createFrom, METH_VARARGS, "\n"
+		"IHistogram_createFrom(std::string const & filename) -> IHistogram\n"
 		"IHistogram_createFrom(vdouble2d_t data) -> IHistogram\n"
 		""},
-	 { (char *)"IHistogram_createOutputData", _wrap_IHistogram_createOutputData, METH_VARARGS, (char *)"\n"
-		"createOutputData(IHistogram::DataType dataType) -> IntensityData\n"
-		"IHistogram_createOutputData(IHistogram self) -> IntensityData\n"
-		"\n"
+	 { "IHistogram_createOutputData", _wrap_IHistogram_createOutputData, METH_VARARGS, "\n"
+		"IHistogram_createOutputData(IHistogram self, IHistogram::DataType dataType=DataType::INTEGRAL) -> IntensityData\n"
 		"OutputData< double > * IHistogram::createOutputData(DataType dataType=DataType::INTEGRAL) const\n"
 		"\n"
 		"creates new  OutputData with histogram's shape and values corresponding to DataType\n"
@@ -133187,178 +129709,156 @@ static PyMethodDef SwigMethods[] = {
 		"creates new  OutputData with histogram's shape and put there values corresponding to DataType \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_hasSameShape", _wrap_IHistogram_hasSameShape, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_hasSameShape", _wrap_IHistogram_hasSameShape, METH_VARARGS, "\n"
 		"IHistogram_hasSameShape(IHistogram self, IHistogram other) -> bool\n"
-		"\n"
 		"bool IHistogram::hasSameShape(const IHistogram &other) const\n"
 		"\n"
 		"Returns true if objects a) have same dimensions b) bin boundaries of axes coincide. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_hasSameDimensions", _wrap_IHistogram_hasSameDimensions, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_hasSameDimensions", _wrap_IHistogram_hasSameDimensions, METH_VARARGS, "\n"
 		"IHistogram_hasSameDimensions(IHistogram self, IHistogram other) -> bool\n"
-		"\n"
 		"bool IHistogram::hasSameDimensions(const IHistogram &other) const\n"
 		"\n"
 		"Returns true if object have same rank and number of axes bins. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram___iadd__", _wrap_IHistogram___iadd__, METH_VARARGS, (char *)"IHistogram___iadd__(IHistogram self, IHistogram right) -> IHistogram"},
-	 { (char *)"IHistogram_relativeDifferenceHistogram", _wrap_IHistogram_relativeDifferenceHistogram, METH_VARARGS, (char *)"\n"
+	 { "IHistogram___iadd__", _wrap_IHistogram___iadd__, METH_VARARGS, "IHistogram___iadd__(IHistogram self, IHistogram right) -> IHistogram"},
+	 { "IHistogram_relativeDifferenceHistogram", _wrap_IHistogram_relativeDifferenceHistogram, METH_VARARGS, "\n"
 		"IHistogram_relativeDifferenceHistogram(IHistogram self, IHistogram rhs) -> IHistogram\n"
-		"\n"
 		"IHistogram * IHistogram::relativeDifferenceHistogram(const IHistogram &rhs)\n"
 		"\n"
 		"returns histogram representing relative difference of two histograms. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_save", _wrap_IHistogram_save, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_save", _wrap_IHistogram_save, METH_VARARGS, "\n"
 		"IHistogram_save(IHistogram self, std::string const & filename)\n"
-		"\n"
 		"void IHistogram::save(const std::string &filename)\n"
 		"\n"
 		"Saves histogram in file Following formats are available: *.txt, *.tif, *.int (*.txt.gz, *.tif.gz, *.int.gz) \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_load", _wrap_IHistogram_load, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_load", _wrap_IHistogram_load, METH_VARARGS, "\n"
 		"IHistogram_load(IHistogram self, std::string const & filename)\n"
-		"\n"
 		"void IHistogram::load(const std::string &filename)\n"
 		"\n"
 		"Loads histogram from file, the shape of array in file should match Following formats are available: *.txt, *.tif, *.int (*.txt.gz, *.tif.gz, *.int.gz) Only bin content will be loaded, histogram axes remain the same. \n"
 		"\n"
 		""},
-	 { (char *)"IHistogram_swigregister", IHistogram_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Histogram1D", _wrap_new_Histogram1D, METH_VARARGS, (char *)"\n"
+	 { "IHistogram_swigregister", IHistogram_swigregister, METH_O, NULL},
+	 { "new_Histogram1D", _wrap_new_Histogram1D, METH_VARARGS, "\n"
 		"Histogram1D(int nbinsx, double xlow, double xup)\n"
 		"Histogram1D(int nbinsx, vdouble1d_t xbins)\n"
 		"Histogram1D(IAxis axis)\n"
 		"new_Histogram1D(IntensityData data) -> Histogram1D\n"
-		"\n"
 		"Histogram1D::Histogram1D(const OutputData< double > &data)\n"
 		"\n"
 		"Constructor for 1D histograms from basic  OutputData object. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_clone", _wrap_Histogram1D_clone, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_clone", _wrap_Histogram1D_clone, METH_O, "\n"
 		"Histogram1D_clone(Histogram1D self) -> Histogram1D\n"
-		"\n"
 		"Histogram1D * Histogram1D::clone() const\n"
 		"\n"
 		"Returns clone of other histogram. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getRank", _wrap_Histogram1D_getRank, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getRank", _wrap_Histogram1D_getRank, METH_O, "\n"
 		"Histogram1D_getRank(Histogram1D self) -> size_t\n"
-		"\n"
 		"size_t Histogram1D::getRank() const\n"
 		"\n"
 		"Returns the number of histogram dimensions. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_fill", _wrap_Histogram1D_fill, METH_VARARGS, (char *)"\n"
-		"fill(double x, double weight=1.0) -> int\n"
-		"Histogram1D_fill(Histogram1D self, double x) -> int\n"
-		"\n"
+	 { "Histogram1D_fill", _wrap_Histogram1D_fill, METH_VARARGS, "\n"
+		"Histogram1D_fill(Histogram1D self, double x, double weight=1.0) -> int\n"
 		"int Histogram1D::fill(double x, double weight=1.0)\n"
 		"\n"
 		"Increment bin with abscissa x with a weight. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinCenters", _wrap_Histogram1D_getBinCenters, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinCenters", _wrap_Histogram1D_getBinCenters, METH_O, "\n"
 		"Histogram1D_getBinCenters(Histogram1D self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > Histogram1D::getBinCenters() const\n"
 		"\n"
 		"returns vector of histogram bin centers \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinValues", _wrap_Histogram1D_getBinValues, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinValues", _wrap_Histogram1D_getBinValues, METH_O, "\n"
 		"Histogram1D_getBinValues(Histogram1D self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > Histogram1D::getBinValues() const\n"
 		"\n"
 		"returns vector of bin content (the value accumulated by bins) \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinErrors", _wrap_Histogram1D_getBinErrors, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinErrors", _wrap_Histogram1D_getBinErrors, METH_O, "\n"
 		"Histogram1D_getBinErrors(Histogram1D self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > Histogram1D::getBinErrors() const\n"
 		"\n"
 		"returns vector of bin errors \n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinCentersNumpy", _wrap_Histogram1D_getBinCentersNumpy, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinCentersNumpy", _wrap_Histogram1D_getBinCentersNumpy, METH_O, "\n"
 		"Histogram1D_getBinCentersNumpy(Histogram1D self) -> PyObject *\n"
-		"\n"
 		"PyObject * Histogram1D::getBinCentersNumpy() const\n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinValuesNumpy", _wrap_Histogram1D_getBinValuesNumpy, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinValuesNumpy", _wrap_Histogram1D_getBinValuesNumpy, METH_O, "\n"
 		"Histogram1D_getBinValuesNumpy(Histogram1D self) -> PyObject *\n"
-		"\n"
 		"PyObject * Histogram1D::getBinValuesNumpy() const\n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_getBinErrorsNumpy", _wrap_Histogram1D_getBinErrorsNumpy, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_getBinErrorsNumpy", _wrap_Histogram1D_getBinErrorsNumpy, METH_O, "\n"
 		"Histogram1D_getBinErrorsNumpy(Histogram1D self) -> PyObject *\n"
-		"\n"
 		"PyObject * Histogram1D::getBinErrorsNumpy() const\n"
 		"\n"
 		""},
-	 { (char *)"Histogram1D_crop", _wrap_Histogram1D_crop, METH_VARARGS, (char *)"\n"
+	 { "Histogram1D_crop", _wrap_Histogram1D_crop, METH_VARARGS, "\n"
 		"Histogram1D_crop(Histogram1D self, double xmin, double xmax) -> Histogram1D\n"
-		"\n"
 		"Histogram1D * Histogram1D::crop(double xmin, double xmax)\n"
 		"\n"
 		"Create new histogram by applying crop on axis. \n"
 		"\n"
 		""},
-	 { (char *)"delete_Histogram1D", _wrap_delete_Histogram1D, METH_VARARGS, (char *)"delete_Histogram1D(Histogram1D self)"},
-	 { (char *)"Histogram1D_swigregister", Histogram1D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Histogram2D", _wrap_new_Histogram2D, METH_VARARGS, (char *)"\n"
+	 { "delete_Histogram1D", _wrap_delete_Histogram1D, METH_O, "delete_Histogram1D(Histogram1D self)"},
+	 { "Histogram1D_swigregister", Histogram1D_swigregister, METH_O, NULL},
+	 { "Histogram1D_swiginit", Histogram1D_swiginit, METH_VARARGS, NULL},
+	 { "new_Histogram2D", _wrap_new_Histogram2D, METH_VARARGS, "\n"
 		"Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)\n"
 		"Histogram2D(int nbinsx, vdouble1d_t xbins, int nbinsy, vdouble1d_t ybins)\n"
 		"Histogram2D(IAxis axis_x, IAxis axis_y)\n"
 		"Histogram2D(IntensityData data)\n"
 		"new_Histogram2D(vdouble2d_t data) -> Histogram2D\n"
-		"\n"
 		"Histogram2D::Histogram2D(std::vector< std::vector< double >> data)\n"
 		"\n"
 		"Constructor for 2D histograms from numpy array (thanks to swig) \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_clone", _wrap_Histogram2D_clone, METH_VARARGS, (char *)"\n"
+	 { "Histogram2D_clone", _wrap_Histogram2D_clone, METH_O, "\n"
 		"Histogram2D_clone(Histogram2D self) -> Histogram2D\n"
-		"\n"
 		"Histogram2D * Histogram2D::clone() const\n"
 		"\n"
 		"Returns clone of other histogram. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_getRank", _wrap_Histogram2D_getRank, METH_VARARGS, (char *)"\n"
+	 { "Histogram2D_getRank", _wrap_Histogram2D_getRank, METH_O, "\n"
 		"Histogram2D_getRank(Histogram2D self) -> size_t\n"
-		"\n"
 		"size_t Histogram2D::getRank() const\n"
 		"\n"
 		"Returns the number of histogram dimensions. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_fill", _wrap_Histogram2D_fill, METH_VARARGS, (char *)"\n"
-		"fill(double x, double y, double weight=1.0) -> int\n"
-		"Histogram2D_fill(Histogram2D self, double x, double y) -> int\n"
-		"\n"
+	 { "Histogram2D_fill", _wrap_Histogram2D_fill, METH_VARARGS, "\n"
+		"Histogram2D_fill(Histogram2D self, double x, double y, double weight=1.0) -> int\n"
 		"int Histogram2D::fill(double x, double y, double weight=1.0)\n"
 		"\n"
 		"Increment bin with abscissa x and ordinate y with a weight. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_projectionX", _wrap_Histogram2D_projectionX, METH_VARARGS, (char *)"\n"
-		"projectionX() -> Histogram1D\n"
-		"projectionX(double yvalue) -> Histogram1D\n"
+	 { "Histogram2D_projectionX", _wrap_Histogram2D_projectionX, METH_VARARGS, "\n"
+		"Histogram2D_projectionX(Histogram2D self) -> Histogram1D\n"
+		"Histogram2D_projectionX(Histogram2D self, double yvalue) -> Histogram1D\n"
 		"Histogram2D_projectionX(Histogram2D self, double ylow, double yup) -> Histogram1D\n"
-		"\n"
 		"Histogram1D * Histogram2D::projectionX(double ylow, double yup)\n"
 		"\n"
 		"Project a 2D histogram into 1D histogram along X. The projection is made from all y-bins corresponding to ordinate between ylow and yup.\n"
@@ -133373,11 +129873,10 @@ static PyMethodDef SwigMethods[] = {
 		"upper edje on y-axis \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_projectionY", _wrap_Histogram2D_projectionY, METH_VARARGS, (char *)"\n"
-		"projectionY() -> Histogram1D\n"
-		"projectionY(double xvalue) -> Histogram1D\n"
+	 { "Histogram2D_projectionY", _wrap_Histogram2D_projectionY, METH_VARARGS, "\n"
+		"Histogram2D_projectionY(Histogram2D self) -> Histogram1D\n"
+		"Histogram2D_projectionY(Histogram2D self, double xvalue) -> Histogram1D\n"
 		"Histogram2D_projectionY(Histogram2D self, double xlow, double xup) -> Histogram1D\n"
-		"\n"
 		"Histogram1D * Histogram2D::projectionY(double xlow, double xup)\n"
 		"\n"
 		"Project a 2D histogram into 1D histogram along Y. The projection is made from all x-bins corresponding to abscissa between xlow and xup.\n"
@@ -133392,399 +129891,345 @@ static PyMethodDef SwigMethods[] = {
 		"upper edje on x-axis \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_crop", _wrap_Histogram2D_crop, METH_VARARGS, (char *)"\n"
+	 { "Histogram2D_crop", _wrap_Histogram2D_crop, METH_VARARGS, "\n"
 		"Histogram2D_crop(Histogram2D self, double xmin, double ymin, double xmax, double ymax) -> Histogram2D\n"
-		"\n"
 		"Histogram2D * Histogram2D::crop(double xmin, double ymin, double xmax, double ymax)\n"
 		"\n"
 		"Create new histogram by applying rectangular clip. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_setContent", _wrap_Histogram2D_setContent, METH_VARARGS, (char *)"\n"
+	 { "Histogram2D_setContent", _wrap_Histogram2D_setContent, METH_VARARGS, "\n"
 		"Histogram2D_setContent(Histogram2D self, vdouble2d_t data)\n"
-		"\n"
 		"void Histogram2D::setContent(const std::vector< std::vector< double >> &data)\n"
 		"\n"
 		"Sets the values in histograms channels from numpy array,. \n"
 		"\n"
 		""},
-	 { (char *)"Histogram2D_addContent", _wrap_Histogram2D_addContent, METH_VARARGS, (char *)"\n"
+	 { "Histogram2D_addContent", _wrap_Histogram2D_addContent, METH_VARARGS, "\n"
 		"Histogram2D_addContent(Histogram2D self, vdouble2d_t data)\n"
-		"\n"
 		"void Histogram2D::addContent(const std::vector< std::vector< double >> &data)\n"
 		"\n"
 		"Add to values in histograms channels from numpy array,. \n"
 		"\n"
 		""},
-	 { (char *)"delete_Histogram2D", _wrap_delete_Histogram2D, METH_VARARGS, (char *)"delete_Histogram2D(Histogram2D self)"},
-	 { (char *)"Histogram2D_swigregister", Histogram2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"AxisInfo_m_name_set", _wrap_AxisInfo_m_name_set, METH_VARARGS, (char *)"AxisInfo_m_name_set(AxisInfo self, std::string const & m_name)"},
-	 { (char *)"AxisInfo_m_name_get", _wrap_AxisInfo_m_name_get, METH_VARARGS, (char *)"AxisInfo_m_name_get(AxisInfo self) -> std::string const &"},
-	 { (char *)"AxisInfo_m_min_set", _wrap_AxisInfo_m_min_set, METH_VARARGS, (char *)"AxisInfo_m_min_set(AxisInfo self, double m_min)"},
-	 { (char *)"AxisInfo_m_min_get", _wrap_AxisInfo_m_min_get, METH_VARARGS, (char *)"AxisInfo_m_min_get(AxisInfo self) -> double"},
-	 { (char *)"AxisInfo_m_max_set", _wrap_AxisInfo_m_max_set, METH_VARARGS, (char *)"AxisInfo_m_max_set(AxisInfo self, double m_max)"},
-	 { (char *)"AxisInfo_m_max_get", _wrap_AxisInfo_m_max_get, METH_VARARGS, (char *)"AxisInfo_m_max_get(AxisInfo self) -> double"},
-	 { (char *)"new_AxisInfo", _wrap_new_AxisInfo, METH_VARARGS, (char *)"\n"
+	 { "delete_Histogram2D", _wrap_delete_Histogram2D, METH_O, "delete_Histogram2D(Histogram2D self)"},
+	 { "Histogram2D_swigregister", Histogram2D_swigregister, METH_O, NULL},
+	 { "Histogram2D_swiginit", Histogram2D_swiginit, METH_VARARGS, NULL},
+	 { "AxisInfo_m_name_set", _wrap_AxisInfo_m_name_set, METH_VARARGS, "AxisInfo_m_name_set(AxisInfo self, std::string const & m_name)"},
+	 { "AxisInfo_m_name_get", _wrap_AxisInfo_m_name_get, METH_O, "AxisInfo_m_name_get(AxisInfo self) -> std::string const &"},
+	 { "AxisInfo_m_min_set", _wrap_AxisInfo_m_min_set, METH_VARARGS, "AxisInfo_m_min_set(AxisInfo self, double m_min)"},
+	 { "AxisInfo_m_min_get", _wrap_AxisInfo_m_min_get, METH_O, "AxisInfo_m_min_get(AxisInfo self) -> double"},
+	 { "AxisInfo_m_max_set", _wrap_AxisInfo_m_max_set, METH_VARARGS, "AxisInfo_m_max_set(AxisInfo self, double m_max)"},
+	 { "AxisInfo_m_max_get", _wrap_AxisInfo_m_max_get, METH_O, "AxisInfo_m_max_get(AxisInfo self) -> double"},
+	 { "new_AxisInfo", _wrap_new_AxisInfo, METH_NOARGS, "\n"
 		"new_AxisInfo() -> AxisInfo\n"
 		"\n"
 		"\n"
-		"\n"
 		"Information about an axis in specific units. Can be used for plotting.\n"
 		"\n"
 		"C++ includes: SimulationResult.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_AxisInfo", _wrap_delete_AxisInfo, METH_VARARGS, (char *)"delete_AxisInfo(AxisInfo self)"},
-	 { (char *)"AxisInfo_swigregister", AxisInfo_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SimulationResult", _wrap_new_SimulationResult, METH_VARARGS, (char *)"\n"
+	 { "delete_AxisInfo", _wrap_delete_AxisInfo, METH_O, "delete_AxisInfo(AxisInfo self)"},
+	 { "AxisInfo_swigregister", AxisInfo_swigregister, METH_O, NULL},
+	 { "AxisInfo_swiginit", AxisInfo_swiginit, METH_VARARGS, NULL},
+	 { "new_SimulationResult", _wrap_new_SimulationResult, METH_VARARGS, "\n"
 		"SimulationResult()\n"
 		"SimulationResult(IntensityData data, IUnitConverter unit_converter)\n"
 		"SimulationResult(SimulationResult other)\n"
 		"new_SimulationResult(SimulationResult other) -> SimulationResult\n"
-		"\n"
 		"SimulationResult::SimulationResult(SimulationResult &&other)\n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_histogram2d", _wrap_SimulationResult_histogram2d, METH_VARARGS, (char *)"\n"
-		"histogram2d(AxesUnits units) -> Histogram2D\n"
-		"SimulationResult_histogram2d(SimulationResult self) -> Histogram2D\n"
-		"\n"
+	 { "SimulationResult_histogram2d", _wrap_SimulationResult_histogram2d, METH_VARARGS, "\n"
+		"SimulationResult_histogram2d(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> Histogram2D\n"
 		"Histogram2D * SimulationResult::histogram2d(AxesUnits units=AxesUnits::DEFAULT) const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_axisInfo", _wrap_SimulationResult_axisInfo, METH_VARARGS, (char *)"\n"
-		"axisInfo(AxesUnits units) -> swig_dummy_type_axisinfo_vector\n"
-		"SimulationResult_axisInfo(SimulationResult self) -> swig_dummy_type_axisinfo_vector\n"
-		"\n"
+	 { "SimulationResult_axisInfo", _wrap_SimulationResult_axisInfo, METH_VARARGS, "\n"
+		"SimulationResult_axisInfo(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> swig_dummy_type_axisinfo_vector\n"
 		"std::vector< AxisInfo > SimulationResult::axisInfo(AxesUnits units=AxesUnits::DEFAULT) const\n"
 		"\n"
 		"Provide  AxisInfo for each axis and the given units. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_converter", _wrap_SimulationResult_converter, METH_VARARGS, (char *)"\n"
+	 { "SimulationResult_converter", _wrap_SimulationResult_converter, METH_O, "\n"
 		"SimulationResult_converter(SimulationResult self) -> IUnitConverter\n"
-		"\n"
 		"const IUnitConverter & SimulationResult::converter() const\n"
 		"\n"
 		"Returns underlying unit converter. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_size", _wrap_SimulationResult_size, METH_VARARGS, (char *)"\n"
+	 { "SimulationResult_size", _wrap_SimulationResult_size, METH_O, "\n"
 		"SimulationResult_size(SimulationResult self) -> size_t\n"
-		"\n"
 		"size_t SimulationResult::size() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_array", _wrap_SimulationResult_array, METH_VARARGS, (char *)"\n"
-		"array(AxesUnits units) -> PyObject\n"
-		"SimulationResult_array(SimulationResult self) -> PyObject *\n"
-		"\n"
+	 { "SimulationResult_array", _wrap_SimulationResult_array, METH_VARARGS, "\n"
+		"SimulationResult_array(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> PyObject\n"
 		"PyObject * SimulationResult::array(AxesUnits units=AxesUnits::DEFAULT) const\n"
 		"\n"
 		"returns intensity data as Python numpy array \n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult_axis", _wrap_SimulationResult_axis, METH_VARARGS, (char *)"\n"
-		"axis(AxesUnits units) -> vdouble1d_t\n"
-		"axis() -> vdouble1d_t\n"
-		"axis(size_t i_axis, AxesUnits units) -> vdouble1d_t\n"
-		"SimulationResult_axis(SimulationResult self, size_t i_axis) -> vdouble1d_t\n"
-		"\n"
+	 { "SimulationResult_axis", _wrap_SimulationResult_axis, METH_VARARGS, "\n"
+		"SimulationResult_axis(SimulationResult self, AxesUnits units=AxesUnits::DEFAULT) -> vdouble1d_t\n"
+		"SimulationResult_axis(SimulationResult self, size_t i_axis, AxesUnits units=AxesUnits::DEFAULT) -> vdouble1d_t\n"
 		"std::vector< double > SimulationResult::axis(size_t i_axis, AxesUnits units=AxesUnits::DEFAULT) const\n"
 		"\n"
 		"Returns axis coordinates as a numpy array. With no parameters given returns coordinates of x-axis in default units. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationResult___getitem__", _wrap_SimulationResult___getitem__, METH_VARARGS, (char *)"SimulationResult___getitem__(SimulationResult self, unsigned int i) -> double"},
-	 { (char *)"SimulationResult___setitem__", _wrap_SimulationResult___setitem__, METH_VARARGS, (char *)"SimulationResult___setitem__(SimulationResult self, unsigned int i, double value) -> double"},
-	 { (char *)"delete_SimulationResult", _wrap_delete_SimulationResult, METH_VARARGS, (char *)"delete_SimulationResult(SimulationResult self)"},
-	 { (char *)"SimulationResult_swigregister", SimulationResult_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IBackground", _wrap_delete_IBackground, METH_VARARGS, (char *)"\n"
+	 { "SimulationResult___getitem__", _wrap_SimulationResult___getitem__, METH_VARARGS, "SimulationResult___getitem__(SimulationResult self, unsigned int i) -> double"},
+	 { "SimulationResult___setitem__", _wrap_SimulationResult___setitem__, METH_VARARGS, "SimulationResult___setitem__(SimulationResult self, unsigned int i, double value) -> double"},
+	 { "delete_SimulationResult", _wrap_delete_SimulationResult, METH_O, "delete_SimulationResult(SimulationResult self)"},
+	 { "SimulationResult_swigregister", SimulationResult_swigregister, METH_O, NULL},
+	 { "SimulationResult_swiginit", SimulationResult_swiginit, METH_VARARGS, NULL},
+	 { "delete_IBackground", _wrap_delete_IBackground, METH_O, "\n"
 		"delete_IBackground(IBackground self)\n"
-		"\n"
 		"IBackground::~IBackground()\n"
 		"\n"
 		""},
-	 { (char *)"IBackground_clone", _wrap_IBackground_clone, METH_VARARGS, (char *)"\n"
+	 { "IBackground_clone", _wrap_IBackground_clone, METH_O, "\n"
 		"IBackground_clone(IBackground self) -> IBackground\n"
-		"\n"
 		"virtual IBackground* IBackground::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IBackground_addBackGround", _wrap_IBackground_addBackGround, METH_VARARGS, (char *)"\n"
+	 { "IBackground_addBackGround", _wrap_IBackground_addBackGround, METH_VARARGS, "\n"
 		"IBackground_addBackGround(IBackground self, double element) -> double\n"
-		"\n"
 		"virtual double IBackground::addBackGround(double element) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IBackground_swigregister", IBackground_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ConstantBackground", _wrap_new_ConstantBackground, METH_VARARGS, (char *)"\n"
+	 { "IBackground_swigregister", IBackground_swigregister, METH_O, NULL},
+	 { "new_ConstantBackground", _wrap_new_ConstantBackground, METH_O, "\n"
 		"new_ConstantBackground(double background_value) -> ConstantBackground\n"
-		"\n"
 		"ConstantBackground::ConstantBackground(double background_value)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ConstantBackground", _wrap_delete_ConstantBackground, METH_VARARGS, (char *)"\n"
+	 { "delete_ConstantBackground", _wrap_delete_ConstantBackground, METH_O, "\n"
 		"delete_ConstantBackground(ConstantBackground self)\n"
-		"\n"
 		"ConstantBackground::~ConstantBackground()\n"
 		"\n"
 		""},
-	 { (char *)"ConstantBackground_clone", _wrap_ConstantBackground_clone, METH_VARARGS, (char *)"\n"
+	 { "ConstantBackground_clone", _wrap_ConstantBackground_clone, METH_O, "\n"
 		"ConstantBackground_clone(ConstantBackground self) -> ConstantBackground\n"
-		"\n"
 		"ConstantBackground * ConstantBackground::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"ConstantBackground_backgroundValue", _wrap_ConstantBackground_backgroundValue, METH_VARARGS, (char *)"\n"
+	 { "ConstantBackground_backgroundValue", _wrap_ConstantBackground_backgroundValue, METH_O, "\n"
 		"ConstantBackground_backgroundValue(ConstantBackground self) -> double\n"
-		"\n"
 		"double ConstantBackground::backgroundValue() const\n"
 		"\n"
 		""},
-	 { (char *)"ConstantBackground_accept", _wrap_ConstantBackground_accept, METH_VARARGS, (char *)"\n"
+	 { "ConstantBackground_accept", _wrap_ConstantBackground_accept, METH_VARARGS, "\n"
 		"ConstantBackground_accept(ConstantBackground self, INodeVisitor visitor)\n"
-		"\n"
 		"void ConstantBackground::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ConstantBackground_addBackGround", _wrap_ConstantBackground_addBackGround, METH_VARARGS, (char *)"\n"
+	 { "ConstantBackground_addBackGround", _wrap_ConstantBackground_addBackGround, METH_VARARGS, "\n"
 		"ConstantBackground_addBackGround(ConstantBackground self, double intensity) -> double\n"
-		"\n"
 		"double ConstantBackground::addBackGround(double intensity) const override final\n"
 		"\n"
 		""},
-	 { (char *)"ConstantBackground_swigregister", ConstantBackground_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IDetector_clone", _wrap_IDetector_clone, METH_VARARGS, (char *)"\n"
+	 { "ConstantBackground_swigregister", ConstantBackground_swigregister, METH_O, NULL},
+	 { "ConstantBackground_swiginit", ConstantBackground_swiginit, METH_VARARGS, NULL},
+	 { "IDetector_clone", _wrap_IDetector_clone, METH_O, "\n"
 		"IDetector_clone(IDetector self) -> IDetector\n"
-		"\n"
 		"IDetector* IDetector::clone() const override=0\n"
 		"\n"
 		""},
-	 { (char *)"delete_IDetector", _wrap_delete_IDetector, METH_VARARGS, (char *)"\n"
+	 { "delete_IDetector", _wrap_delete_IDetector, METH_O, "\n"
 		"delete_IDetector(IDetector self)\n"
-		"\n"
 		"IDetector::~IDetector()\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_init", _wrap_IDetector_init, METH_VARARGS, (char *)"\n"
-		"IDetector_init(IDetector self, Beam arg3)\n"
-		"\n"
+	 { "IDetector_init", _wrap_IDetector_init, METH_VARARGS, "\n"
+		"IDetector_init(IDetector self, Beam arg2)\n"
 		"virtual void IDetector::init(const Beam &)\n"
 		"\n"
 		"Inits detector with the beam settings. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_clear", _wrap_IDetector_clear, METH_VARARGS, (char *)"\n"
+	 { "IDetector_clear", _wrap_IDetector_clear, METH_O, "\n"
 		"IDetector_clear(IDetector self)\n"
-		"\n"
 		"void IDetector::clear()\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_addAxis", _wrap_IDetector_addAxis, METH_VARARGS, (char *)"\n"
+	 { "IDetector_addAxis", _wrap_IDetector_addAxis, METH_VARARGS, "\n"
 		"IDetector_addAxis(IDetector self, IAxis axis)\n"
-		"\n"
 		"void IDetector::addAxis(const IAxis &axis)\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_getAxis", _wrap_IDetector_getAxis, METH_VARARGS, (char *)"\n"
+	 { "IDetector_getAxis", _wrap_IDetector_getAxis, METH_VARARGS, "\n"
 		"IDetector_getAxis(IDetector self, size_t index) -> IAxis\n"
-		"\n"
 		"const IAxis & IDetector::getAxis(size_t index) const\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_dimension", _wrap_IDetector_dimension, METH_VARARGS, (char *)"\n"
+	 { "IDetector_dimension", _wrap_IDetector_dimension, METH_O, "\n"
 		"IDetector_dimension(IDetector self) -> size_t\n"
-		"\n"
 		"size_t IDetector::dimension() const\n"
 		"\n"
 		"Returns actual dimensionality of the detector (number of defined axes) \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_axisBinIndex", _wrap_IDetector_axisBinIndex, METH_VARARGS, (char *)"\n"
+	 { "IDetector_axisBinIndex", _wrap_IDetector_axisBinIndex, METH_VARARGS, "\n"
 		"IDetector_axisBinIndex(IDetector self, size_t index, size_t selected_axis) -> size_t\n"
-		"\n"
 		"size_t IDetector::axisBinIndex(size_t index, size_t selected_axis) const\n"
 		"\n"
 		"Calculate axis index for given global index. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_totalSize", _wrap_IDetector_totalSize, METH_VARARGS, (char *)"\n"
+	 { "IDetector_totalSize", _wrap_IDetector_totalSize, METH_O, "\n"
 		"IDetector_totalSize(IDetector self) -> size_t\n"
-		"\n"
 		"size_t IDetector::totalSize() const\n"
 		"\n"
 		"Returns total number of pixels. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_detectorMask", _wrap_IDetector_detectorMask, METH_VARARGS, (char *)"\n"
+	 { "IDetector_detectorMask", _wrap_IDetector_detectorMask, METH_O, "\n"
 		"IDetector_detectorMask(IDetector self) -> DetectorMask\n"
-		"\n"
 		"virtual const DetectorMask* IDetector::detectorMask() const =0\n"
 		"\n"
 		"Returns detector masks container. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_setAnalyzerProperties", _wrap_IDetector_setAnalyzerProperties, METH_VARARGS, (char *)"\n"
+	 { "IDetector_setAnalyzerProperties", _wrap_IDetector_setAnalyzerProperties, METH_VARARGS, "\n"
 		"IDetector_setAnalyzerProperties(IDetector self, kvector_t direction, double efficiency, double total_transmission)\n"
-		"\n"
 		"void IDetector::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)\n"
 		"\n"
 		"Sets the polarization analyzer characteristics of the detector. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_setDetectorResolution", _wrap_IDetector_setDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetector_setDetectorResolution", _wrap_IDetector_setDetectorResolution, METH_VARARGS, "\n"
 		"IDetector_setDetectorResolution(IDetector self, IDetectorResolution p_detector_resolution)\n"
-		"\n"
 		"void IDetector::setDetectorResolution(const IDetectorResolution &p_detector_resolution)\n"
 		"\n"
 		"Sets the detector resolution. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_setResolutionFunction", _wrap_IDetector_setResolutionFunction, METH_VARARGS, (char *)"\n"
+	 { "IDetector_setResolutionFunction", _wrap_IDetector_setResolutionFunction, METH_VARARGS, "\n"
 		"IDetector_setResolutionFunction(IDetector self, IResolutionFunction2D resFunc)\n"
-		"\n"
 		"void IDetector::setResolutionFunction(const IResolutionFunction2D &resFunc)\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_applyDetectorResolution", _wrap_IDetector_applyDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetector_applyDetectorResolution", _wrap_IDetector_applyDetectorResolution, METH_VARARGS, "\n"
 		"IDetector_applyDetectorResolution(IDetector self, IntensityData p_intensity_map)\n"
-		"\n"
 		"void IDetector::applyDetectorResolution(OutputData< double > *p_intensity_map) const\n"
 		"\n"
 		"Applies the detector resolution to the given intensity maps. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_removeDetectorResolution", _wrap_IDetector_removeDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetector_removeDetectorResolution", _wrap_IDetector_removeDetectorResolution, METH_O, "\n"
 		"IDetector_removeDetectorResolution(IDetector self)\n"
-		"\n"
 		"void IDetector::removeDetectorResolution()\n"
 		"\n"
 		"Removes detector resolution function. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_detectorResolution", _wrap_IDetector_detectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetector_detectorResolution", _wrap_IDetector_detectorResolution, METH_O, "\n"
 		"IDetector_detectorResolution(IDetector self) -> IDetectorResolution\n"
-		"\n"
 		"const IDetectorResolution * IDetector::detectorResolution() const\n"
 		"\n"
 		"Returns a pointer to detector resolution object. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_regionOfInterest", _wrap_IDetector_regionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "IDetector_regionOfInterest", _wrap_IDetector_regionOfInterest, METH_O, "\n"
 		"IDetector_regionOfInterest(IDetector self) -> RegionOfInterest const *\n"
-		"\n"
 		"virtual const RegionOfInterest* IDetector::regionOfInterest() const =0\n"
 		"\n"
 		"Returns region of interest if exists. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_resetRegionOfInterest", _wrap_IDetector_resetRegionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "IDetector_resetRegionOfInterest", _wrap_IDetector_resetRegionOfInterest, METH_O, "\n"
 		"IDetector_resetRegionOfInterest(IDetector self)\n"
-		"\n"
 		"virtual void IDetector::resetRegionOfInterest()=0\n"
 		"\n"
 		"Resets region of interest making whole detector plane available for the simulation. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_detectionProperties", _wrap_IDetector_detectionProperties, METH_VARARGS, (char *)"\n"
+	 { "IDetector_detectionProperties", _wrap_IDetector_detectionProperties, METH_O, "\n"
 		"IDetector_detectionProperties(IDetector self) -> DetectionProperties const &\n"
-		"\n"
 		"const DetectionProperties& IDetector::detectionProperties() const\n"
 		"\n"
 		"Returns detection properties. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_createDetectorIntensity", _wrap_IDetector_createDetectorIntensity, METH_VARARGS, (char *)"\n"
+	 { "IDetector_createDetectorIntensity", _wrap_IDetector_createDetectorIntensity, METH_VARARGS, "\n"
 		"IDetector_createDetectorIntensity(IDetector self, std::vector< SimulationElement,std::allocator< SimulationElement > > const & elements) -> IntensityData\n"
-		"\n"
 		"OutputData< double > * IDetector::createDetectorIntensity(const std::vector< SimulationElement > &elements) const\n"
 		"\n"
 		"Returns new intensity map with detector resolution applied. Map will be cropped to ROI if ROI is present. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_defaultAxesUnits", _wrap_IDetector_defaultAxesUnits, METH_VARARGS, (char *)"\n"
+	 { "IDetector_defaultAxesUnits", _wrap_IDetector_defaultAxesUnits, METH_O, "\n"
 		"IDetector_defaultAxesUnits(IDetector self) -> AxesUnits\n"
-		"\n"
 		"virtual AxesUnits IDetector::defaultAxesUnits() const\n"
 		"\n"
 		"Return default axes units. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_numberOfSimulationElements", _wrap_IDetector_numberOfSimulationElements, METH_VARARGS, (char *)"\n"
+	 { "IDetector_numberOfSimulationElements", _wrap_IDetector_numberOfSimulationElements, METH_O, "\n"
 		"IDetector_numberOfSimulationElements(IDetector self) -> size_t\n"
-		"\n"
 		"size_t IDetector::numberOfSimulationElements() const\n"
 		"\n"
 		"Returns number of simulation elements. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_getChildren", _wrap_IDetector_getChildren, METH_VARARGS, (char *)"\n"
+	 { "IDetector_getChildren", _wrap_IDetector_getChildren, METH_O, "\n"
 		"IDetector_getChildren(IDetector self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > IDetector::getChildren() const override\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"IDetector_iterate", _wrap_IDetector_iterate, METH_VARARGS, (char *)"\n"
-		"iterate(std::function< void (IDetector::const_iterator) > func, bool visit_masks=False)\n"
-		"IDetector_iterate(IDetector self, std::function< void (IDetector::const_iterator) > func)\n"
-		"\n"
+	 { "IDetector_iterate", _wrap_IDetector_iterate, METH_VARARGS, "\n"
+		"IDetector_iterate(IDetector self, std::function< void (IDetector::const_iterator) > func, bool visit_masks=False)\n"
 		"void IDetector::iterate(std::function< void(const_iterator)> func, bool visit_masks=false) const\n"
 		"\n"
 		""},
-	 { (char *)"IDetector_swigregister", IDetector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IDetector2D_clone", _wrap_IDetector2D_clone, METH_VARARGS, (char *)"\n"
+	 { "IDetector_swigregister", IDetector_swigregister, METH_O, NULL},
+	 { "IDetector2D_clone", _wrap_IDetector2D_clone, METH_O, "\n"
 		"IDetector2D_clone(IDetector2D self) -> IDetector2D\n"
-		"\n"
 		"IDetector2D* IDetector2D::clone() const override=0\n"
 		"\n"
 		""},
-	 { (char *)"delete_IDetector2D", _wrap_delete_IDetector2D, METH_VARARGS, (char *)"\n"
+	 { "delete_IDetector2D", _wrap_delete_IDetector2D, METH_O, "\n"
 		"delete_IDetector2D(IDetector2D self)\n"
-		"\n"
 		"IDetector2D::~IDetector2D()\n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_setDetectorParameters", _wrap_IDetector2D_setDetectorParameters, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_setDetectorParameters", _wrap_IDetector2D_setDetectorParameters, METH_VARARGS, "\n"
 		"IDetector2D_setDetectorParameters(IDetector2D self, size_t n_x, double x_min, double x_max, size_t n_y, double y_min, double y_max)\n"
-		"\n"
 		"void IDetector2D::setDetectorParameters(size_t n_x, double x_min, double x_max, size_t n_y, double y_min, double y_max)\n"
 		"\n"
 		"Sets detector parameters using angle ranges. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_setDetectorAxes", _wrap_IDetector2D_setDetectorAxes, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_setDetectorAxes", _wrap_IDetector2D_setDetectorAxes, METH_VARARGS, "\n"
 		"IDetector2D_setDetectorAxes(IDetector2D self, IAxis axis0, IAxis axis1)\n"
-		"\n"
 		"void IDetector2D::setDetectorAxes(const IAxis &axis0, const IAxis &axis1)\n"
 		"\n"
 		"Sets detector parameters using axes. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_removeMasks", _wrap_IDetector2D_removeMasks, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_removeMasks", _wrap_IDetector2D_removeMasks, METH_O, "\n"
 		"IDetector2D_removeMasks(IDetector2D self)\n"
-		"\n"
 		"void IDetector2D::removeMasks()\n"
 		"\n"
 		"Removes all masks from the detector. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_detectorMask", _wrap_IDetector2D_detectorMask, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_detectorMask", _wrap_IDetector2D_detectorMask, METH_O, "\n"
 		"IDetector2D_detectorMask(IDetector2D self) -> DetectorMask\n"
-		"\n"
 		"const DetectorMask * IDetector2D::detectorMask() const override\n"
 		"\n"
 		"Returns detector masks container. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_addMask", _wrap_IDetector2D_addMask, METH_VARARGS, (char *)"\n"
-		"addMask(IShape2D shape, bool mask_value=True)\n"
-		"IDetector2D_addMask(IDetector2D self, IShape2D shape)\n"
-		"\n"
+	 { "IDetector2D_addMask", _wrap_IDetector2D_addMask, METH_VARARGS, "\n"
+		"IDetector2D_addMask(IDetector2D self, IShape2D shape, bool mask_value=True)\n"
 		"void IDetector2D::addMask(const IShape2D &shape, bool mask_value=true)\n"
 		"\n"
 		"Adds mask of given shape to the stack of detector masks. The mask value 'true' means that the channel will be excluded from the simulation. The mask which is added last has priority.\n"
@@ -133799,275 +130244,240 @@ static PyMethodDef SwigMethods[] = {
 		"The value of mask \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_maskAll", _wrap_IDetector2D_maskAll, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_maskAll", _wrap_IDetector2D_maskAll, METH_O, "\n"
 		"IDetector2D_maskAll(IDetector2D self)\n"
-		"\n"
 		"void IDetector2D::maskAll()\n"
 		"\n"
 		"Put the mask for all detector channels (i.e. exclude whole detector from the analysis) \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_regionOfInterest", _wrap_IDetector2D_regionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_regionOfInterest", _wrap_IDetector2D_regionOfInterest, METH_O, "\n"
 		"IDetector2D_regionOfInterest(IDetector2D self) -> RegionOfInterest const *\n"
-		"\n"
 		"const RegionOfInterest * IDetector2D::regionOfInterest() const override\n"
 		"\n"
 		"Returns region of interest if exists. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_setRegionOfInterest", _wrap_IDetector2D_setRegionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_setRegionOfInterest", _wrap_IDetector2D_setRegionOfInterest, METH_VARARGS, "\n"
 		"IDetector2D_setRegionOfInterest(IDetector2D self, double xlow, double ylow, double xup, double yup)\n"
-		"\n"
 		"void IDetector2D::setRegionOfInterest(double xlow, double ylow, double xup, double yup)\n"
 		"\n"
 		"Sets rectangular region of interest with lower left and upper right corners defined. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_resetRegionOfInterest", _wrap_IDetector2D_resetRegionOfInterest, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_resetRegionOfInterest", _wrap_IDetector2D_resetRegionOfInterest, METH_O, "\n"
 		"IDetector2D_resetRegionOfInterest(IDetector2D self)\n"
-		"\n"
 		"void IDetector2D::resetRegionOfInterest() override\n"
 		"\n"
 		"Resets region of interest making whole detector plane available for the simulation. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_active_indices", _wrap_IDetector2D_active_indices, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_active_indices", _wrap_IDetector2D_active_indices, METH_O, "\n"
 		"IDetector2D_active_indices(IDetector2D self) -> std::vector< size_t,std::allocator< size_t > >\n"
-		"\n"
 		"std::vector< size_t > IDetector2D::active_indices() const\n"
 		"\n"
 		"Returns vector of unmasked detector indices. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_createPixel", _wrap_IDetector2D_createPixel, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_createPixel", _wrap_IDetector2D_createPixel, METH_VARARGS, "\n"
 		"IDetector2D_createPixel(IDetector2D self, size_t index) -> IPixel\n"
-		"\n"
 		"virtual IPixel* IDetector2D::createPixel(size_t index) const =0\n"
 		"\n"
 		"Create an  IPixel for the given  OutputData object and index. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_getIndexOfSpecular", _wrap_IDetector2D_getIndexOfSpecular, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_getIndexOfSpecular", _wrap_IDetector2D_getIndexOfSpecular, METH_VARARGS, "\n"
 		"IDetector2D_getIndexOfSpecular(IDetector2D self, Beam beam) -> size_t\n"
-		"\n"
 		"virtual size_t IDetector2D::getIndexOfSpecular(const Beam &beam) const =0\n"
 		"\n"
 		"Returns index of pixel that contains the specular wavevector. If no pixel contains this specular wavevector, the number of pixels is returned. This corresponds to an overflow index. \n"
 		"\n"
 		""},
-	 { (char *)"IDetector2D_swigregister", IDetector2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IDetectorResolution", _wrap_delete_IDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetector2D_swigregister", IDetector2D_swigregister, METH_O, NULL},
+	 { "delete_IDetectorResolution", _wrap_delete_IDetectorResolution, METH_O, "\n"
 		"delete_IDetectorResolution(IDetectorResolution self)\n"
-		"\n"
 		"virtual IDetectorResolution::~IDetectorResolution()\n"
 		"\n"
 		""},
-	 { (char *)"IDetectorResolution_applyDetectorResolution", _wrap_IDetectorResolution_applyDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "IDetectorResolution_applyDetectorResolution", _wrap_IDetectorResolution_applyDetectorResolution, METH_VARARGS, "\n"
 		"IDetectorResolution_applyDetectorResolution(IDetectorResolution self, IntensityData p_intensity_map)\n"
-		"\n"
 		"virtual void IDetectorResolution::applyDetectorResolution(OutputData< double > *p_intensity_map) const =0\n"
 		"\n"
 		"Apply the resolution function to the intensity data. \n"
 		"\n"
 		""},
-	 { (char *)"IDetectorResolution_clone", _wrap_IDetectorResolution_clone, METH_VARARGS, (char *)"\n"
+	 { "IDetectorResolution_clone", _wrap_IDetectorResolution_clone, METH_O, "\n"
 		"IDetectorResolution_clone(IDetectorResolution self) -> IDetectorResolution\n"
-		"\n"
 		"virtual IDetectorResolution* IDetectorResolution::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IDetectorResolution_swigregister", IDetectorResolution_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IInterferenceFunction", _wrap_new_IInterferenceFunction, METH_VARARGS, (char *)"\n"
+	 { "IDetectorResolution_swigregister", IDetectorResolution_swigregister, METH_O, NULL},
+	 { "new_IInterferenceFunction", _wrap_new_IInterferenceFunction, METH_VARARGS, "\n"
 		"IInterferenceFunction()\n"
-		"new_IInterferenceFunction(PyObject * arg2, IInterferenceFunction other) -> IInterferenceFunction\n"
-		"\n"
+		"new_IInterferenceFunction(PyObject * _self, IInterferenceFunction other) -> IInterferenceFunction\n"
 		"IInterferenceFunction::IInterferenceFunction(const IInterferenceFunction &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IInterferenceFunction", _wrap_delete_IInterferenceFunction, METH_VARARGS, (char *)"\n"
+	 { "delete_IInterferenceFunction", _wrap_delete_IInterferenceFunction, METH_O, "\n"
 		"delete_IInterferenceFunction(IInterferenceFunction self)\n"
-		"\n"
 		"IInterferenceFunction::~IInterferenceFunction()\n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_clone", _wrap_IInterferenceFunction_clone, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_clone", _wrap_IInterferenceFunction_clone, METH_O, "\n"
 		"IInterferenceFunction_clone(IInterferenceFunction self) -> IInterferenceFunction\n"
-		"\n"
 		"virtual IInterferenceFunction* IInterferenceFunction::clone() const =0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_accept", _wrap_IInterferenceFunction_accept, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_accept", _wrap_IInterferenceFunction_accept, METH_VARARGS, "\n"
 		"IInterferenceFunction_accept(IInterferenceFunction self, INodeVisitor visitor)\n"
-		"\n"
 		"virtual void IInterferenceFunction::accept(INodeVisitor *visitor) const =0\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_evaluate", _wrap_IInterferenceFunction_evaluate, METH_VARARGS, (char *)"\n"
-		"evaluate(kvector_t q, double outer_iff=1.0) -> double\n"
-		"IInterferenceFunction_evaluate(IInterferenceFunction self, kvector_t q) -> double\n"
-		"\n"
+	 { "IInterferenceFunction_evaluate", _wrap_IInterferenceFunction_evaluate, METH_VARARGS, "\n"
+		"IInterferenceFunction_evaluate(IInterferenceFunction self, kvector_t q, double outer_iff=1.0) -> double\n"
 		"double IInterferenceFunction::evaluate(const kvector_t q, double outer_iff=1.0) const\n"
 		"\n"
 		"Evaluates the interference function for a given wavevector transfer. \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_setPositionVariance", _wrap_IInterferenceFunction_setPositionVariance, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_setPositionVariance", _wrap_IInterferenceFunction_setPositionVariance, METH_VARARGS, "\n"
 		"IInterferenceFunction_setPositionVariance(IInterferenceFunction self, double var)\n"
-		"\n"
 		"void IInterferenceFunction::setPositionVariance(double var)\n"
 		"\n"
 		"Sets the variance of the position for the calculation of the DW factor It is defined as the variance in each relevant dimension \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_positionVariance", _wrap_IInterferenceFunction_positionVariance, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_positionVariance", _wrap_IInterferenceFunction_positionVariance, METH_O, "\n"
 		"IInterferenceFunction_positionVariance(IInterferenceFunction self) -> double\n"
-		"\n"
 		"double IInterferenceFunction::positionVariance() const\n"
 		"\n"
 		"Returns the position variance. \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_getParticleDensity", _wrap_IInterferenceFunction_getParticleDensity, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_getParticleDensity", _wrap_IInterferenceFunction_getParticleDensity, METH_O, "\n"
 		"IInterferenceFunction_getParticleDensity(IInterferenceFunction self) -> double\n"
-		"\n"
 		"virtual double IInterferenceFunction::getParticleDensity() const\n"
 		"\n"
 		"If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_supportsMultilayer", _wrap_IInterferenceFunction_supportsMultilayer, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_supportsMultilayer", _wrap_IInterferenceFunction_supportsMultilayer, METH_O, "\n"
 		"IInterferenceFunction_supportsMultilayer(IInterferenceFunction self) -> bool\n"
-		"\n"
 		"virtual bool IInterferenceFunction::supportsMultilayer() const\n"
 		"\n"
 		"Indicates if this interference function can be used with a multilayer (DWBA mode) \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_DWfactor", _wrap_IInterferenceFunction_DWfactor, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_DWfactor", _wrap_IInterferenceFunction_DWfactor, METH_VARARGS, "\n"
 		"IInterferenceFunction_DWfactor(IInterferenceFunction self, kvector_t q) -> double\n"
-		"\n"
 		"double IInterferenceFunction::DWfactor(kvector_t q) const\n"
 		"\n"
 		"Evaluates the Debye-Waller factor for a given wavevector transfer. \n"
 		"\n"
 		""},
-	 { (char *)"IInterferenceFunction_iff_without_dw", _wrap_IInterferenceFunction_iff_without_dw, METH_VARARGS, (char *)"IInterferenceFunction_iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"},
-	 { (char *)"disown_IInterferenceFunction", _wrap_disown_IInterferenceFunction, METH_VARARGS, NULL},
-	 { (char *)"IInterferenceFunction_swigregister", IInterferenceFunction_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_ILayout", _wrap_delete_ILayout, METH_VARARGS, (char *)"\n"
+	 { "IInterferenceFunction_iff_without_dw", _wrap_IInterferenceFunction_iff_without_dw, METH_VARARGS, "IInterferenceFunction_iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"},
+	 { "disown_IInterferenceFunction", _wrap_disown_IInterferenceFunction, METH_O, NULL},
+	 { "IInterferenceFunction_swigregister", IInterferenceFunction_swigregister, METH_O, NULL},
+	 { "IInterferenceFunction_swiginit", IInterferenceFunction_swiginit, METH_VARARGS, NULL},
+	 { "delete_ILayout", _wrap_delete_ILayout, METH_O, "\n"
 		"delete_ILayout(ILayout self)\n"
-		"\n"
 		"ILayout::~ILayout()\n"
 		"\n"
 		""},
-	 { (char *)"ILayout_clone", _wrap_ILayout_clone, METH_VARARGS, (char *)"\n"
+	 { "ILayout_clone", _wrap_ILayout_clone, METH_O, "\n"
 		"ILayout_clone(ILayout self) -> ILayout\n"
-		"\n"
 		"virtual ILayout* ILayout::clone() const =0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_accept", _wrap_ILayout_accept, METH_VARARGS, (char *)"\n"
+	 { "ILayout_accept", _wrap_ILayout_accept, METH_VARARGS, "\n"
 		"ILayout_accept(ILayout self, INodeVisitor visitor)\n"
-		"\n"
 		"virtual void ILayout::accept(INodeVisitor *visitor) const =0\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_particles", _wrap_ILayout_particles, METH_VARARGS, (char *)"\n"
+	 { "ILayout_particles", _wrap_ILayout_particles, METH_O, "\n"
 		"ILayout_particles(ILayout self) -> SafePointerVector< IParticle >\n"
-		"\n"
 		"virtual SafePointerVector<IParticle> ILayout::particles() const =0\n"
 		"\n"
 		"Returns information on all particles (type and abundance) and generates new particles if an  IAbstractParticle denotes a collection \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_interferenceFunction", _wrap_ILayout_interferenceFunction, METH_VARARGS, (char *)"\n"
+	 { "ILayout_interferenceFunction", _wrap_ILayout_interferenceFunction, METH_O, "\n"
 		"ILayout_interferenceFunction(ILayout self) -> IInterferenceFunction\n"
-		"\n"
 		"virtual const IInterferenceFunction* ILayout::interferenceFunction() const =0\n"
 		"\n"
 		"Returns the interference function. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_getTotalAbundance", _wrap_ILayout_getTotalAbundance, METH_VARARGS, (char *)"\n"
+	 { "ILayout_getTotalAbundance", _wrap_ILayout_getTotalAbundance, METH_O, "\n"
 		"ILayout_getTotalAbundance(ILayout self) -> double\n"
-		"\n"
 		"virtual double ILayout::getTotalAbundance() const =0\n"
 		"\n"
 		"Get total abundance of all particles. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_totalParticleSurfaceDensity", _wrap_ILayout_totalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
+	 { "ILayout_totalParticleSurfaceDensity", _wrap_ILayout_totalParticleSurfaceDensity, METH_O, "\n"
 		"ILayout_totalParticleSurfaceDensity(ILayout self) -> double\n"
-		"\n"
 		"virtual double ILayout::totalParticleSurfaceDensity() const =0\n"
 		"\n"
 		"Returns surface density of all particles. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_setTotalParticleSurfaceDensity", _wrap_ILayout_setTotalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
+	 { "ILayout_setTotalParticleSurfaceDensity", _wrap_ILayout_setTotalParticleSurfaceDensity, METH_VARARGS, "\n"
 		"ILayout_setTotalParticleSurfaceDensity(ILayout self, double particle_density)\n"
-		"\n"
 		"virtual void ILayout::setTotalParticleSurfaceDensity(double particle_density)=0\n"
 		"\n"
 		"Sets surface density of all particles. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_weight", _wrap_ILayout_weight, METH_VARARGS, (char *)"\n"
+	 { "ILayout_weight", _wrap_ILayout_weight, METH_O, "\n"
 		"ILayout_weight(ILayout self) -> double\n"
-		"\n"
 		"double ILayout::weight() const\n"
 		"\n"
 		"Returns the relative weight of this layout. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_setWeight", _wrap_ILayout_setWeight, METH_VARARGS, (char *)"\n"
+	 { "ILayout_setWeight", _wrap_ILayout_setWeight, METH_VARARGS, "\n"
 		"ILayout_setWeight(ILayout self, double weight)\n"
-		"\n"
 		"void ILayout::setWeight(double weight)\n"
 		"\n"
 		"Sets the relative weight of this layout. \n"
 		"\n"
 		""},
-	 { (char *)"ILayout_swigregister", ILayout_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IAbstractParticle", _wrap_delete_IAbstractParticle, METH_VARARGS, (char *)"\n"
+	 { "ILayout_swigregister", ILayout_swigregister, METH_O, NULL},
+	 { "delete_IAbstractParticle", _wrap_delete_IAbstractParticle, METH_O, "\n"
 		"delete_IAbstractParticle(IAbstractParticle self)\n"
-		"\n"
 		"IAbstractParticle::~IAbstractParticle()\n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_clone", _wrap_IAbstractParticle_clone, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_clone", _wrap_IAbstractParticle_clone, METH_O, "\n"
 		"IAbstractParticle_clone(IAbstractParticle self) -> IAbstractParticle\n"
-		"\n"
 		"virtual IAbstractParticle* IAbstractParticle::clone() const =0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_accept", _wrap_IAbstractParticle_accept, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_accept", _wrap_IAbstractParticle_accept, METH_VARARGS, "\n"
 		"IAbstractParticle_accept(IAbstractParticle self, INodeVisitor visitor)\n"
-		"\n"
 		"void IAbstractParticle::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_abundance", _wrap_IAbstractParticle_abundance, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_abundance", _wrap_IAbstractParticle_abundance, METH_O, "\n"
 		"IAbstractParticle_abundance(IAbstractParticle self) -> double\n"
-		"\n"
 		"double IAbstractParticle::abundance() const\n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_setAbundance", _wrap_IAbstractParticle_setAbundance, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_setAbundance", _wrap_IAbstractParticle_setAbundance, METH_VARARGS, "\n"
 		"IAbstractParticle_setAbundance(IAbstractParticle self, double abundance)\n"
-		"\n"
 		"void IAbstractParticle::setAbundance(double abundance)\n"
 		"\n"
 		"Sets particle abundance.\n"
@@ -134079,126 +130489,111 @@ static PyMethodDef SwigMethods[] = {
 		"proportion of this type of particles normalized to the total number of particles in the layout. \n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_translate", _wrap_IAbstractParticle_translate, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_translate", _wrap_IAbstractParticle_translate, METH_VARARGS, "\n"
 		"IAbstractParticle_translate(IAbstractParticle self, kvector_t translation)\n"
-		"\n"
 		"virtual void IAbstractParticle::translate(kvector_t translation)=0\n"
 		"\n"
 		"Translates the particle with the given vector. \n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_rotate", _wrap_IAbstractParticle_rotate, METH_VARARGS, (char *)"\n"
+	 { "IAbstractParticle_rotate", _wrap_IAbstractParticle_rotate, METH_VARARGS, "\n"
 		"IAbstractParticle_rotate(IAbstractParticle self, IRotation rotation)\n"
-		"\n"
 		"virtual void IAbstractParticle::rotate(const IRotation &rotation)=0\n"
 		"\n"
 		"Applies the given rotation to the particle. \n"
 		"\n"
 		""},
-	 { (char *)"IAbstractParticle_swigregister", IAbstractParticle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IParameterReal_clone", _wrap_IParameterReal_clone, METH_VARARGS, (char *)"\n"
-		"clone(std::string const & new_name) -> IParameterReal\n"
-		"IParameterReal_clone(IParameterReal self) -> IParameterReal\n"
-		"\n"
+	 { "IAbstractParticle_swigregister", IAbstractParticle_swigregister, METH_O, NULL},
+	 { "IParameterReal_clone", _wrap_IParameterReal_clone, METH_VARARGS, "\n"
+		"IParameterReal_clone(IParameterReal self, std::string const & new_name=\"\") -> IParameterReal\n"
 		"virtual IParameter* IParameter< T >::clone(const std::string &new_name=\"\") const =0\n"
 		"\n"
 		""},
-	 { (char *)"IParameterReal_isNull", _wrap_IParameterReal_isNull, METH_VARARGS, (char *)"\n"
+	 { "IParameterReal_isNull", _wrap_IParameterReal_isNull, METH_O, "\n"
 		"IParameterReal_isNull(IParameterReal self) -> bool\n"
-		"\n"
 		"virtual bool IParameter< T >::isNull() const\n"
 		"\n"
 		"Returns true if wrapped parameter was not initialized with proper real value. \n"
 		"\n"
 		""},
-	 { (char *)"IParameterReal_getData", _wrap_IParameterReal_getData, METH_VARARGS, (char *)"\n"
+	 { "IParameterReal_getData", _wrap_IParameterReal_getData, METH_O, "\n"
 		"IParameterReal_getData(IParameterReal self) -> double &\n"
-		"\n"
 		"T& IParameter< T >::getData() const\n"
 		"\n"
 		""},
-	 { (char *)"IParameterReal_setData", _wrap_IParameterReal_setData, METH_VARARGS, (char *)"\n"
+	 { "IParameterReal_setData", _wrap_IParameterReal_setData, METH_VARARGS, "\n"
 		"IParameterReal_setData(IParameterReal self, double & data)\n"
-		"\n"
 		"void IParameter< T >::setData(T &data)\n"
 		"\n"
 		""},
-	 { (char *)"IParameterReal_hasSameData", _wrap_IParameterReal_hasSameData, METH_VARARGS, (char *)"\n"
+	 { "IParameterReal_hasSameData", _wrap_IParameterReal_hasSameData, METH_VARARGS, "\n"
 		"IParameterReal_hasSameData(IParameterReal self, IParameterReal other) -> bool\n"
-		"\n"
 		"bool IParameter< T >::hasSameData(const IParameter &other)\n"
 		"\n"
 		"Returns true if two parameters are pointing to the same raw data. \n"
 		"\n"
 		""},
-	 { (char *)"delete_IParameterReal", _wrap_delete_IParameterReal, METH_VARARGS, (char *)"delete_IParameterReal(IParameterReal self)"},
-	 { (char *)"IParameterReal_swigregister", IParameterReal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"ParticleLimits_m_bottom_set", _wrap_ParticleLimits_m_bottom_set, METH_VARARGS, (char *)"ParticleLimits_m_bottom_set(ParticleLimits self, double m_bottom)"},
-	 { (char *)"ParticleLimits_m_bottom_get", _wrap_ParticleLimits_m_bottom_get, METH_VARARGS, (char *)"ParticleLimits_m_bottom_get(ParticleLimits self) -> double"},
-	 { (char *)"ParticleLimits_m_top_set", _wrap_ParticleLimits_m_top_set, METH_VARARGS, (char *)"ParticleLimits_m_top_set(ParticleLimits self, double m_top)"},
-	 { (char *)"ParticleLimits_m_top_get", _wrap_ParticleLimits_m_top_get, METH_VARARGS, (char *)"ParticleLimits_m_top_get(ParticleLimits self) -> double"},
-	 { (char *)"new_ParticleLimits", _wrap_new_ParticleLimits, METH_VARARGS, (char *)"\n"
+	 { "delete_IParameterReal", _wrap_delete_IParameterReal, METH_O, "delete_IParameterReal(IParameterReal self)"},
+	 { "IParameterReal_swigregister", IParameterReal_swigregister, METH_O, NULL},
+	 { "ParticleLimits_m_bottom_set", _wrap_ParticleLimits_m_bottom_set, METH_VARARGS, "ParticleLimits_m_bottom_set(ParticleLimits self, double m_bottom)"},
+	 { "ParticleLimits_m_bottom_get", _wrap_ParticleLimits_m_bottom_get, METH_O, "ParticleLimits_m_bottom_get(ParticleLimits self) -> double"},
+	 { "ParticleLimits_m_top_set", _wrap_ParticleLimits_m_top_set, METH_VARARGS, "ParticleLimits_m_top_set(ParticleLimits self, double m_top)"},
+	 { "ParticleLimits_m_top_get", _wrap_ParticleLimits_m_top_get, METH_O, "ParticleLimits_m_top_get(ParticleLimits self) -> double"},
+	 { "new_ParticleLimits", _wrap_new_ParticleLimits, METH_NOARGS, "\n"
 		"new_ParticleLimits() -> ParticleLimits\n"
 		"\n"
 		"\n"
-		"\n"
 		"Vertical extension of a particle, specified by bottom and top z coordinate.\n"
 		"\n"
 		"C++ includes: IParticle.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_ParticleLimits", _wrap_delete_ParticleLimits, METH_VARARGS, (char *)"delete_ParticleLimits(ParticleLimits self)"},
-	 { (char *)"ParticleLimits_swigregister", ParticleLimits_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IParticle", _wrap_delete_IParticle, METH_VARARGS, (char *)"\n"
+	 { "delete_ParticleLimits", _wrap_delete_ParticleLimits, METH_O, "delete_ParticleLimits(ParticleLimits self)"},
+	 { "ParticleLimits_swigregister", ParticleLimits_swigregister, METH_O, NULL},
+	 { "ParticleLimits_swiginit", ParticleLimits_swiginit, METH_VARARGS, NULL},
+	 { "delete_IParticle", _wrap_delete_IParticle, METH_O, "\n"
 		"delete_IParticle(IParticle self)\n"
-		"\n"
 		"IParticle::~IParticle()\n"
 		"\n"
 		""},
-	 { (char *)"IParticle_clone", _wrap_IParticle_clone, METH_VARARGS, (char *)"\n"
+	 { "IParticle_clone", _wrap_IParticle_clone, METH_O, "\n"
 		"IParticle_clone(IParticle self) -> IParticle\n"
-		"\n"
 		"IParticle* IParticle::clone() const override=0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_accept", _wrap_IParticle_accept, METH_VARARGS, (char *)"\n"
+	 { "IParticle_accept", _wrap_IParticle_accept, METH_VARARGS, "\n"
 		"IParticle_accept(IParticle self, INodeVisitor visitor)\n"
-		"\n"
 		"void IParticle::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_createFormFactor", _wrap_IParticle_createFormFactor, METH_VARARGS, (char *)"\n"
+	 { "IParticle_createFormFactor", _wrap_IParticle_createFormFactor, METH_O, "\n"
 		"IParticle_createFormFactor(IParticle self) -> IFormFactor\n"
-		"\n"
 		"IFormFactor * IParticle::createFormFactor() const\n"
 		"\n"
 		"Create a form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_createSlicedParticle", _wrap_IParticle_createSlicedParticle, METH_VARARGS, (char *)"\n"
+	 { "IParticle_createSlicedParticle", _wrap_IParticle_createSlicedParticle, METH_VARARGS, "\n"
 		"IParticle_createSlicedParticle(IParticle self, ZLimits limits) -> SlicedParticle\n"
-		"\n"
 		"SlicedParticle IParticle::createSlicedParticle(ZLimits limits) const\n"
 		"\n"
 		"Create a sliced form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_position", _wrap_IParticle_position, METH_VARARGS, (char *)"\n"
+	 { "IParticle_position", _wrap_IParticle_position, METH_O, "\n"
 		"IParticle_position(IParticle self) -> kvector_t\n"
-		"\n"
 		"kvector_t IParticle::position() const\n"
 		"\n"
 		"Returns particle position. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_setPosition", _wrap_IParticle_setPosition, METH_VARARGS, (char *)"\n"
-		"setPosition(kvector_t position)\n"
+	 { "IParticle_setPosition", _wrap_IParticle_setPosition, METH_VARARGS, "\n"
+		"IParticle_setPosition(IParticle self, kvector_t position)\n"
 		"IParticle_setPosition(IParticle self, double x, double y, double z)\n"
-		"\n"
 		"void IParticle::setPosition(double x, double y, double z)\n"
 		"\n"
 		"Sets relative position of the particle's reference point in the coordinate system of parent.\n"
@@ -134216,497 +130611,437 @@ static PyMethodDef SwigMethods[] = {
 		"z-coordinate in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_translate", _wrap_IParticle_translate, METH_VARARGS, (char *)"\n"
+	 { "IParticle_translate", _wrap_IParticle_translate, METH_VARARGS, "\n"
 		"IParticle_translate(IParticle self, kvector_t translation)\n"
-		"\n"
 		"void IParticle::translate(kvector_t translation) override final\n"
 		"\n"
 		"Translates the particle. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_rotation", _wrap_IParticle_rotation, METH_VARARGS, (char *)"\n"
+	 { "IParticle_rotation", _wrap_IParticle_rotation, METH_O, "\n"
 		"IParticle_rotation(IParticle self) -> IRotation\n"
-		"\n"
 		"const IRotation * IParticle::rotation() const\n"
 		"\n"
 		"Returns rotation object. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_setRotation", _wrap_IParticle_setRotation, METH_VARARGS, (char *)"\n"
+	 { "IParticle_setRotation", _wrap_IParticle_setRotation, METH_VARARGS, "\n"
 		"IParticle_setRotation(IParticle self, IRotation rotation)\n"
-		"\n"
 		"void IParticle::setRotation(const IRotation &rotation)\n"
 		"\n"
 		"Sets transformation. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_rotate", _wrap_IParticle_rotate, METH_VARARGS, (char *)"\n"
+	 { "IParticle_rotate", _wrap_IParticle_rotate, METH_VARARGS, "\n"
 		"IParticle_rotate(IParticle self, IRotation rotation)\n"
-		"\n"
 		"void IParticle::rotate(const IRotation &rotation) override final\n"
 		"\n"
 		"Rotates the particle. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_getChildren", _wrap_IParticle_getChildren, METH_VARARGS, (char *)"\n"
+	 { "IParticle_getChildren", _wrap_IParticle_getChildren, METH_O, "\n"
 		"IParticle_getChildren(IParticle self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > IParticle::getChildren() const override\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_registerAbundance", _wrap_IParticle_registerAbundance, METH_VARARGS, (char *)"\n"
-		"registerAbundance(bool make_registered=True)\n"
-		"IParticle_registerAbundance(IParticle self)\n"
-		"\n"
+	 { "IParticle_registerAbundance", _wrap_IParticle_registerAbundance, METH_VARARGS, "\n"
+		"IParticle_registerAbundance(IParticle self, bool make_registered=True)\n"
 		"void IParticle::registerAbundance(bool make_registered=true)\n"
 		"\n"
 		""},
-	 { (char *)"IParticle_registerPosition", _wrap_IParticle_registerPosition, METH_VARARGS, (char *)"\n"
-		"registerPosition(bool make_registered=True)\n"
-		"IParticle_registerPosition(IParticle self)\n"
-		"\n"
+	 { "IParticle_registerPosition", _wrap_IParticle_registerPosition, METH_VARARGS, "\n"
+		"IParticle_registerPosition(IParticle self, bool make_registered=True)\n"
 		"void IParticle::registerPosition(bool make_registered=true)\n"
 		"\n"
 		"Registers the three components of its position. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_decompose", _wrap_IParticle_decompose, METH_VARARGS, (char *)"\n"
+	 { "IParticle_decompose", _wrap_IParticle_decompose, METH_O, "\n"
 		"IParticle_decompose(IParticle self) -> SafePointerVector< IParticle >\n"
-		"\n"
 		"SafePointerVector< IParticle > IParticle::decompose() const\n"
 		"\n"
 		"Decompose in constituent  IParticle objects. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_bottomTopZ", _wrap_IParticle_bottomTopZ, METH_VARARGS, (char *)"\n"
+	 { "IParticle_bottomTopZ", _wrap_IParticle_bottomTopZ, METH_O, "\n"
 		"IParticle_bottomTopZ(IParticle self) -> ParticleLimits\n"
-		"\n"
 		"ParticleLimits IParticle::bottomTopZ() const\n"
 		"\n"
 		"Top and bottom z-coordinate. \n"
 		"\n"
 		""},
-	 { (char *)"IParticle_swigregister", IParticle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IPeakShape", _wrap_delete_IPeakShape, METH_VARARGS, (char *)"\n"
+	 { "IParticle_swigregister", IParticle_swigregister, METH_O, NULL},
+	 { "delete_IPeakShape", _wrap_delete_IPeakShape, METH_O, "\n"
 		"delete_IPeakShape(IPeakShape self)\n"
-		"\n"
 		"IPeakShape::~IPeakShape()\n"
 		"\n"
 		""},
-	 { (char *)"IPeakShape_clone", _wrap_IPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "IPeakShape_clone", _wrap_IPeakShape_clone, METH_O, "\n"
 		"IPeakShape_clone(IPeakShape self) -> IPeakShape\n"
-		"\n"
 		"virtual IPeakShape* IPeakShape::clone() const =0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IPeakShape_evaluate", _wrap_IPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IPeakShape_evaluate", _wrap_IPeakShape_evaluate, METH_VARARGS, "\n"
 		"IPeakShape_evaluate(IPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"virtual double IPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const =0\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"IPeakShape_angularDisorder", _wrap_IPeakShape_angularDisorder, METH_VARARGS, (char *)"\n"
+	 { "IPeakShape_angularDisorder", _wrap_IPeakShape_angularDisorder, METH_O, "\n"
 		"IPeakShape_angularDisorder(IPeakShape self) -> bool\n"
-		"\n"
 		"virtual bool IPeakShape::angularDisorder() const\n"
 		"\n"
 		"Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed \n"
 		"\n"
 		""},
-	 { (char *)"IPeakShape_swigregister", IPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IsotropicGaussPeakShape", _wrap_new_IsotropicGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "IPeakShape_swigregister", IPeakShape_swigregister, METH_O, NULL},
+	 { "new_IsotropicGaussPeakShape", _wrap_new_IsotropicGaussPeakShape, METH_VARARGS, "\n"
 		"new_IsotropicGaussPeakShape(double max_intensity, double domainsize) -> IsotropicGaussPeakShape\n"
-		"\n"
 		"IsotropicGaussPeakShape::IsotropicGaussPeakShape(double max_intensity, double domainsize)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IsotropicGaussPeakShape", _wrap_delete_IsotropicGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_IsotropicGaussPeakShape", _wrap_delete_IsotropicGaussPeakShape, METH_O, "\n"
 		"delete_IsotropicGaussPeakShape(IsotropicGaussPeakShape self)\n"
-		"\n"
 		"IsotropicGaussPeakShape::~IsotropicGaussPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"IsotropicGaussPeakShape_clone", _wrap_IsotropicGaussPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "IsotropicGaussPeakShape_clone", _wrap_IsotropicGaussPeakShape_clone, METH_O, "\n"
 		"IsotropicGaussPeakShape_clone(IsotropicGaussPeakShape self) -> IsotropicGaussPeakShape\n"
-		"\n"
 		"IsotropicGaussPeakShape * IsotropicGaussPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicGaussPeakShape_accept", _wrap_IsotropicGaussPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "IsotropicGaussPeakShape_accept", _wrap_IsotropicGaussPeakShape_accept, METH_VARARGS, "\n"
 		"IsotropicGaussPeakShape_accept(IsotropicGaussPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void IsotropicGaussPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicGaussPeakShape_evaluate", _wrap_IsotropicGaussPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IsotropicGaussPeakShape_evaluate", _wrap_IsotropicGaussPeakShape_evaluate, METH_VARARGS, "\n"
 		"IsotropicGaussPeakShape_evaluate(IsotropicGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double IsotropicGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicGaussPeakShape_swigregister", IsotropicGaussPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IsotropicLorentzPeakShape", _wrap_new_IsotropicLorentzPeakShape, METH_VARARGS, (char *)"\n"
+	 { "IsotropicGaussPeakShape_swigregister", IsotropicGaussPeakShape_swigregister, METH_O, NULL},
+	 { "IsotropicGaussPeakShape_swiginit", IsotropicGaussPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "new_IsotropicLorentzPeakShape", _wrap_new_IsotropicLorentzPeakShape, METH_VARARGS, "\n"
 		"new_IsotropicLorentzPeakShape(double max_intensity, double domainsize) -> IsotropicLorentzPeakShape\n"
-		"\n"
 		"IsotropicLorentzPeakShape::IsotropicLorentzPeakShape(double max_intensity, double domainsize)\n"
 		"\n"
 		""},
-	 { (char *)"delete_IsotropicLorentzPeakShape", _wrap_delete_IsotropicLorentzPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_IsotropicLorentzPeakShape", _wrap_delete_IsotropicLorentzPeakShape, METH_O, "\n"
 		"delete_IsotropicLorentzPeakShape(IsotropicLorentzPeakShape self)\n"
-		"\n"
 		"IsotropicLorentzPeakShape::~IsotropicLorentzPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"IsotropicLorentzPeakShape_clone", _wrap_IsotropicLorentzPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "IsotropicLorentzPeakShape_clone", _wrap_IsotropicLorentzPeakShape_clone, METH_O, "\n"
 		"IsotropicLorentzPeakShape_clone(IsotropicLorentzPeakShape self) -> IsotropicLorentzPeakShape\n"
-		"\n"
 		"IsotropicLorentzPeakShape * IsotropicLorentzPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicLorentzPeakShape_accept", _wrap_IsotropicLorentzPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "IsotropicLorentzPeakShape_accept", _wrap_IsotropicLorentzPeakShape_accept, METH_VARARGS, "\n"
 		"IsotropicLorentzPeakShape_accept(IsotropicLorentzPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void IsotropicLorentzPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicLorentzPeakShape_evaluate", _wrap_IsotropicLorentzPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "IsotropicLorentzPeakShape_evaluate", _wrap_IsotropicLorentzPeakShape_evaluate, METH_VARARGS, "\n"
 		"IsotropicLorentzPeakShape_evaluate(IsotropicLorentzPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double IsotropicLorentzPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"IsotropicLorentzPeakShape_swigregister", IsotropicLorentzPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_GaussFisherPeakShape", _wrap_new_GaussFisherPeakShape, METH_VARARGS, (char *)"\n"
+	 { "IsotropicLorentzPeakShape_swigregister", IsotropicLorentzPeakShape_swigregister, METH_O, NULL},
+	 { "IsotropicLorentzPeakShape_swiginit", IsotropicLorentzPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "new_GaussFisherPeakShape", _wrap_new_GaussFisherPeakShape, METH_VARARGS, "\n"
 		"new_GaussFisherPeakShape(double max_intensity, double radial_size, double kappa) -> GaussFisherPeakShape\n"
-		"\n"
 		"GaussFisherPeakShape::GaussFisherPeakShape(double max_intensity, double radial_size, double kappa)\n"
 		"\n"
 		""},
-	 { (char *)"delete_GaussFisherPeakShape", _wrap_delete_GaussFisherPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_GaussFisherPeakShape", _wrap_delete_GaussFisherPeakShape, METH_O, "\n"
 		"delete_GaussFisherPeakShape(GaussFisherPeakShape self)\n"
-		"\n"
 		"GaussFisherPeakShape::~GaussFisherPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"GaussFisherPeakShape_clone", _wrap_GaussFisherPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "GaussFisherPeakShape_clone", _wrap_GaussFisherPeakShape_clone, METH_O, "\n"
 		"GaussFisherPeakShape_clone(GaussFisherPeakShape self) -> GaussFisherPeakShape\n"
-		"\n"
 		"GaussFisherPeakShape * GaussFisherPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"GaussFisherPeakShape_accept", _wrap_GaussFisherPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "GaussFisherPeakShape_accept", _wrap_GaussFisherPeakShape_accept, METH_VARARGS, "\n"
 		"GaussFisherPeakShape_accept(GaussFisherPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void GaussFisherPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"GaussFisherPeakShape_evaluate", _wrap_GaussFisherPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "GaussFisherPeakShape_evaluate", _wrap_GaussFisherPeakShape_evaluate, METH_VARARGS, "\n"
 		"GaussFisherPeakShape_evaluate(GaussFisherPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double GaussFisherPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"GaussFisherPeakShape_angularDisorder", _wrap_GaussFisherPeakShape_angularDisorder, METH_VARARGS, (char *)"\n"
+	 { "GaussFisherPeakShape_angularDisorder", _wrap_GaussFisherPeakShape_angularDisorder, METH_O, "\n"
 		"GaussFisherPeakShape_angularDisorder(GaussFisherPeakShape self) -> bool\n"
-		"\n"
 		"bool GaussFisherPeakShape::angularDisorder() const override\n"
 		"\n"
 		"Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed \n"
 		"\n"
 		""},
-	 { (char *)"GaussFisherPeakShape_swigregister", GaussFisherPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_LorentzFisherPeakShape", _wrap_new_LorentzFisherPeakShape, METH_VARARGS, (char *)"\n"
+	 { "GaussFisherPeakShape_swigregister", GaussFisherPeakShape_swigregister, METH_O, NULL},
+	 { "GaussFisherPeakShape_swiginit", GaussFisherPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "new_LorentzFisherPeakShape", _wrap_new_LorentzFisherPeakShape, METH_VARARGS, "\n"
 		"new_LorentzFisherPeakShape(double max_intensity, double radial_size, double kappa) -> LorentzFisherPeakShape\n"
-		"\n"
 		"LorentzFisherPeakShape::LorentzFisherPeakShape(double max_intensity, double radial_size, double kappa)\n"
 		"\n"
 		""},
-	 { (char *)"delete_LorentzFisherPeakShape", _wrap_delete_LorentzFisherPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_LorentzFisherPeakShape", _wrap_delete_LorentzFisherPeakShape, METH_O, "\n"
 		"delete_LorentzFisherPeakShape(LorentzFisherPeakShape self)\n"
-		"\n"
 		"LorentzFisherPeakShape::~LorentzFisherPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"LorentzFisherPeakShape_clone", _wrap_LorentzFisherPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "LorentzFisherPeakShape_clone", _wrap_LorentzFisherPeakShape_clone, METH_O, "\n"
 		"LorentzFisherPeakShape_clone(LorentzFisherPeakShape self) -> LorentzFisherPeakShape\n"
-		"\n"
 		"LorentzFisherPeakShape * LorentzFisherPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"LorentzFisherPeakShape_accept", _wrap_LorentzFisherPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "LorentzFisherPeakShape_accept", _wrap_LorentzFisherPeakShape_accept, METH_VARARGS, "\n"
 		"LorentzFisherPeakShape_accept(LorentzFisherPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void LorentzFisherPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"LorentzFisherPeakShape_evaluate", _wrap_LorentzFisherPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "LorentzFisherPeakShape_evaluate", _wrap_LorentzFisherPeakShape_evaluate, METH_VARARGS, "\n"
 		"LorentzFisherPeakShape_evaluate(LorentzFisherPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double LorentzFisherPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"LorentzFisherPeakShape_angularDisorder", _wrap_LorentzFisherPeakShape_angularDisorder, METH_VARARGS, (char *)"\n"
+	 { "LorentzFisherPeakShape_angularDisorder", _wrap_LorentzFisherPeakShape_angularDisorder, METH_O, "\n"
 		"LorentzFisherPeakShape_angularDisorder(LorentzFisherPeakShape self) -> bool\n"
-		"\n"
 		"bool LorentzFisherPeakShape::angularDisorder() const override\n"
 		"\n"
 		"Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed \n"
 		"\n"
 		""},
-	 { (char *)"LorentzFisherPeakShape_swigregister", LorentzFisherPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_VonMisesFisherGaussPeakShape", _wrap_new_VonMisesFisherGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "LorentzFisherPeakShape_swigregister", LorentzFisherPeakShape_swigregister, METH_O, NULL},
+	 { "LorentzFisherPeakShape_swiginit", LorentzFisherPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "new_VonMisesFisherGaussPeakShape", _wrap_new_VonMisesFisherGaussPeakShape, METH_VARARGS, "\n"
 		"new_VonMisesFisherGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa_1, double kappa_2) -> VonMisesFisherGaussPeakShape\n"
-		"\n"
 		"VonMisesFisherGaussPeakShape::VonMisesFisherGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa_1, double kappa_2)\n"
 		"\n"
 		""},
-	 { (char *)"delete_VonMisesFisherGaussPeakShape", _wrap_delete_VonMisesFisherGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_VonMisesFisherGaussPeakShape", _wrap_delete_VonMisesFisherGaussPeakShape, METH_O, "\n"
 		"delete_VonMisesFisherGaussPeakShape(VonMisesFisherGaussPeakShape self)\n"
-		"\n"
 		"VonMisesFisherGaussPeakShape::~VonMisesFisherGaussPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"VonMisesFisherGaussPeakShape_clone", _wrap_VonMisesFisherGaussPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "VonMisesFisherGaussPeakShape_clone", _wrap_VonMisesFisherGaussPeakShape_clone, METH_O, "\n"
 		"VonMisesFisherGaussPeakShape_clone(VonMisesFisherGaussPeakShape self) -> VonMisesFisherGaussPeakShape\n"
-		"\n"
 		"VonMisesFisherGaussPeakShape * VonMisesFisherGaussPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesFisherGaussPeakShape_accept", _wrap_VonMisesFisherGaussPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "VonMisesFisherGaussPeakShape_accept", _wrap_VonMisesFisherGaussPeakShape_accept, METH_VARARGS, "\n"
 		"VonMisesFisherGaussPeakShape_accept(VonMisesFisherGaussPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void VonMisesFisherGaussPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesFisherGaussPeakShape_evaluate", _wrap_VonMisesFisherGaussPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "VonMisesFisherGaussPeakShape_evaluate", _wrap_VonMisesFisherGaussPeakShape_evaluate, METH_VARARGS, "\n"
 		"VonMisesFisherGaussPeakShape_evaluate(VonMisesFisherGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double VonMisesFisherGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesFisherGaussPeakShape_angularDisorder", _wrap_VonMisesFisherGaussPeakShape_angularDisorder, METH_VARARGS, (char *)"\n"
+	 { "VonMisesFisherGaussPeakShape_angularDisorder", _wrap_VonMisesFisherGaussPeakShape_angularDisorder, METH_O, "\n"
 		"VonMisesFisherGaussPeakShape_angularDisorder(VonMisesFisherGaussPeakShape self) -> bool\n"
-		"\n"
 		"bool VonMisesFisherGaussPeakShape::angularDisorder() const override\n"
 		"\n"
 		"Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesFisherGaussPeakShape_swigregister", VonMisesFisherGaussPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_VonMisesGaussPeakShape", _wrap_new_VonMisesGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "VonMisesFisherGaussPeakShape_swigregister", VonMisesFisherGaussPeakShape_swigregister, METH_O, NULL},
+	 { "VonMisesFisherGaussPeakShape_swiginit", VonMisesFisherGaussPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "new_VonMisesGaussPeakShape", _wrap_new_VonMisesGaussPeakShape, METH_VARARGS, "\n"
 		"new_VonMisesGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa) -> VonMisesGaussPeakShape\n"
-		"\n"
 		"VonMisesGaussPeakShape::VonMisesGaussPeakShape(double max_intensity, double radial_size, kvector_t zenith, double kappa)\n"
 		"\n"
 		""},
-	 { (char *)"delete_VonMisesGaussPeakShape", _wrap_delete_VonMisesGaussPeakShape, METH_VARARGS, (char *)"\n"
+	 { "delete_VonMisesGaussPeakShape", _wrap_delete_VonMisesGaussPeakShape, METH_O, "\n"
 		"delete_VonMisesGaussPeakShape(VonMisesGaussPeakShape self)\n"
-		"\n"
 		"VonMisesGaussPeakShape::~VonMisesGaussPeakShape() override\n"
 		"\n"
 		""},
-	 { (char *)"VonMisesGaussPeakShape_clone", _wrap_VonMisesGaussPeakShape_clone, METH_VARARGS, (char *)"\n"
+	 { "VonMisesGaussPeakShape_clone", _wrap_VonMisesGaussPeakShape_clone, METH_O, "\n"
 		"VonMisesGaussPeakShape_clone(VonMisesGaussPeakShape self) -> VonMisesGaussPeakShape\n"
-		"\n"
 		"VonMisesGaussPeakShape * VonMisesGaussPeakShape::clone() const override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesGaussPeakShape_accept", _wrap_VonMisesGaussPeakShape_accept, METH_VARARGS, (char *)"\n"
+	 { "VonMisesGaussPeakShape_accept", _wrap_VonMisesGaussPeakShape_accept, METH_VARARGS, "\n"
 		"VonMisesGaussPeakShape_accept(VonMisesGaussPeakShape self, INodeVisitor visitor)\n"
-		"\n"
 		"void VonMisesGaussPeakShape::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesGaussPeakShape_evaluate", _wrap_VonMisesGaussPeakShape_evaluate, METH_VARARGS, (char *)"\n"
+	 { "VonMisesGaussPeakShape_evaluate", _wrap_VonMisesGaussPeakShape_evaluate, METH_VARARGS, "\n"
 		"VonMisesGaussPeakShape_evaluate(VonMisesGaussPeakShape self, kvector_t q, kvector_t q_lattice_point) -> double\n"
-		"\n"
 		"double VonMisesGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattice_point) const override\n"
 		"\n"
 		"Evaluates the peak shape at q from a reciprocal lattice point at q_lattice_point. \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesGaussPeakShape_angularDisorder", _wrap_VonMisesGaussPeakShape_angularDisorder, METH_VARARGS, (char *)"\n"
+	 { "VonMisesGaussPeakShape_angularDisorder", _wrap_VonMisesGaussPeakShape_angularDisorder, METH_O, "\n"
 		"VonMisesGaussPeakShape_angularDisorder(VonMisesGaussPeakShape self) -> bool\n"
-		"\n"
 		"bool VonMisesGaussPeakShape::angularDisorder() const override\n"
 		"\n"
 		"Indicates if the peak shape encodes angular disorder, in which case all peaks in a spherical shell are needed \n"
 		"\n"
 		""},
-	 { (char *)"VonMisesGaussPeakShape_swigregister", VonMisesGaussPeakShape_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IResolutionFunction2D", _wrap_delete_IResolutionFunction2D, METH_VARARGS, (char *)"\n"
+	 { "VonMisesGaussPeakShape_swigregister", VonMisesGaussPeakShape_swigregister, METH_O, NULL},
+	 { "VonMisesGaussPeakShape_swiginit", VonMisesGaussPeakShape_swiginit, METH_VARARGS, NULL},
+	 { "delete_IResolutionFunction2D", _wrap_delete_IResolutionFunction2D, METH_O, "\n"
 		"delete_IResolutionFunction2D(IResolutionFunction2D self)\n"
-		"\n"
 		"virtual IResolutionFunction2D::~IResolutionFunction2D()\n"
 		"\n"
 		""},
-	 { (char *)"IResolutionFunction2D_evaluateCDF", _wrap_IResolutionFunction2D_evaluateCDF, METH_VARARGS, (char *)"\n"
+	 { "IResolutionFunction2D_evaluateCDF", _wrap_IResolutionFunction2D_evaluateCDF, METH_VARARGS, "\n"
 		"IResolutionFunction2D_evaluateCDF(IResolutionFunction2D self, double x, double y) -> double\n"
-		"\n"
 		"virtual double IResolutionFunction2D::evaluateCDF(double x, double y) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IResolutionFunction2D_clone", _wrap_IResolutionFunction2D_clone, METH_VARARGS, (char *)"\n"
+	 { "IResolutionFunction2D_clone", _wrap_IResolutionFunction2D_clone, METH_O, "\n"
 		"IResolutionFunction2D_clone(IResolutionFunction2D self) -> IResolutionFunction2D\n"
-		"\n"
 		"virtual IResolutionFunction2D* IResolutionFunction2D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IResolutionFunction2D_swigregister", IResolutionFunction2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"IRotation_createRotation", _wrap_IRotation_createRotation, METH_VARARGS, (char *)"IRotation_createRotation(Transform3D const & transform) -> IRotation"},
-	 { (char *)"IRotation_createIdentity", _wrap_IRotation_createIdentity, METH_VARARGS, (char *)"IRotation_createIdentity() -> IRotation"},
-	 { (char *)"delete_IRotation", _wrap_delete_IRotation, METH_VARARGS, (char *)"\n"
+	 { "IResolutionFunction2D_swigregister", IResolutionFunction2D_swigregister, METH_O, NULL},
+	 { "IRotation_createRotation", _wrap_IRotation_createRotation, METH_O, "IRotation_createRotation(Transform3D const & transform) -> IRotation"},
+	 { "IRotation_createIdentity", _wrap_IRotation_createIdentity, METH_NOARGS, "IRotation_createIdentity() -> IRotation"},
+	 { "delete_IRotation", _wrap_delete_IRotation, METH_O, "\n"
 		"delete_IRotation(IRotation self)\n"
-		"\n"
 		"virtual IRotation::~IRotation()\n"
 		"\n"
 		""},
-	 { (char *)"IRotation_clone", _wrap_IRotation_clone, METH_VARARGS, (char *)"\n"
+	 { "IRotation_clone", _wrap_IRotation_clone, METH_O, "\n"
 		"IRotation_clone(IRotation self) -> IRotation\n"
-		"\n"
 		"virtual IRotation* IRotation::clone() const =0\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IRotation_createInverse", _wrap_IRotation_createInverse, METH_VARARGS, (char *)"\n"
+	 { "IRotation_createInverse", _wrap_IRotation_createInverse, METH_O, "\n"
 		"IRotation_createInverse(IRotation self) -> IRotation\n"
-		"\n"
 		"virtual IRotation* IRotation::createInverse() const =0\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"IRotation_accept", _wrap_IRotation_accept, METH_VARARGS, (char *)"\n"
+	 { "IRotation_accept", _wrap_IRotation_accept, METH_VARARGS, "\n"
 		"IRotation_accept(IRotation self, INodeVisitor visitor)\n"
-		"\n"
 		"void IRotation::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IRotation_getTransform3D", _wrap_IRotation_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "IRotation_getTransform3D", _wrap_IRotation_getTransform3D, METH_O, "\n"
 		"IRotation_getTransform3D(IRotation self) -> Transform3D\n"
-		"\n"
 		"virtual Transform3D IRotation::getTransform3D() const =0\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"IRotation_isIdentity", _wrap_IRotation_isIdentity, METH_VARARGS, (char *)"\n"
+	 { "IRotation_isIdentity", _wrap_IRotation_isIdentity, METH_O, "\n"
 		"IRotation_isIdentity(IRotation self) -> bool\n"
-		"\n"
 		"bool IRotation::isIdentity() const\n"
 		"\n"
 		"Returns true if rotation matrix is identity matrix (no rotations) \n"
 		"\n"
 		""},
-	 { (char *)"IRotation_swigregister", IRotation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"createProduct", _wrap_createProduct, METH_VARARGS, (char *)"\n"
+	 { "IRotation_swigregister", IRotation_swigregister, METH_O, NULL},
+	 { "createProduct", _wrap_createProduct, METH_VARARGS, "\n"
 		"createProduct(IRotation left, IRotation right) -> IRotation\n"
-		"\n"
 		"BA_CORE_API_ IRotation* createProduct(const IRotation &left, const IRotation &right)\n"
 		"\n"
 		"Returns concatenated rotation (first right, then left). \n"
 		"\n"
 		""},
-	 { (char *)"IsZRotation", _wrap_IsZRotation, METH_VARARGS, (char *)"\n"
+	 { "IsZRotation", _wrap_IsZRotation, METH_O, "\n"
 		"IsZRotation(IRotation rot) -> bool\n"
-		"\n"
 		"bool IsZRotation(const IRotation &rot)\n"
 		"\n"
 		""},
-	 { (char *)"new_IdentityRotation", _wrap_new_IdentityRotation, METH_VARARGS, (char *)"\n"
+	 { "new_IdentityRotation", _wrap_new_IdentityRotation, METH_NOARGS, "\n"
 		"new_IdentityRotation() -> IdentityRotation\n"
-		"\n"
 		"IdentityRotation::IdentityRotation()=default\n"
 		"\n"
 		""},
-	 { (char *)"IdentityRotation_clone", _wrap_IdentityRotation_clone, METH_VARARGS, (char *)"\n"
+	 { "IdentityRotation_clone", _wrap_IdentityRotation_clone, METH_O, "\n"
 		"IdentityRotation_clone(IdentityRotation self) -> IdentityRotation\n"
-		"\n"
 		"IdentityRotation* IdentityRotation::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"IdentityRotation_createInverse", _wrap_IdentityRotation_createInverse, METH_VARARGS, (char *)"\n"
+	 { "IdentityRotation_createInverse", _wrap_IdentityRotation_createInverse, METH_O, "\n"
 		"IdentityRotation_createInverse(IdentityRotation self) -> IdentityRotation\n"
-		"\n"
 		"IdentityRotation* IdentityRotation::createInverse() const\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"IdentityRotation_accept", _wrap_IdentityRotation_accept, METH_VARARGS, (char *)"\n"
+	 { "IdentityRotation_accept", _wrap_IdentityRotation_accept, METH_VARARGS, "\n"
 		"IdentityRotation_accept(IdentityRotation self, INodeVisitor visitor)\n"
-		"\n"
 		"void IdentityRotation::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"IdentityRotation_getTransform3D", _wrap_IdentityRotation_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "IdentityRotation_getTransform3D", _wrap_IdentityRotation_getTransform3D, METH_O, "\n"
 		"IdentityRotation_getTransform3D(IdentityRotation self) -> Transform3D\n"
-		"\n"
 		"Transform3D IdentityRotation::getTransform3D() const\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"IdentityRotation_isIdentity", _wrap_IdentityRotation_isIdentity, METH_VARARGS, (char *)"\n"
+	 { "IdentityRotation_isIdentity", _wrap_IdentityRotation_isIdentity, METH_O, "\n"
 		"IdentityRotation_isIdentity(IdentityRotation self) -> bool\n"
-		"\n"
 		"bool IdentityRotation::isIdentity() const\n"
 		"\n"
 		"Returns true if rotation matrix is identity matrix (no rotations) \n"
 		"\n"
 		""},
-	 { (char *)"delete_IdentityRotation", _wrap_delete_IdentityRotation, METH_VARARGS, (char *)"delete_IdentityRotation(IdentityRotation self)"},
-	 { (char *)"IdentityRotation_swigregister", IdentityRotation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RotationX", _wrap_new_RotationX, METH_VARARGS, (char *)"\n"
+	 { "delete_IdentityRotation", _wrap_delete_IdentityRotation, METH_O, "delete_IdentityRotation(IdentityRotation self)"},
+	 { "IdentityRotation_swigregister", IdentityRotation_swigregister, METH_O, NULL},
+	 { "IdentityRotation_swiginit", IdentityRotation_swiginit, METH_VARARGS, NULL},
+	 { "new_RotationX", _wrap_new_RotationX, METH_O, "\n"
 		"new_RotationX(double angle) -> RotationX\n"
-		"\n"
 		"RotationX::RotationX(double angle)\n"
 		"\n"
 		"Constructor of rotation around x-axis\n"
@@ -134718,49 +131053,44 @@ static PyMethodDef SwigMethods[] = {
 		"rotation angle around x-axis in radians \n"
 		"\n"
 		""},
-	 { (char *)"RotationX_clone", _wrap_RotationX_clone, METH_VARARGS, (char *)"\n"
+	 { "RotationX_clone", _wrap_RotationX_clone, METH_O, "\n"
 		"RotationX_clone(RotationX self) -> RotationX\n"
-		"\n"
 		"RotationX* RotationX::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"RotationX_createInverse", _wrap_RotationX_createInverse, METH_VARARGS, (char *)"\n"
+	 { "RotationX_createInverse", _wrap_RotationX_createInverse, METH_O, "\n"
 		"RotationX_createInverse(RotationX self) -> RotationX\n"
-		"\n"
 		"RotationX* RotationX::createInverse() const\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"RotationX_accept", _wrap_RotationX_accept, METH_VARARGS, (char *)"\n"
+	 { "RotationX_accept", _wrap_RotationX_accept, METH_VARARGS, "\n"
 		"RotationX_accept(RotationX self, INodeVisitor visitor)\n"
-		"\n"
 		"void RotationX::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"RotationX_getAngle", _wrap_RotationX_getAngle, METH_VARARGS, (char *)"\n"
+	 { "RotationX_getAngle", _wrap_RotationX_getAngle, METH_O, "\n"
 		"RotationX_getAngle(RotationX self) -> double\n"
-		"\n"
 		"double RotationX::getAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationX_getTransform3D", _wrap_RotationX_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "RotationX_getTransform3D", _wrap_RotationX_getTransform3D, METH_O, "\n"
 		"RotationX_getTransform3D(RotationX self) -> Transform3D\n"
-		"\n"
 		"Transform3D RotationX::getTransform3D() const\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"delete_RotationX", _wrap_delete_RotationX, METH_VARARGS, (char *)"delete_RotationX(RotationX self)"},
-	 { (char *)"RotationX_swigregister", RotationX_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RotationY", _wrap_new_RotationY, METH_VARARGS, (char *)"\n"
+	 { "delete_RotationX", _wrap_delete_RotationX, METH_O, "delete_RotationX(RotationX self)"},
+	 { "RotationX_swigregister", RotationX_swigregister, METH_O, NULL},
+	 { "RotationX_swiginit", RotationX_swiginit, METH_VARARGS, NULL},
+	 { "new_RotationY", _wrap_new_RotationY, METH_O, "\n"
 		"new_RotationY(double angle) -> RotationY\n"
-		"\n"
 		"RotationY::RotationY(double angle)\n"
 		"\n"
 		"Constructor of rotation around y-axis\n"
@@ -134772,50 +131102,44 @@ static PyMethodDef SwigMethods[] = {
 		"rotation angle around y-axis in radians \n"
 		"\n"
 		""},
-	 { (char *)"RotationY_clone", _wrap_RotationY_clone, METH_VARARGS, (char *)"\n"
+	 { "RotationY_clone", _wrap_RotationY_clone, METH_O, "\n"
 		"RotationY_clone(RotationY self) -> RotationY\n"
-		"\n"
 		"RotationY* RotationY::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"RotationY_createInverse", _wrap_RotationY_createInverse, METH_VARARGS, (char *)"\n"
+	 { "RotationY_createInverse", _wrap_RotationY_createInverse, METH_O, "\n"
 		"RotationY_createInverse(RotationY self) -> RotationY\n"
-		"\n"
 		"RotationY* RotationY::createInverse() const\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"RotationY_accept", _wrap_RotationY_accept, METH_VARARGS, (char *)"\n"
+	 { "RotationY_accept", _wrap_RotationY_accept, METH_VARARGS, "\n"
 		"RotationY_accept(RotationY self, INodeVisitor visitor)\n"
-		"\n"
 		"void RotationY::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"RotationY_getAngle", _wrap_RotationY_getAngle, METH_VARARGS, (char *)"\n"
+	 { "RotationY_getAngle", _wrap_RotationY_getAngle, METH_O, "\n"
 		"RotationY_getAngle(RotationY self) -> double\n"
-		"\n"
 		"double RotationY::getAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationY_getTransform3D", _wrap_RotationY_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "RotationY_getTransform3D", _wrap_RotationY_getTransform3D, METH_O, "\n"
 		"RotationY_getTransform3D(RotationY self) -> Transform3D\n"
-		"\n"
 		"Transform3D RotationY::getTransform3D() const\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"delete_RotationY", _wrap_delete_RotationY, METH_VARARGS, (char *)"delete_RotationY(RotationY self)"},
-	 { (char *)"RotationY_swigregister", RotationY_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RotationZ", _wrap_new_RotationZ, METH_VARARGS, (char *)"\n"
+	 { "delete_RotationY", _wrap_delete_RotationY, METH_O, "delete_RotationY(RotationY self)"},
+	 { "RotationY_swigregister", RotationY_swigregister, METH_O, NULL},
+	 { "RotationY_swiginit", RotationY_swiginit, METH_VARARGS, NULL},
+	 { "new_RotationZ", _wrap_new_RotationZ, METH_VARARGS, "\n"
 		"RotationZ(double angle=0.0)\n"
-		"new_RotationZ() -> RotationZ\n"
-		"\n"
 		"RotationZ::RotationZ(double angle=0.0)\n"
 		"\n"
 		"Constructor of rotation around z-axis\n"
@@ -134827,49 +131151,44 @@ static PyMethodDef SwigMethods[] = {
 		"rotation angle around z-axis in radians \n"
 		"\n"
 		""},
-	 { (char *)"RotationZ_clone", _wrap_RotationZ_clone, METH_VARARGS, (char *)"\n"
+	 { "RotationZ_clone", _wrap_RotationZ_clone, METH_O, "\n"
 		"RotationZ_clone(RotationZ self) -> RotationZ\n"
-		"\n"
 		"RotationZ* RotationZ::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"RotationZ_createInverse", _wrap_RotationZ_createInverse, METH_VARARGS, (char *)"\n"
+	 { "RotationZ_createInverse", _wrap_RotationZ_createInverse, METH_O, "\n"
 		"RotationZ_createInverse(RotationZ self) -> RotationZ\n"
-		"\n"
 		"RotationZ* RotationZ::createInverse() const\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"RotationZ_accept", _wrap_RotationZ_accept, METH_VARARGS, (char *)"\n"
+	 { "RotationZ_accept", _wrap_RotationZ_accept, METH_VARARGS, "\n"
 		"RotationZ_accept(RotationZ self, INodeVisitor visitor)\n"
-		"\n"
 		"void RotationZ::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"RotationZ_getAngle", _wrap_RotationZ_getAngle, METH_VARARGS, (char *)"\n"
+	 { "RotationZ_getAngle", _wrap_RotationZ_getAngle, METH_O, "\n"
 		"RotationZ_getAngle(RotationZ self) -> double\n"
-		"\n"
 		"double RotationZ::getAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationZ_getTransform3D", _wrap_RotationZ_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "RotationZ_getTransform3D", _wrap_RotationZ_getTransform3D, METH_O, "\n"
 		"RotationZ_getTransform3D(RotationZ self) -> Transform3D\n"
-		"\n"
 		"Transform3D RotationZ::getTransform3D() const\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"delete_RotationZ", _wrap_delete_RotationZ, METH_VARARGS, (char *)"delete_RotationZ(RotationZ self)"},
-	 { (char *)"RotationZ_swigregister", RotationZ_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RotationEuler", _wrap_new_RotationEuler, METH_VARARGS, (char *)"\n"
+	 { "delete_RotationZ", _wrap_delete_RotationZ, METH_O, "delete_RotationZ(RotationZ self)"},
+	 { "RotationZ_swigregister", RotationZ_swigregister, METH_O, NULL},
+	 { "RotationZ_swiginit", RotationZ_swiginit, METH_VARARGS, NULL},
+	 { "new_RotationEuler", _wrap_new_RotationEuler, METH_VARARGS, "\n"
 		"new_RotationEuler(double alpha, double beta, double gamma) -> RotationEuler\n"
-		"\n"
 		"RotationEuler::RotationEuler(double alpha, double beta, double gamma)\n"
 		"\n"
 		"Constructor of Euler rotation (sequence of three rotations following Euler angles notation z-x'-z').\n"
@@ -134887,265 +131206,232 @@ static PyMethodDef SwigMethods[] = {
 		"third Euler angle in radians \n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_clone", _wrap_RotationEuler_clone, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_clone", _wrap_RotationEuler_clone, METH_O, "\n"
 		"RotationEuler_clone(RotationEuler self) -> RotationEuler\n"
-		"\n"
 		"RotationEuler* RotationEuler::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_createInverse", _wrap_RotationEuler_createInverse, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_createInverse", _wrap_RotationEuler_createInverse, METH_O, "\n"
 		"RotationEuler_createInverse(RotationEuler self) -> IRotation\n"
-		"\n"
 		"IRotation * RotationEuler::createInverse() const\n"
 		"\n"
 		"Returns a new  IRotation object that is the current object's inverse. \n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_accept", _wrap_RotationEuler_accept, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_accept", _wrap_RotationEuler_accept, METH_VARARGS, "\n"
 		"RotationEuler_accept(RotationEuler self, INodeVisitor visitor)\n"
-		"\n"
 		"void RotationEuler::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_getAlpha", _wrap_RotationEuler_getAlpha, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_getAlpha", _wrap_RotationEuler_getAlpha, METH_O, "\n"
 		"RotationEuler_getAlpha(RotationEuler self) -> double\n"
-		"\n"
 		"double RotationEuler::getAlpha() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_getBeta", _wrap_RotationEuler_getBeta, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_getBeta", _wrap_RotationEuler_getBeta, METH_O, "\n"
 		"RotationEuler_getBeta(RotationEuler self) -> double\n"
-		"\n"
 		"double RotationEuler::getBeta() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_getGamma", _wrap_RotationEuler_getGamma, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_getGamma", _wrap_RotationEuler_getGamma, METH_O, "\n"
 		"RotationEuler_getGamma(RotationEuler self) -> double\n"
-		"\n"
 		"double RotationEuler::getGamma() const\n"
 		"\n"
 		""},
-	 { (char *)"RotationEuler_getTransform3D", _wrap_RotationEuler_getTransform3D, METH_VARARGS, (char *)"\n"
+	 { "RotationEuler_getTransform3D", _wrap_RotationEuler_getTransform3D, METH_O, "\n"
 		"RotationEuler_getTransform3D(RotationEuler self) -> Transform3D\n"
-		"\n"
 		"Transform3D RotationEuler::getTransform3D() const\n"
 		"\n"
 		"Returns transformation. \n"
 		"\n"
 		""},
-	 { (char *)"delete_RotationEuler", _wrap_delete_RotationEuler, METH_VARARGS, (char *)"delete_RotationEuler(RotationEuler self)"},
-	 { (char *)"RotationEuler_swigregister", RotationEuler_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_ISelectionRule", _wrap_delete_ISelectionRule, METH_VARARGS, (char *)"\n"
+	 { "delete_RotationEuler", _wrap_delete_RotationEuler, METH_O, "delete_RotationEuler(RotationEuler self)"},
+	 { "RotationEuler_swigregister", RotationEuler_swigregister, METH_O, NULL},
+	 { "RotationEuler_swiginit", RotationEuler_swiginit, METH_VARARGS, NULL},
+	 { "delete_ISelectionRule", _wrap_delete_ISelectionRule, METH_O, "\n"
 		"delete_ISelectionRule(ISelectionRule self)\n"
-		"\n"
 		"virtual ISelectionRule::~ISelectionRule()\n"
 		"\n"
 		""},
-	 { (char *)"ISelectionRule_clone", _wrap_ISelectionRule_clone, METH_VARARGS, (char *)"\n"
+	 { "ISelectionRule_clone", _wrap_ISelectionRule_clone, METH_O, "\n"
 		"ISelectionRule_clone(ISelectionRule self) -> ISelectionRule\n"
-		"\n"
 		"virtual ISelectionRule* ISelectionRule::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"ISelectionRule_coordinateSelected", _wrap_ISelectionRule_coordinateSelected, METH_VARARGS, (char *)"\n"
+	 { "ISelectionRule_coordinateSelected", _wrap_ISelectionRule_coordinateSelected, METH_VARARGS, "\n"
 		"ISelectionRule_coordinateSelected(ISelectionRule self, ivector_t const & coordinate) -> bool\n"
-		"\n"
 		"virtual bool ISelectionRule::coordinateSelected(const ivector_t &coordinate) const =0\n"
 		"\n"
 		""},
-	 { (char *)"ISelectionRule_swigregister", ISelectionRule_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SimpleSelectionRule", _wrap_new_SimpleSelectionRule, METH_VARARGS, (char *)"\n"
+	 { "ISelectionRule_swigregister", ISelectionRule_swigregister, METH_O, NULL},
+	 { "new_SimpleSelectionRule", _wrap_new_SimpleSelectionRule, METH_VARARGS, "\n"
 		"new_SimpleSelectionRule(int a, int b, int c, int modulus) -> SimpleSelectionRule\n"
-		"\n"
 		"SimpleSelectionRule::SimpleSelectionRule(int a, int b, int c, int modulus)\n"
 		"\n"
 		""},
-	 { (char *)"delete_SimpleSelectionRule", _wrap_delete_SimpleSelectionRule, METH_VARARGS, (char *)"\n"
+	 { "delete_SimpleSelectionRule", _wrap_delete_SimpleSelectionRule, METH_O, "\n"
 		"delete_SimpleSelectionRule(SimpleSelectionRule self)\n"
-		"\n"
 		"virtual SimpleSelectionRule::~SimpleSelectionRule()\n"
 		"\n"
 		""},
-	 { (char *)"SimpleSelectionRule_clone", _wrap_SimpleSelectionRule_clone, METH_VARARGS, (char *)"\n"
+	 { "SimpleSelectionRule_clone", _wrap_SimpleSelectionRule_clone, METH_O, "\n"
 		"SimpleSelectionRule_clone(SimpleSelectionRule self) -> SimpleSelectionRule\n"
-		"\n"
 		"SimpleSelectionRule * SimpleSelectionRule::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"SimpleSelectionRule_coordinateSelected", _wrap_SimpleSelectionRule_coordinateSelected, METH_VARARGS, (char *)"\n"
+	 { "SimpleSelectionRule_coordinateSelected", _wrap_SimpleSelectionRule_coordinateSelected, METH_VARARGS, "\n"
 		"SimpleSelectionRule_coordinateSelected(SimpleSelectionRule self, ivector_t const & coordinate) -> bool\n"
-		"\n"
 		"bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const\n"
 		"\n"
 		""},
-	 { (char *)"SimpleSelectionRule_swigregister", SimpleSelectionRule_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Instrument", _wrap_new_Instrument, METH_VARARGS, (char *)"\n"
+	 { "SimpleSelectionRule_swigregister", SimpleSelectionRule_swigregister, METH_O, NULL},
+	 { "SimpleSelectionRule_swiginit", SimpleSelectionRule_swiginit, METH_VARARGS, NULL},
+	 { "new_Instrument", _wrap_new_Instrument, METH_VARARGS, "\n"
 		"Instrument()\n"
 		"new_Instrument(Instrument other) -> Instrument\n"
-		"\n"
 		"Instrument::Instrument(const Instrument &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Instrument", _wrap_delete_Instrument, METH_VARARGS, (char *)"\n"
+	 { "delete_Instrument", _wrap_delete_Instrument, METH_O, "\n"
 		"delete_Instrument(Instrument self)\n"
-		"\n"
 		"Instrument::~Instrument()\n"
 		"\n"
 		""},
-	 { (char *)"Instrument_accept", _wrap_Instrument_accept, METH_VARARGS, (char *)"\n"
+	 { "Instrument_accept", _wrap_Instrument_accept, METH_VARARGS, "\n"
 		"Instrument_accept(Instrument self, INodeVisitor visitor)\n"
-		"\n"
 		"void Instrument::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getBeam", _wrap_Instrument_getBeam, METH_VARARGS, (char *)"\n"
-		"getBeam() -> Beam\n"
+	 { "Instrument_getBeam", _wrap_Instrument_getBeam, METH_VARARGS, "\n"
+		"Instrument_getBeam(Instrument self) -> Beam\n"
 		"Instrument_getBeam(Instrument self) -> Beam\n"
-		"\n"
 		"const Beam& Instrument::getBeam() const\n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setBeam", _wrap_Instrument_setBeam, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setBeam", _wrap_Instrument_setBeam, METH_VARARGS, "\n"
 		"Instrument_setBeam(Instrument self, Beam beam)\n"
-		"\n"
 		"void Instrument::setBeam(const Beam &beam)\n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setBeamParameters", _wrap_Instrument_setBeamParameters, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setBeamParameters", _wrap_Instrument_setBeamParameters, METH_VARARGS, "\n"
 		"Instrument_setBeamParameters(Instrument self, double wavelength, double alpha_i, double phi_i)\n"
-		"\n"
 		"void Instrument::setBeamParameters(double wavelength, double alpha_i, double phi_i)\n"
 		"\n"
 		"Sets the beam wavelength and incoming angles. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setBeamIntensity", _wrap_Instrument_setBeamIntensity, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setBeamIntensity", _wrap_Instrument_setBeamIntensity, METH_VARARGS, "\n"
 		"Instrument_setBeamIntensity(Instrument self, double intensity)\n"
-		"\n"
 		"void Instrument::setBeamIntensity(double intensity)\n"
 		"\n"
 		"Sets the beam's intensity. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setBeamPolarization", _wrap_Instrument_setBeamPolarization, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setBeamPolarization", _wrap_Instrument_setBeamPolarization, METH_VARARGS, "\n"
 		"Instrument_setBeamPolarization(Instrument self, kvector_t bloch_vector)\n"
-		"\n"
 		"void Instrument::setBeamPolarization(const kvector_t bloch_vector)\n"
 		"\n"
 		"Sets the beam's polarization according to the given Bloch vector. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getBeamIntensity", _wrap_Instrument_getBeamIntensity, METH_VARARGS, (char *)"\n"
+	 { "Instrument_getBeamIntensity", _wrap_Instrument_getBeamIntensity, METH_O, "\n"
 		"Instrument_getBeamIntensity(Instrument self) -> double\n"
-		"\n"
 		"double Instrument::getBeamIntensity() const\n"
 		"\n"
 		"Returns the beam's intensity. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getDetector", _wrap_Instrument_getDetector, METH_VARARGS, (char *)"\n"
-		"getDetector() -> IDetector\n"
+	 { "Instrument_getDetector", _wrap_Instrument_getDetector, METH_VARARGS, "\n"
+		"Instrument_getDetector(Instrument self) -> IDetector\n"
 		"Instrument_getDetector(Instrument self) -> IDetector\n"
-		"\n"
 		"IDetector* Instrument::getDetector()\n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getDetectorMask", _wrap_Instrument_getDetectorMask, METH_VARARGS, (char *)"\n"
+	 { "Instrument_getDetectorMask", _wrap_Instrument_getDetectorMask, METH_O, "\n"
 		"Instrument_getDetectorMask(Instrument self) -> DetectorMask\n"
-		"\n"
 		"const DetectorMask * Instrument::getDetectorMask() const\n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getDetectorAxis", _wrap_Instrument_getDetectorAxis, METH_VARARGS, (char *)"\n"
+	 { "Instrument_getDetectorAxis", _wrap_Instrument_getDetectorAxis, METH_VARARGS, "\n"
 		"Instrument_getDetectorAxis(Instrument self, size_t index) -> IAxis\n"
-		"\n"
 		"const IAxis & Instrument::getDetectorAxis(size_t index) const\n"
 		"\n"
 		"Returns a detector axis. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getDetectorDimension", _wrap_Instrument_getDetectorDimension, METH_VARARGS, (char *)"\n"
+	 { "Instrument_getDetectorDimension", _wrap_Instrument_getDetectorDimension, METH_O, "\n"
 		"Instrument_getDetectorDimension(Instrument self) -> size_t\n"
-		"\n"
 		"size_t Instrument::getDetectorDimension() const\n"
 		"\n"
 		"Returns the detector's dimension. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setDetector", _wrap_Instrument_setDetector, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setDetector", _wrap_Instrument_setDetector, METH_VARARGS, "\n"
 		"Instrument_setDetector(Instrument self, IDetector detector)\n"
-		"\n"
 		"void Instrument::setDetector(const IDetector &detector)\n"
 		"\n"
 		"Sets the detector (axes can be overwritten later) \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setDetectorResolutionFunction", _wrap_Instrument_setDetectorResolutionFunction, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setDetectorResolutionFunction", _wrap_Instrument_setDetectorResolutionFunction, METH_VARARGS, "\n"
 		"Instrument_setDetectorResolutionFunction(Instrument self, IResolutionFunction2D p_resolution_function)\n"
-		"\n"
 		"void Instrument::setDetectorResolutionFunction(const IResolutionFunction2D &p_resolution_function)\n"
 		"\n"
 		"Sets detector resolution function. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_removeDetectorResolution", _wrap_Instrument_removeDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "Instrument_removeDetectorResolution", _wrap_Instrument_removeDetectorResolution, METH_O, "\n"
 		"Instrument_removeDetectorResolution(Instrument self)\n"
-		"\n"
 		"void Instrument::removeDetectorResolution()\n"
 		"\n"
 		"Removes detector resolution function. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_setAnalyzerProperties", _wrap_Instrument_setAnalyzerProperties, METH_VARARGS, (char *)"\n"
+	 { "Instrument_setAnalyzerProperties", _wrap_Instrument_setAnalyzerProperties, METH_VARARGS, "\n"
 		"Instrument_setAnalyzerProperties(Instrument self, kvector_t direction, double efficiency, double total_transmission)\n"
-		"\n"
 		"void Instrument::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)\n"
 		"\n"
 		"Sets the polarization analyzer characteristics of the detector. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_applyDetectorResolution", _wrap_Instrument_applyDetectorResolution, METH_VARARGS, (char *)"\n"
+	 { "Instrument_applyDetectorResolution", _wrap_Instrument_applyDetectorResolution, METH_VARARGS, "\n"
 		"Instrument_applyDetectorResolution(Instrument self, IntensityData p_intensity_map)\n"
-		"\n"
 		"void Instrument::applyDetectorResolution(OutputData< double > *p_intensity_map) const\n"
 		"\n"
 		"apply the detector resolution to the given intensity map \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_createDetectorIntensity", _wrap_Instrument_createDetectorIntensity, METH_VARARGS, (char *)"\n"
+	 { "Instrument_createDetectorIntensity", _wrap_Instrument_createDetectorIntensity, METH_VARARGS, "\n"
 		"Instrument_createDetectorIntensity(Instrument self, std::vector< SimulationElement,std::allocator< SimulationElement > > const & elements) -> IntensityData\n"
-		"\n"
 		"OutputData< double > * Instrument::createDetectorIntensity(const std::vector< SimulationElement > &elements) const\n"
 		"\n"
 		"Returns new intensity map with detector resolution applied and axes in requested units. \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_initDetector", _wrap_Instrument_initDetector, METH_VARARGS, (char *)"\n"
+	 { "Instrument_initDetector", _wrap_Instrument_initDetector, METH_O, "\n"
 		"Instrument_initDetector(Instrument self)\n"
-		"\n"
 		"void Instrument::initDetector()\n"
 		"\n"
 		"init detector with beam settings \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_getChildren", _wrap_Instrument_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Instrument_getChildren", _wrap_Instrument_getChildren, METH_O, "\n"
 		"Instrument_getChildren(Instrument self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Instrument::getChildren() const\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"Instrument_swigregister", Instrument_swigregister, METH_VARARGS, NULL},
-	 { (char *)"RelativeDifference", _wrap_RelativeDifference, METH_VARARGS, (char *)"\n"
+	 { "Instrument_swigregister", Instrument_swigregister, METH_O, NULL},
+	 { "Instrument_swiginit", Instrument_swiginit, METH_VARARGS, NULL},
+	 { "RelativeDifference", _wrap_RelativeDifference, METH_VARARGS, "\n"
 		"RelativeDifference(SimulationResult dat, SimulationResult ref) -> double\n"
-		"\n"
 		"double IntensityDataFunctions::RelativeDifference(const SimulationResult &dat, const SimulationResult &ref)\n"
 		"\n"
 		"Returns sum of relative differences between each pair of elements: (a, b) -> 2*abs(a - b)/(a + b) ( and zero if a-b=0 )\n"
@@ -135153,67 +131439,58 @@ static PyMethodDef SwigMethods[] = {
 		"Returns sum of relative differences between each pair of elements: (a, b) -> 2*abs(a - b)/(|a| + |b|) ( and zero if a=b=0 within epsilon ) \n"
 		"\n"
 		""},
-	 { (char *)"getRelativeDifference", _wrap_getRelativeDifference, METH_VARARGS, (char *)"\n"
+	 { "getRelativeDifference", _wrap_getRelativeDifference, METH_VARARGS, "\n"
 		"getRelativeDifference(IntensityData dat, IntensityData ref) -> double\n"
 		"getRelativeDifference(IHistogram dat, IHistogram ref) -> double\n"
-		"\n"
 		"double IntensityDataFunctions::getRelativeDifference(const IHistogram &dat, const IHistogram &ref)\n"
 		"\n"
 		""},
-	 { (char *)"coordinateToBinf", _wrap_coordinateToBinf, METH_VARARGS, (char *)"\n"
+	 { "coordinateToBinf", _wrap_coordinateToBinf, METH_VARARGS, "\n"
 		"coordinateToBinf(double coordinate, IAxis axis) -> double\n"
 		"coordinateToBinf(double & x, double & y, IntensityData data)\n"
-		"\n"
 		"void IntensityDataFunctions::coordinateToBinf(double &x, double &y, const OutputData< double > &data)\n"
 		"\n"
 		"Transforms x,y coordinate from  OutputData axes coordinates to bin-fraction-coordinates. \n"
 		"\n"
 		""},
-	 { (char *)"coordinateFromBinf", _wrap_coordinateFromBinf, METH_VARARGS, (char *)"\n"
+	 { "coordinateFromBinf", _wrap_coordinateFromBinf, METH_VARARGS, "\n"
 		"coordinateFromBinf(double value, IAxis axis) -> double\n"
 		"coordinateFromBinf(double & x, double & y, IntensityData data)\n"
-		"\n"
 		"void IntensityDataFunctions::coordinateFromBinf(double &x, double &y, const OutputData< double > &data)\n"
 		"\n"
 		"Transforms x,y coordinate from bin-fraction-coordinates to  OutputData's axes coordinates. \n"
 		"\n"
 		""},
-	 { (char *)"create2DArrayfromOutputData", _wrap_create2DArrayfromOutputData, METH_VARARGS, (char *)"\n"
+	 { "create2DArrayfromOutputData", _wrap_create2DArrayfromOutputData, METH_O, "\n"
 		"create2DArrayfromOutputData(IntensityData data) -> vdouble2d_t\n"
-		"\n"
 		"std::vector< std::vector< double > > IntensityDataFunctions::create2DArrayfromOutputData(const OutputData< double > &data)\n"
 		"\n"
 		"Creates a vector of vectors of double (2D Array) from  OutputData. \n"
 		"\n"
 		""},
-	 { (char *)"FT2DArray", _wrap_FT2DArray, METH_VARARGS, (char *)"\n"
+	 { "FT2DArray", _wrap_FT2DArray, METH_O, "\n"
 		"FT2DArray(vdouble2d_t signal) -> vdouble2d_t\n"
-		"\n"
 		"std::vector< std::vector< double > > IntensityDataFunctions::FT2DArray(const std::vector< std::vector< double >> &signal)\n"
 		"\n"
 		"Creates a Fourier Transform of a 2D Array (vector of vectors). \n"
 		"\n"
 		""},
-	 { (char *)"ConvertData", _wrap_ConvertData, METH_VARARGS, (char *)"\n"
+	 { "ConvertData", _wrap_ConvertData, METH_VARARGS, "\n"
 		"ConvertData(Simulation simulation, IntensityData data, bool put_masked_areas_to_zero=True) -> SimulationResult\n"
-		"ConvertData(Simulation simulation, IntensityData data) -> SimulationResult\n"
 		"ConvertData(Simulation simulation, vdouble2d_t data, bool put_masked_areas_to_zero=True) -> SimulationResult\n"
-		"ConvertData(Simulation simulation, vdouble2d_t data) -> SimulationResult\n"
-		"\n"
 		"SimulationResult IntensityDataFunctions::ConvertData(const Simulation &simulation, const std::vector< std::vector< double >> &data, bool put_masked_areas_to_zero=true)\n"
 		"\n"
 		""},
-	 { (char *)"IntensityDataIOFactory_readOutputData", _wrap_IntensityDataIOFactory_readOutputData, METH_VARARGS, (char *)"IntensityDataIOFactory_readOutputData(std::string const & file_name) -> IntensityData"},
-	 { (char *)"IntensityDataIOFactory_readReflectometryData", _wrap_IntensityDataIOFactory_readReflectometryData, METH_VARARGS, (char *)"IntensityDataIOFactory_readReflectometryData(std::string const & file_name) -> IntensityData"},
-	 { (char *)"IntensityDataIOFactory_readIntensityData", _wrap_IntensityDataIOFactory_readIntensityData, METH_VARARGS, (char *)"IntensityDataIOFactory_readIntensityData(std::string const & file_name) -> IHistogram"},
-	 { (char *)"IntensityDataIOFactory_writeOutputData", _wrap_IntensityDataIOFactory_writeOutputData, METH_VARARGS, (char *)"IntensityDataIOFactory_writeOutputData(IntensityData data, std::string const & file_name)"},
-	 { (char *)"IntensityDataIOFactory_writeIntensityData", _wrap_IntensityDataIOFactory_writeIntensityData, METH_VARARGS, (char *)"IntensityDataIOFactory_writeIntensityData(IHistogram histogram, std::string const & file_name)"},
-	 { (char *)"IntensityDataIOFactory_writeSimulationResult", _wrap_IntensityDataIOFactory_writeSimulationResult, METH_VARARGS, (char *)"IntensityDataIOFactory_writeSimulationResult(SimulationResult result, std::string const & file_name)"},
-	 { (char *)"new_IntensityDataIOFactory", _wrap_new_IntensityDataIOFactory, METH_VARARGS, (char *)"\n"
+	 { "IntensityDataIOFactory_readOutputData", _wrap_IntensityDataIOFactory_readOutputData, METH_O, "IntensityDataIOFactory_readOutputData(std::string const & file_name) -> IntensityData"},
+	 { "IntensityDataIOFactory_readReflectometryData", _wrap_IntensityDataIOFactory_readReflectometryData, METH_O, "IntensityDataIOFactory_readReflectometryData(std::string const & file_name) -> IntensityData"},
+	 { "IntensityDataIOFactory_readIntensityData", _wrap_IntensityDataIOFactory_readIntensityData, METH_O, "IntensityDataIOFactory_readIntensityData(std::string const & file_name) -> IHistogram"},
+	 { "IntensityDataIOFactory_writeOutputData", _wrap_IntensityDataIOFactory_writeOutputData, METH_VARARGS, "IntensityDataIOFactory_writeOutputData(IntensityData data, std::string const & file_name)"},
+	 { "IntensityDataIOFactory_writeIntensityData", _wrap_IntensityDataIOFactory_writeIntensityData, METH_VARARGS, "IntensityDataIOFactory_writeIntensityData(IHistogram histogram, std::string const & file_name)"},
+	 { "IntensityDataIOFactory_writeSimulationResult", _wrap_IntensityDataIOFactory_writeSimulationResult, METH_VARARGS, "IntensityDataIOFactory_writeSimulationResult(SimulationResult result, std::string const & file_name)"},
+	 { "new_IntensityDataIOFactory", _wrap_new_IntensityDataIOFactory, METH_NOARGS, "\n"
 		"new_IntensityDataIOFactory() -> IntensityDataIOFactory\n"
 		"\n"
 		"\n"
-		"\n"
 		"Provides users with possibility to read and write IntensityData from/to files in different format. Type of the file will be deduced from file name. *.txt - ASCII file with 2D array [nrow][ncol], layout as in numpy. *.int -  BornAgain internal ASCII format. *.tif - 32-bits tiff file. If file name ends woth \"*.gz\" or \"*.bz2\" the file will be zipped on the fly using appropriate algorithm.\n"
 		"\n"
 		"Usage:\n"
@@ -135221,11 +131498,11 @@ static PyMethodDef SwigMethods[] = {
 		"C++ includes: IntensityDataIOFactory.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityDataIOFactory", _wrap_delete_IntensityDataIOFactory, METH_VARARGS, (char *)"delete_IntensityDataIOFactory(IntensityDataIOFactory self)"},
-	 { (char *)"IntensityDataIOFactory_swigregister", IntensityDataIOFactory_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunction1DLattice", _wrap_new_InterferenceFunction1DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityDataIOFactory", _wrap_delete_IntensityDataIOFactory, METH_O, "delete_IntensityDataIOFactory(IntensityDataIOFactory self)"},
+	 { "IntensityDataIOFactory_swigregister", IntensityDataIOFactory_swigregister, METH_O, NULL},
+	 { "IntensityDataIOFactory_swiginit", IntensityDataIOFactory_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunction1DLattice", _wrap_new_InterferenceFunction1DLattice, METH_VARARGS, "\n"
 		"new_InterferenceFunction1DLattice(double length, double xi) -> InterferenceFunction1DLattice\n"
-		"\n"
 		"InterferenceFunction1DLattice::InterferenceFunction1DLattice(double length, double xi)\n"
 		"\n"
 		"Constructor of interference function of one-dimensional lattice.\n"
@@ -135240,31 +131517,27 @@ static PyMethodDef SwigMethods[] = {
 		"rotation of lattice with respect to x-axis in radians \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunction1DLattice", _wrap_delete_InterferenceFunction1DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunction1DLattice", _wrap_delete_InterferenceFunction1DLattice, METH_O, "\n"
 		"delete_InterferenceFunction1DLattice(InterferenceFunction1DLattice self)\n"
-		"\n"
 		"InterferenceFunction1DLattice::~InterferenceFunction1DLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_clone", _wrap_InterferenceFunction1DLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_clone", _wrap_InterferenceFunction1DLattice_clone, METH_O, "\n"
 		"InterferenceFunction1DLattice_clone(InterferenceFunction1DLattice self) -> InterferenceFunction1DLattice\n"
-		"\n"
 		"InterferenceFunction1DLattice * InterferenceFunction1DLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_accept", _wrap_InterferenceFunction1DLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_accept", _wrap_InterferenceFunction1DLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunction1DLattice_accept(InterferenceFunction1DLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunction1DLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_setDecayFunction", _wrap_InterferenceFunction1DLattice_setDecayFunction, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_setDecayFunction", _wrap_InterferenceFunction1DLattice_setDecayFunction, METH_VARARGS, "\n"
 		"InterferenceFunction1DLattice_setDecayFunction(InterferenceFunction1DLattice self, IFTDecayFunction1D decay)\n"
-		"\n"
 		"void InterferenceFunction1DLattice::setDecayFunction(const IFTDecayFunction1D &decay)\n"
 		"\n"
 		"Sets one-dimensional decay function.\n"
@@ -135276,26 +131549,23 @@ static PyMethodDef SwigMethods[] = {
 		"one-dimensional decay function in reciprocal space \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_getLatticeParameters", _wrap_InterferenceFunction1DLattice_getLatticeParameters, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_getLatticeParameters", _wrap_InterferenceFunction1DLattice_getLatticeParameters, METH_O, "\n"
 		"InterferenceFunction1DLattice_getLatticeParameters(InterferenceFunction1DLattice self) -> Lattice1DParameters\n"
-		"\n"
 		"Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_getChildren", _wrap_InterferenceFunction1DLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_getChildren", _wrap_InterferenceFunction1DLattice_getChildren, METH_O, "\n"
 		"InterferenceFunction1DLattice_getChildren(InterferenceFunction1DLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunction1DLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction1DLattice_swigregister", InterferenceFunction1DLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunction2DLattice", _wrap_new_InterferenceFunction2DLattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction1DLattice_swigregister", InterferenceFunction1DLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunction1DLattice_swiginit", InterferenceFunction1DLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunction2DLattice", _wrap_new_InterferenceFunction2DLattice, METH_VARARGS, "\n"
 		"InterferenceFunction2DLattice(Lattice2D lattice)\n"
 		"InterferenceFunction2DLattice(double length_1, double length_2, double alpha, double xi=0.0)\n"
-		"new_InterferenceFunction2DLattice(double length_1, double length_2, double alpha) -> InterferenceFunction2DLattice\n"
-		"\n"
 		"InterferenceFunction2DLattice::InterferenceFunction2DLattice(double length_1, double length_2, double alpha, double xi=0.0)\n"
 		"\n"
 		"Constructor of two-dimensional interference function.\n"
@@ -135316,39 +131586,29 @@ static PyMethodDef SwigMethods[] = {
 		"rotation of the lattice with respect to the x-axis (beam direction) in radians \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunction2DLattice", _wrap_delete_InterferenceFunction2DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunction2DLattice", _wrap_delete_InterferenceFunction2DLattice, METH_O, "\n"
 		"delete_InterferenceFunction2DLattice(InterferenceFunction2DLattice self)\n"
-		"\n"
 		"InterferenceFunction2DLattice::~InterferenceFunction2DLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_clone", _wrap_InterferenceFunction2DLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_clone", _wrap_InterferenceFunction2DLattice_clone, METH_O, "\n"
 		"InterferenceFunction2DLattice_clone(InterferenceFunction2DLattice self) -> InterferenceFunction2DLattice\n"
-		"\n"
 		"InterferenceFunction2DLattice * InterferenceFunction2DLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_accept", _wrap_InterferenceFunction2DLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_accept", _wrap_InterferenceFunction2DLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunction2DLattice_accept(InterferenceFunction2DLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunction2DLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_createSquare", _wrap_InterferenceFunction2DLattice_createSquare, METH_VARARGS, (char *)"\n"
-		"createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice\n"
-		"InterferenceFunction2DLattice_createSquare(double lattice_length) -> InterferenceFunction2DLattice\n"
-		""},
-	 { (char *)"InterferenceFunction2DLattice_createHexagonal", _wrap_InterferenceFunction2DLattice_createHexagonal, METH_VARARGS, (char *)"\n"
-		"createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice\n"
-		"InterferenceFunction2DLattice_createHexagonal(double lattice_length) -> InterferenceFunction2DLattice\n"
-		""},
-	 { (char *)"InterferenceFunction2DLattice_setDecayFunction", _wrap_InterferenceFunction2DLattice_setDecayFunction, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_createSquare", _wrap_InterferenceFunction2DLattice_createSquare, METH_VARARGS, "InterferenceFunction2DLattice_createSquare(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"},
+	 { "InterferenceFunction2DLattice_createHexagonal", _wrap_InterferenceFunction2DLattice_createHexagonal, METH_VARARGS, "InterferenceFunction2DLattice_createHexagonal(double lattice_length, double xi=0.0) -> InterferenceFunction2DLattice"},
+	 { "InterferenceFunction2DLattice_setDecayFunction", _wrap_InterferenceFunction2DLattice_setDecayFunction, METH_VARARGS, "\n"
 		"InterferenceFunction2DLattice_setDecayFunction(InterferenceFunction2DLattice self, IFTDecayFunction2D decay)\n"
-		"\n"
 		"void InterferenceFunction2DLattice::setDecayFunction(const IFTDecayFunction2D &decay)\n"
 		"\n"
 		"Sets two-dimensional decay function.\n"
@@ -135360,58 +131620,47 @@ static PyMethodDef SwigMethods[] = {
 		"two-dimensional decay function in reciprocal space \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_setIntegrationOverXi", _wrap_InterferenceFunction2DLattice_setIntegrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_setIntegrationOverXi", _wrap_InterferenceFunction2DLattice_setIntegrationOverXi, METH_VARARGS, "\n"
 		"InterferenceFunction2DLattice_setIntegrationOverXi(InterferenceFunction2DLattice self, bool integrate_xi)\n"
-		"\n"
 		"void InterferenceFunction2DLattice::setIntegrationOverXi(bool integrate_xi)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_integrationOverXi", _wrap_InterferenceFunction2DLattice_integrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_integrationOverXi", _wrap_InterferenceFunction2DLattice_integrationOverXi, METH_O, "\n"
 		"InterferenceFunction2DLattice_integrationOverXi(InterferenceFunction2DLattice self) -> bool\n"
-		"\n"
 		"bool InterferenceFunction2DLattice::integrationOverXi() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_lattice", _wrap_InterferenceFunction2DLattice_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_lattice", _wrap_InterferenceFunction2DLattice_lattice, METH_O, "\n"
 		"InterferenceFunction2DLattice_lattice(InterferenceFunction2DLattice self) -> Lattice2D\n"
-		"\n"
 		"const Lattice2D & InterferenceFunction2DLattice::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_getParticleDensity", _wrap_InterferenceFunction2DLattice_getParticleDensity, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_getParticleDensity", _wrap_InterferenceFunction2DLattice_getParticleDensity, METH_O, "\n"
 		"InterferenceFunction2DLattice_getParticleDensity(InterferenceFunction2DLattice self) -> double\n"
-		"\n"
 		"double InterferenceFunction2DLattice::getParticleDensity() const override final\n"
 		"\n"
 		"Returns the particle density associated with this 2d lattice. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_getChildren", _wrap_InterferenceFunction2DLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_getChildren", _wrap_InterferenceFunction2DLattice_getChildren, METH_O, "\n"
 		"InterferenceFunction2DLattice_getChildren(InterferenceFunction2DLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunction2DLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_onChange", _wrap_InterferenceFunction2DLattice_onChange, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_onChange", _wrap_InterferenceFunction2DLattice_onChange, METH_O, "\n"
 		"InterferenceFunction2DLattice_onChange(InterferenceFunction2DLattice self)\n"
-		"\n"
 		"void InterferenceFunction2DLattice::onChange() override final\n"
 		"\n"
 		"Action to be taken in inherited class when a parameter has changed. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DLattice_swigregister", InterferenceFunction2DLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunction2DParaCrystal", _wrap_new_InterferenceFunction2DParaCrystal, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DLattice_swigregister", InterferenceFunction2DLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunction2DLattice_swiginit", InterferenceFunction2DLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunction2DParaCrystal", _wrap_new_InterferenceFunction2DParaCrystal, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal(Lattice2D lattice, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0)\n"
-		"InterferenceFunction2DParaCrystal(Lattice2D lattice, double damping_length=0.0, double domain_size_1=0.0)\n"
-		"InterferenceFunction2DParaCrystal(Lattice2D lattice, double damping_length=0.0)\n"
-		"InterferenceFunction2DParaCrystal(Lattice2D lattice)\n"
 		"InterferenceFunction2DParaCrystal(double length_1, double length_2, double alpha, double xi=0.0, double damping_length=0.0)\n"
-		"InterferenceFunction2DParaCrystal(double length_1, double length_2, double alpha, double xi=0.0)\n"
-		"new_InterferenceFunction2DParaCrystal(double length_1, double length_2, double alpha) -> InterferenceFunction2DParaCrystal\n"
-		"\n"
 		"InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(double length_1, double length_2, double alpha, double xi=0.0, double damping_length=0.0)\n"
 		"\n"
 		"Constructor of interference function of two-dimensional paracrystal.\n"
@@ -135435,43 +131684,29 @@ static PyMethodDef SwigMethods[] = {
 		"the damping (coherence) length of the paracrystal in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunction2DParaCrystal", _wrap_delete_InterferenceFunction2DParaCrystal, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunction2DParaCrystal", _wrap_delete_InterferenceFunction2DParaCrystal, METH_O, "\n"
 		"delete_InterferenceFunction2DParaCrystal(InterferenceFunction2DParaCrystal self)\n"
-		"\n"
 		"InterferenceFunction2DParaCrystal::~InterferenceFunction2DParaCrystal() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_clone", _wrap_InterferenceFunction2DParaCrystal_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_clone", _wrap_InterferenceFunction2DParaCrystal_clone, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_clone(InterferenceFunction2DParaCrystal self) -> InterferenceFunction2DParaCrystal\n"
-		"\n"
 		"InterferenceFunction2DParaCrystal * InterferenceFunction2DParaCrystal::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_accept", _wrap_InterferenceFunction2DParaCrystal_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_accept", _wrap_InterferenceFunction2DParaCrystal_accept, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal_accept(InterferenceFunction2DParaCrystal self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunction2DParaCrystal::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_createSquare", _wrap_InterferenceFunction2DParaCrystal_createSquare, METH_VARARGS, (char *)"\n"
-		"createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"createSquare(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"InterferenceFunction2DParaCrystal_createSquare(double lattice_length) -> InterferenceFunction2DParaCrystal\n"
-		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_createHexagonal", _wrap_InterferenceFunction2DParaCrystal_createHexagonal, METH_VARARGS, (char *)"\n"
-		"createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"createHexagonal(double lattice_length, double damping_length=0.0) -> InterferenceFunction2DParaCrystal\n"
-		"InterferenceFunction2DParaCrystal_createHexagonal(double lattice_length) -> InterferenceFunction2DParaCrystal\n"
-		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_setDomainSizes", _wrap_InterferenceFunction2DParaCrystal_setDomainSizes, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_createSquare", _wrap_InterferenceFunction2DParaCrystal_createSquare, METH_VARARGS, "InterferenceFunction2DParaCrystal_createSquare(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"},
+	 { "InterferenceFunction2DParaCrystal_createHexagonal", _wrap_InterferenceFunction2DParaCrystal_createHexagonal, METH_VARARGS, "InterferenceFunction2DParaCrystal_createHexagonal(double lattice_length, double damping_length=0.0, double domain_size_1=0.0, double domain_size_2=0.0) -> InterferenceFunction2DParaCrystal"},
+	 { "InterferenceFunction2DParaCrystal_setDomainSizes", _wrap_InterferenceFunction2DParaCrystal_setDomainSizes, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal_setDomainSizes(InterferenceFunction2DParaCrystal self, double size_1, double size_2)\n"
-		"\n"
 		"void InterferenceFunction2DParaCrystal::setDomainSizes(double size_1, double size_2)\n"
 		"\n"
 		"Sets the sizes of coherence domains.\n"
@@ -135486,9 +131721,8 @@ static PyMethodDef SwigMethods[] = {
 		"coherence domain size along the second basis vector in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_setProbabilityDistributions", _wrap_InterferenceFunction2DParaCrystal_setProbabilityDistributions, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_setProbabilityDistributions", _wrap_InterferenceFunction2DParaCrystal_setProbabilityDistributions, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal_setProbabilityDistributions(InterferenceFunction2DParaCrystal self, IFTDistribution2D pdf_1, IFTDistribution2D pdf_2)\n"
-		"\n"
 		"void InterferenceFunction2DParaCrystal::setProbabilityDistributions(const IFTDistribution2D &pdf_1, const IFTDistribution2D &pdf_2)\n"
 		"\n"
 		"Sets the probability distributions (Fourier transformed) for the two lattice directions.\n"
@@ -135503,9 +131737,8 @@ static PyMethodDef SwigMethods[] = {
 		"probability distribution in second lattice direction \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_setDampingLength", _wrap_InterferenceFunction2DParaCrystal_setDampingLength, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_setDampingLength", _wrap_InterferenceFunction2DParaCrystal_setDampingLength, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal_setDampingLength(InterferenceFunction2DParaCrystal self, double damping_length)\n"
-		"\n"
 		"void InterferenceFunction2DParaCrystal::setDampingLength(double damping_length)\n"
 		"\n"
 		"Sets the damping length.\n"
@@ -135517,15 +131750,13 @@ static PyMethodDef SwigMethods[] = {
 		"the damping (coherence) length of the paracrystal in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_domainSizes", _wrap_InterferenceFunction2DParaCrystal_domainSizes, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_domainSizes", _wrap_InterferenceFunction2DParaCrystal_domainSizes, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_domainSizes(InterferenceFunction2DParaCrystal self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_setIntegrationOverXi", _wrap_InterferenceFunction2DParaCrystal_setIntegrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_setIntegrationOverXi", _wrap_InterferenceFunction2DParaCrystal_setIntegrationOverXi, METH_VARARGS, "\n"
 		"InterferenceFunction2DParaCrystal_setIntegrationOverXi(InterferenceFunction2DParaCrystal self, bool integrate_xi)\n"
-		"\n"
 		"void InterferenceFunction2DParaCrystal::setIntegrationOverXi(bool integrate_xi)\n"
 		"\n"
 		"Enables/disables averaging over the lattice rotation angle.\n"
@@ -135537,57 +131768,50 @@ static PyMethodDef SwigMethods[] = {
 		"integration flag \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_integrationOverXi", _wrap_InterferenceFunction2DParaCrystal_integrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_integrationOverXi", _wrap_InterferenceFunction2DParaCrystal_integrationOverXi, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_integrationOverXi(InterferenceFunction2DParaCrystal self) -> bool\n"
-		"\n"
 		"bool InterferenceFunction2DParaCrystal::integrationOverXi() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_dampingLength", _wrap_InterferenceFunction2DParaCrystal_dampingLength, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_dampingLength", _wrap_InterferenceFunction2DParaCrystal_dampingLength, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_dampingLength(InterferenceFunction2DParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunction2DParaCrystal::dampingLength() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_lattice", _wrap_InterferenceFunction2DParaCrystal_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_lattice", _wrap_InterferenceFunction2DParaCrystal_lattice, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_lattice(InterferenceFunction2DParaCrystal self) -> Lattice2D\n"
-		"\n"
 		"const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_getParticleDensity", _wrap_InterferenceFunction2DParaCrystal_getParticleDensity, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_getParticleDensity", _wrap_InterferenceFunction2DParaCrystal_getParticleDensity, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_getParticleDensity(InterferenceFunction2DParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunction2DParaCrystal::getParticleDensity() const override final\n"
 		"\n"
 		"If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_getChildren", _wrap_InterferenceFunction2DParaCrystal_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_getChildren", _wrap_InterferenceFunction2DParaCrystal_getChildren, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_getChildren(InterferenceFunction2DParaCrystal self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunction2DParaCrystal::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_pdf1", _wrap_InterferenceFunction2DParaCrystal_pdf1, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_pdf1", _wrap_InterferenceFunction2DParaCrystal_pdf1, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_pdf1(InterferenceFunction2DParaCrystal self) -> IFTDistribution2D\n"
-		"\n"
 		"const IFTDistribution2D* InterferenceFunction2DParaCrystal::pdf1() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_pdf2", _wrap_InterferenceFunction2DParaCrystal_pdf2, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_pdf2", _wrap_InterferenceFunction2DParaCrystal_pdf2, METH_O, "\n"
 		"InterferenceFunction2DParaCrystal_pdf2(InterferenceFunction2DParaCrystal self) -> IFTDistribution2D\n"
-		"\n"
 		"const IFTDistribution2D* InterferenceFunction2DParaCrystal::pdf2() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DParaCrystal_swigregister", InterferenceFunction2DParaCrystal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunction2DSuperLattice", _wrap_new_InterferenceFunction2DSuperLattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DParaCrystal_swigregister", InterferenceFunction2DParaCrystal_swigregister, METH_O, NULL},
+	 { "InterferenceFunction2DParaCrystal_swiginit", InterferenceFunction2DParaCrystal_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunction2DSuperLattice", _wrap_new_InterferenceFunction2DSuperLattice, METH_VARARGS, "\n"
 		"InterferenceFunction2DSuperLattice(Lattice2D lattice, unsigned int size_1, unsigned int size_2)\n"
 		"new_InterferenceFunction2DSuperLattice(double length_1, double length_2, double alpha, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice\n"
-		"\n"
 		"InterferenceFunction2DSuperLattice::InterferenceFunction2DSuperLattice(double length_1, double length_2, double alpha, double xi, unsigned size_1, unsigned size_2)\n"
 		"\n"
 		"Constructor of two-dimensional interference function.\n"
@@ -135608,159 +131832,138 @@ static PyMethodDef SwigMethods[] = {
 		"rotation of lattice with respect to x-axis (beam direction) in radians \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunction2DSuperLattice", _wrap_delete_InterferenceFunction2DSuperLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunction2DSuperLattice", _wrap_delete_InterferenceFunction2DSuperLattice, METH_O, "\n"
 		"delete_InterferenceFunction2DSuperLattice(InterferenceFunction2DSuperLattice self)\n"
-		"\n"
 		"InterferenceFunction2DSuperLattice::~InterferenceFunction2DSuperLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_clone", _wrap_InterferenceFunction2DSuperLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_clone", _wrap_InterferenceFunction2DSuperLattice_clone, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_clone(InterferenceFunction2DSuperLattice self) -> InterferenceFunction2DSuperLattice\n"
-		"\n"
 		"InterferenceFunction2DSuperLattice * InterferenceFunction2DSuperLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_accept", _wrap_InterferenceFunction2DSuperLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_accept", _wrap_InterferenceFunction2DSuperLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunction2DSuperLattice_accept(InterferenceFunction2DSuperLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunction2DSuperLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_setSubstructureIFF", _wrap_InterferenceFunction2DSuperLattice_setSubstructureIFF, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_setSubstructureIFF", _wrap_InterferenceFunction2DSuperLattice_setSubstructureIFF, METH_VARARGS, "\n"
 		"InterferenceFunction2DSuperLattice_setSubstructureIFF(InterferenceFunction2DSuperLattice self, IInterferenceFunction sub_iff)\n"
-		"\n"
 		"void InterferenceFunction2DSuperLattice::setSubstructureIFF(const IInterferenceFunction &sub_iff)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_substructureIFF", _wrap_InterferenceFunction2DSuperLattice_substructureIFF, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_substructureIFF", _wrap_InterferenceFunction2DSuperLattice_substructureIFF, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_substructureIFF(InterferenceFunction2DSuperLattice self) -> IInterferenceFunction\n"
-		"\n"
 		"const IInterferenceFunction & InterferenceFunction2DSuperLattice::substructureIFF() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_createSquare", _wrap_InterferenceFunction2DSuperLattice_createSquare, METH_VARARGS, (char *)"InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
-	 { (char *)"InterferenceFunction2DSuperLattice_createHexagonal", _wrap_InterferenceFunction2DSuperLattice_createHexagonal, METH_VARARGS, (char *)"InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
-	 { (char *)"InterferenceFunction2DSuperLattice_evaluate", _wrap_InterferenceFunction2DSuperLattice_evaluate, METH_VARARGS, (char *)"\n"
-		"evaluate(kvector_t q, double outer_iff=1.0) -> double\n"
-		"InterferenceFunction2DSuperLattice_evaluate(InterferenceFunction2DSuperLattice self, kvector_t q) -> double\n"
-		"\n"
+	 { "InterferenceFunction2DSuperLattice_createSquare", _wrap_InterferenceFunction2DSuperLattice_createSquare, METH_VARARGS, "InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
+	 { "InterferenceFunction2DSuperLattice_createHexagonal", _wrap_InterferenceFunction2DSuperLattice_createHexagonal, METH_VARARGS, "InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
+	 { "InterferenceFunction2DSuperLattice_evaluate", _wrap_InterferenceFunction2DSuperLattice_evaluate, METH_VARARGS, "\n"
+		"InterferenceFunction2DSuperLattice_evaluate(InterferenceFunction2DSuperLattice self, kvector_t q, double outer_iff=1.0) -> double\n"
 		"double InterferenceFunction2DSuperLattice::evaluate(const kvector_t q, double outer_iff=1.0) const override final\n"
 		"\n"
 		"Evaluates the interference function for a given wavevector transfer. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_domainSize1", _wrap_InterferenceFunction2DSuperLattice_domainSize1, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_domainSize1", _wrap_InterferenceFunction2DSuperLattice_domainSize1, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_domainSize1(InterferenceFunction2DSuperLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunction2DSuperLattice::domainSize1() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_domainSize2", _wrap_InterferenceFunction2DSuperLattice_domainSize2, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_domainSize2", _wrap_InterferenceFunction2DSuperLattice_domainSize2, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_domainSize2(InterferenceFunction2DSuperLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunction2DSuperLattice::domainSize2() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_setIntegrationOverXi", _wrap_InterferenceFunction2DSuperLattice_setIntegrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_setIntegrationOverXi", _wrap_InterferenceFunction2DSuperLattice_setIntegrationOverXi, METH_VARARGS, "\n"
 		"InterferenceFunction2DSuperLattice_setIntegrationOverXi(InterferenceFunction2DSuperLattice self, bool integrate_xi)\n"
-		"\n"
 		"void InterferenceFunction2DSuperLattice::setIntegrationOverXi(bool integrate_xi)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_integrationOverXi", _wrap_InterferenceFunction2DSuperLattice_integrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_integrationOverXi", _wrap_InterferenceFunction2DSuperLattice_integrationOverXi, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_integrationOverXi(InterferenceFunction2DSuperLattice self) -> bool\n"
-		"\n"
 		"bool InterferenceFunction2DSuperLattice::integrationOverXi() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_lattice", _wrap_InterferenceFunction2DSuperLattice_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_lattice", _wrap_InterferenceFunction2DSuperLattice_lattice, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_lattice(InterferenceFunction2DSuperLattice self) -> Lattice2D\n"
-		"\n"
 		"const Lattice2D & InterferenceFunction2DSuperLattice::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_getChildren", _wrap_InterferenceFunction2DSuperLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_getChildren", _wrap_InterferenceFunction2DSuperLattice_getChildren, METH_O, "\n"
 		"InterferenceFunction2DSuperLattice_getChildren(InterferenceFunction2DSuperLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunction2DSuperLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction2DSuperLattice_swigregister", InterferenceFunction2DSuperLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunction3DLattice", _wrap_new_InterferenceFunction3DLattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction2DSuperLattice_swigregister", InterferenceFunction2DSuperLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunction2DSuperLattice_swiginit", InterferenceFunction2DSuperLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunction3DLattice", _wrap_new_InterferenceFunction3DLattice, METH_O, "\n"
 		"new_InterferenceFunction3DLattice(Lattice lattice) -> InterferenceFunction3DLattice\n"
-		"\n"
 		"InterferenceFunction3DLattice::InterferenceFunction3DLattice(const Lattice &lattice)\n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunction3DLattice", _wrap_delete_InterferenceFunction3DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunction3DLattice", _wrap_delete_InterferenceFunction3DLattice, METH_O, "\n"
 		"delete_InterferenceFunction3DLattice(InterferenceFunction3DLattice self)\n"
-		"\n"
 		"InterferenceFunction3DLattice::~InterferenceFunction3DLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_clone", _wrap_InterferenceFunction3DLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_clone", _wrap_InterferenceFunction3DLattice_clone, METH_O, "\n"
 		"InterferenceFunction3DLattice_clone(InterferenceFunction3DLattice self) -> InterferenceFunction3DLattice\n"
-		"\n"
 		"InterferenceFunction3DLattice * InterferenceFunction3DLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_accept", _wrap_InterferenceFunction3DLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_accept", _wrap_InterferenceFunction3DLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunction3DLattice_accept(InterferenceFunction3DLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunction3DLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_setPeakShape", _wrap_InterferenceFunction3DLattice_setPeakShape, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_setPeakShape", _wrap_InterferenceFunction3DLattice_setPeakShape, METH_VARARGS, "\n"
 		"InterferenceFunction3DLattice_setPeakShape(InterferenceFunction3DLattice self, IPeakShape peak_shape)\n"
-		"\n"
 		"void InterferenceFunction3DLattice::setPeakShape(const IPeakShape &peak_shape)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_lattice", _wrap_InterferenceFunction3DLattice_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_lattice", _wrap_InterferenceFunction3DLattice_lattice, METH_O, "\n"
 		"InterferenceFunction3DLattice_lattice(InterferenceFunction3DLattice self) -> Lattice\n"
-		"\n"
 		"const Lattice & InterferenceFunction3DLattice::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_supportsMultilayer", _wrap_InterferenceFunction3DLattice_supportsMultilayer, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_supportsMultilayer", _wrap_InterferenceFunction3DLattice_supportsMultilayer, METH_O, "\n"
 		"InterferenceFunction3DLattice_supportsMultilayer(InterferenceFunction3DLattice self) -> bool\n"
-		"\n"
 		"bool InterferenceFunction3DLattice::supportsMultilayer() const override final\n"
 		"\n"
 		"Indicates if this interference function can be used with a multilayer (DWBA mode) \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_getChildren", _wrap_InterferenceFunction3DLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_getChildren", _wrap_InterferenceFunction3DLattice_getChildren, METH_O, "\n"
 		"InterferenceFunction3DLattice_getChildren(InterferenceFunction3DLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunction3DLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_onChange", _wrap_InterferenceFunction3DLattice_onChange, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_onChange", _wrap_InterferenceFunction3DLattice_onChange, METH_O, "\n"
 		"InterferenceFunction3DLattice_onChange(InterferenceFunction3DLattice self)\n"
-		"\n"
 		"void InterferenceFunction3DLattice::onChange() override final\n"
 		"\n"
 		"Action to be taken in inherited class when a parameter has changed. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunction3DLattice_swigregister", InterferenceFunction3DLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionFinite2DLattice", _wrap_new_InterferenceFunctionFinite2DLattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunction3DLattice_swigregister", InterferenceFunction3DLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunction3DLattice_swiginit", InterferenceFunction3DLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionFinite2DLattice", _wrap_new_InterferenceFunctionFinite2DLattice, METH_VARARGS, "\n"
 		"InterferenceFunctionFinite2DLattice(Lattice2D lattice, unsigned int N_1, unsigned int N_2)\n"
 		"new_InterferenceFunctionFinite2DLattice(double length_1, double length_2, double alpha, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice\n"
-		"\n"
 		"InterferenceFunctionFinite2DLattice::InterferenceFunctionFinite2DLattice(double length_1, double length_2, double alpha, double xi, unsigned N_1, unsigned N_2)\n"
 		"\n"
 		"Constructor of two-dimensional finite lattice interference function.\n"
@@ -135787,80 +131990,70 @@ static PyMethodDef SwigMethods[] = {
 		"number of lattice cells in the second lattice direction \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionFinite2DLattice", _wrap_delete_InterferenceFunctionFinite2DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionFinite2DLattice", _wrap_delete_InterferenceFunctionFinite2DLattice, METH_O, "\n"
 		"delete_InterferenceFunctionFinite2DLattice(InterferenceFunctionFinite2DLattice self)\n"
-		"\n"
 		"InterferenceFunctionFinite2DLattice::~InterferenceFunctionFinite2DLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_clone", _wrap_InterferenceFunctionFinite2DLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_clone", _wrap_InterferenceFunctionFinite2DLattice_clone, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_clone(InterferenceFunctionFinite2DLattice self) -> InterferenceFunctionFinite2DLattice\n"
-		"\n"
 		"InterferenceFunctionFinite2DLattice * InterferenceFunctionFinite2DLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_accept", _wrap_InterferenceFunctionFinite2DLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_accept", _wrap_InterferenceFunctionFinite2DLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionFinite2DLattice_accept(InterferenceFunctionFinite2DLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionFinite2DLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_createSquare", _wrap_InterferenceFunctionFinite2DLattice_createSquare, METH_VARARGS, (char *)"InterferenceFunctionFinite2DLattice_createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"},
-	 { (char *)"InterferenceFunctionFinite2DLattice_createHexagonal", _wrap_InterferenceFunctionFinite2DLattice_createHexagonal, METH_VARARGS, (char *)"InterferenceFunctionFinite2DLattice_createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"},
-	 { (char *)"InterferenceFunctionFinite2DLattice_numberUnitCells1", _wrap_InterferenceFunctionFinite2DLattice_numberUnitCells1, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_createSquare", _wrap_InterferenceFunctionFinite2DLattice_createSquare, METH_VARARGS, "InterferenceFunctionFinite2DLattice_createSquare(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"},
+	 { "InterferenceFunctionFinite2DLattice_createHexagonal", _wrap_InterferenceFunctionFinite2DLattice_createHexagonal, METH_VARARGS, "InterferenceFunctionFinite2DLattice_createHexagonal(double lattice_length, double xi, unsigned int N_1, unsigned int N_2) -> InterferenceFunctionFinite2DLattice"},
+	 { "InterferenceFunctionFinite2DLattice_numberUnitCells1", _wrap_InterferenceFunctionFinite2DLattice_numberUnitCells1, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_numberUnitCells1(InterferenceFunctionFinite2DLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunctionFinite2DLattice::numberUnitCells1() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_numberUnitCells2", _wrap_InterferenceFunctionFinite2DLattice_numberUnitCells2, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_numberUnitCells2", _wrap_InterferenceFunctionFinite2DLattice_numberUnitCells2, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_numberUnitCells2(InterferenceFunctionFinite2DLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunctionFinite2DLattice::numberUnitCells2() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_setIntegrationOverXi", _wrap_InterferenceFunctionFinite2DLattice_setIntegrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_setIntegrationOverXi", _wrap_InterferenceFunctionFinite2DLattice_setIntegrationOverXi, METH_VARARGS, "\n"
 		"InterferenceFunctionFinite2DLattice_setIntegrationOverXi(InterferenceFunctionFinite2DLattice self, bool integrate_xi)\n"
-		"\n"
 		"void InterferenceFunctionFinite2DLattice::setIntegrationOverXi(bool integrate_xi)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_integrationOverXi", _wrap_InterferenceFunctionFinite2DLattice_integrationOverXi, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_integrationOverXi", _wrap_InterferenceFunctionFinite2DLattice_integrationOverXi, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_integrationOverXi(InterferenceFunctionFinite2DLattice self) -> bool\n"
-		"\n"
 		"bool InterferenceFunctionFinite2DLattice::integrationOverXi() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_lattice", _wrap_InterferenceFunctionFinite2DLattice_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_lattice", _wrap_InterferenceFunctionFinite2DLattice_lattice, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_lattice(InterferenceFunctionFinite2DLattice self) -> Lattice2D\n"
-		"\n"
 		"const Lattice2D & InterferenceFunctionFinite2DLattice::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_getParticleDensity", _wrap_InterferenceFunctionFinite2DLattice_getParticleDensity, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_getParticleDensity", _wrap_InterferenceFunctionFinite2DLattice_getParticleDensity, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_getParticleDensity(InterferenceFunctionFinite2DLattice self) -> double\n"
-		"\n"
 		"double InterferenceFunctionFinite2DLattice::getParticleDensity() const override final\n"
 		"\n"
 		"Returns the particle density associated with this 2d lattice. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_getChildren", _wrap_InterferenceFunctionFinite2DLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_getChildren", _wrap_InterferenceFunctionFinite2DLattice_getChildren, METH_O, "\n"
 		"InterferenceFunctionFinite2DLattice_getChildren(InterferenceFunctionFinite2DLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunctionFinite2DLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite2DLattice_swigregister", InterferenceFunctionFinite2DLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionFinite3DLattice", _wrap_new_InterferenceFunctionFinite3DLattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite2DLattice_swigregister", InterferenceFunctionFinite2DLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionFinite2DLattice_swiginit", InterferenceFunctionFinite2DLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionFinite3DLattice", _wrap_new_InterferenceFunctionFinite3DLattice, METH_VARARGS, "\n"
 		"new_InterferenceFunctionFinite3DLattice(Lattice lattice, unsigned int N_1, unsigned int N_2, unsigned int N_3) -> InterferenceFunctionFinite3DLattice\n"
-		"\n"
 		"InterferenceFunctionFinite3DLattice::InterferenceFunctionFinite3DLattice(const Lattice &lattice, unsigned N_1, unsigned N_2, unsigned N_3)\n"
 		"\n"
 		"Constructor of three-dimensional finite lattice interference function.\n"
@@ -135878,146 +132071,128 @@ static PyMethodDef SwigMethods[] = {
 		"number of lattice cells in the second lattice direction \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionFinite3DLattice", _wrap_delete_InterferenceFunctionFinite3DLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionFinite3DLattice", _wrap_delete_InterferenceFunctionFinite3DLattice, METH_O, "\n"
 		"delete_InterferenceFunctionFinite3DLattice(InterferenceFunctionFinite3DLattice self)\n"
-		"\n"
 		"InterferenceFunctionFinite3DLattice::~InterferenceFunctionFinite3DLattice() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_clone", _wrap_InterferenceFunctionFinite3DLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_clone", _wrap_InterferenceFunctionFinite3DLattice_clone, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_clone(InterferenceFunctionFinite3DLattice self) -> InterferenceFunctionFinite3DLattice\n"
-		"\n"
 		"InterferenceFunctionFinite3DLattice * InterferenceFunctionFinite3DLattice::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_accept", _wrap_InterferenceFunctionFinite3DLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_accept", _wrap_InterferenceFunctionFinite3DLattice_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionFinite3DLattice_accept(InterferenceFunctionFinite3DLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionFinite3DLattice::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_numberUnitCells1", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells1, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_numberUnitCells1", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells1, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_numberUnitCells1(InterferenceFunctionFinite3DLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunctionFinite3DLattice::numberUnitCells1() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_numberUnitCells2", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells2, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_numberUnitCells2", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells2, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_numberUnitCells2(InterferenceFunctionFinite3DLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunctionFinite3DLattice::numberUnitCells2() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_numberUnitCells3", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells3, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_numberUnitCells3", _wrap_InterferenceFunctionFinite3DLattice_numberUnitCells3, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_numberUnitCells3(InterferenceFunctionFinite3DLattice self) -> unsigned int\n"
-		"\n"
 		"unsigned InterferenceFunctionFinite3DLattice::numberUnitCells3() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_lattice", _wrap_InterferenceFunctionFinite3DLattice_lattice, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_lattice", _wrap_InterferenceFunctionFinite3DLattice_lattice, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_lattice(InterferenceFunctionFinite3DLattice self) -> Lattice\n"
-		"\n"
 		"const Lattice & InterferenceFunctionFinite3DLattice::lattice() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_supportsMultilayer", _wrap_InterferenceFunctionFinite3DLattice_supportsMultilayer, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_supportsMultilayer", _wrap_InterferenceFunctionFinite3DLattice_supportsMultilayer, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_supportsMultilayer(InterferenceFunctionFinite3DLattice self) -> bool\n"
-		"\n"
 		"bool InterferenceFunctionFinite3DLattice::supportsMultilayer() const override final\n"
 		"\n"
 		"Indicates if this interference function can be used with a multilayer (DWBA mode) \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_getChildren", _wrap_InterferenceFunctionFinite3DLattice_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_getChildren", _wrap_InterferenceFunctionFinite3DLattice_getChildren, METH_O, "\n"
 		"InterferenceFunctionFinite3DLattice_getChildren(InterferenceFunctionFinite3DLattice self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunctionFinite3DLattice::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionFinite3DLattice_swigregister", InterferenceFunctionFinite3DLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionHardDisk", _wrap_new_InterferenceFunctionHardDisk, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionFinite3DLattice_swigregister", InterferenceFunctionFinite3DLattice_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionFinite3DLattice_swiginit", InterferenceFunctionFinite3DLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionHardDisk", _wrap_new_InterferenceFunctionHardDisk, METH_VARARGS, "\n"
 		"new_InterferenceFunctionHardDisk(double radius, double density) -> InterferenceFunctionHardDisk\n"
-		"\n"
 		"InterferenceFunctionHardDisk::InterferenceFunctionHardDisk(double radius, double density)\n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionHardDisk", _wrap_delete_InterferenceFunctionHardDisk, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionHardDisk", _wrap_delete_InterferenceFunctionHardDisk, METH_O, "\n"
 		"delete_InterferenceFunctionHardDisk(InterferenceFunctionHardDisk self)\n"
-		"\n"
 		"InterferenceFunctionHardDisk::~InterferenceFunctionHardDisk() final\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_clone", _wrap_InterferenceFunctionHardDisk_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_clone", _wrap_InterferenceFunctionHardDisk_clone, METH_O, "\n"
 		"InterferenceFunctionHardDisk_clone(InterferenceFunctionHardDisk self) -> InterferenceFunctionHardDisk\n"
-		"\n"
 		"InterferenceFunctionHardDisk * InterferenceFunctionHardDisk::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_accept", _wrap_InterferenceFunctionHardDisk_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_accept", _wrap_InterferenceFunctionHardDisk_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionHardDisk_accept(InterferenceFunctionHardDisk self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionHardDisk::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_getParticleDensity", _wrap_InterferenceFunctionHardDisk_getParticleDensity, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_getParticleDensity", _wrap_InterferenceFunctionHardDisk_getParticleDensity, METH_O, "\n"
 		"InterferenceFunctionHardDisk_getParticleDensity(InterferenceFunctionHardDisk self) -> double\n"
-		"\n"
 		"double InterferenceFunctionHardDisk::getParticleDensity() const override final\n"
 		"\n"
 		"If defined by this interference function's parameters, returns the particle density (per area). Otherwise, returns zero or a user-defined value \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_radius", _wrap_InterferenceFunctionHardDisk_radius, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_radius", _wrap_InterferenceFunctionHardDisk_radius, METH_O, "\n"
 		"InterferenceFunctionHardDisk_radius(InterferenceFunctionHardDisk self) -> double\n"
-		"\n"
 		"double InterferenceFunctionHardDisk::radius() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_density", _wrap_InterferenceFunctionHardDisk_density, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_density", _wrap_InterferenceFunctionHardDisk_density, METH_O, "\n"
 		"InterferenceFunctionHardDisk_density(InterferenceFunctionHardDisk self) -> double\n"
-		"\n"
 		"double InterferenceFunctionHardDisk::density() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionHardDisk_swigregister", InterferenceFunctionHardDisk_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionNone", _wrap_new_InterferenceFunctionNone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionHardDisk_swigregister", InterferenceFunctionHardDisk_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionHardDisk_swiginit", InterferenceFunctionHardDisk_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionNone", _wrap_new_InterferenceFunctionNone, METH_NOARGS, "\n"
 		"new_InterferenceFunctionNone() -> InterferenceFunctionNone\n"
-		"\n"
 		"InterferenceFunctionNone::InterferenceFunctionNone()\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionNone_clone", _wrap_InterferenceFunctionNone_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionNone_clone", _wrap_InterferenceFunctionNone_clone, METH_O, "\n"
 		"InterferenceFunctionNone_clone(InterferenceFunctionNone self) -> InterferenceFunctionNone\n"
-		"\n"
 		"InterferenceFunctionNone * InterferenceFunctionNone::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionNone_accept", _wrap_InterferenceFunctionNone_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionNone_accept", _wrap_InterferenceFunctionNone_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionNone_accept(InterferenceFunctionNone self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionNone::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionNone", _wrap_delete_InterferenceFunctionNone, METH_VARARGS, (char *)"delete_InterferenceFunctionNone(InterferenceFunctionNone self)"},
-	 { (char *)"InterferenceFunctionNone_swigregister", InterferenceFunctionNone_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionRadialParaCrystal", _wrap_new_InterferenceFunctionRadialParaCrystal, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionNone", _wrap_delete_InterferenceFunctionNone, METH_O, "delete_InterferenceFunctionNone(InterferenceFunctionNone self)"},
+	 { "InterferenceFunctionNone_swigregister", InterferenceFunctionNone_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionNone_swiginit", InterferenceFunctionNone_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionRadialParaCrystal", _wrap_new_InterferenceFunctionRadialParaCrystal, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal(double peak_distance, double damping_length=0.0)\n"
-		"new_InterferenceFunctionRadialParaCrystal(double peak_distance) -> InterferenceFunctionRadialParaCrystal\n"
-		"\n"
 		"InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(double peak_distance, double damping_length=0.0)\n"
 		"\n"
 		"Constructor of interference function of radial paracrystal.\n"
@@ -136032,25 +132207,22 @@ static PyMethodDef SwigMethods[] = {
 		"the damping (coherence) length of the paracrystal in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_clone", _wrap_InterferenceFunctionRadialParaCrystal_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_clone", _wrap_InterferenceFunctionRadialParaCrystal_clone, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_clone(InterferenceFunctionRadialParaCrystal self) -> InterferenceFunctionRadialParaCrystal\n"
-		"\n"
 		"InterferenceFunctionRadialParaCrystal * InterferenceFunctionRadialParaCrystal::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_accept", _wrap_InterferenceFunctionRadialParaCrystal_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_accept", _wrap_InterferenceFunctionRadialParaCrystal_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal_accept(InterferenceFunctionRadialParaCrystal self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionRadialParaCrystal::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_setKappa", _wrap_InterferenceFunctionRadialParaCrystal_setKappa, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_setKappa", _wrap_InterferenceFunctionRadialParaCrystal_setKappa, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal_setKappa(InterferenceFunctionRadialParaCrystal self, double kappa)\n"
-		"\n"
 		"void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)\n"
 		"\n"
 		"Sets size spacing coupling parameter of the Size Spacing Correlation Approximation.\n"
@@ -136062,15 +132234,13 @@ static PyMethodDef SwigMethods[] = {
 		"spacing coupling parameter \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_kappa", _wrap_InterferenceFunctionRadialParaCrystal_kappa, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_kappa", _wrap_InterferenceFunctionRadialParaCrystal_kappa, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_kappa(InterferenceFunctionRadialParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunctionRadialParaCrystal::kappa() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_setDomainSize", _wrap_InterferenceFunctionRadialParaCrystal_setDomainSize, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_setDomainSize", _wrap_InterferenceFunctionRadialParaCrystal_setDomainSize, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal_setDomainSize(InterferenceFunctionRadialParaCrystal self, double size)\n"
-		"\n"
 		"void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)\n"
 		"\n"
 		"Sets domain size (finite size corrections).\n"
@@ -136082,21 +132252,18 @@ static PyMethodDef SwigMethods[] = {
 		"size of coherence domain along the lattice main axis in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_domainSize", _wrap_InterferenceFunctionRadialParaCrystal_domainSize, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_domainSize", _wrap_InterferenceFunctionRadialParaCrystal_domainSize, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_domainSize(InterferenceFunctionRadialParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunctionRadialParaCrystal::domainSize() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_FTPDF", _wrap_InterferenceFunctionRadialParaCrystal_FTPDF, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_FTPDF", _wrap_InterferenceFunctionRadialParaCrystal_FTPDF, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal_FTPDF(InterferenceFunctionRadialParaCrystal self, double qpar) -> complex_t\n"
-		"\n"
 		"complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_setProbabilityDistribution", _wrap_InterferenceFunctionRadialParaCrystal_setProbabilityDistribution, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_setProbabilityDistribution", _wrap_InterferenceFunctionRadialParaCrystal_setProbabilityDistribution, METH_VARARGS, "\n"
 		"InterferenceFunctionRadialParaCrystal_setProbabilityDistribution(InterferenceFunctionRadialParaCrystal self, IFTDistribution1D pdf)\n"
-		"\n"
 		"void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)\n"
 		"\n"
 		"Sets one-dimensional probability distribution.\n"
@@ -136108,447 +132275,394 @@ static PyMethodDef SwigMethods[] = {
 		"probability distribution (Fourier transform of probability density) \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_peakDistance", _wrap_InterferenceFunctionRadialParaCrystal_peakDistance, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_peakDistance", _wrap_InterferenceFunctionRadialParaCrystal_peakDistance, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_peakDistance(InterferenceFunctionRadialParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunctionRadialParaCrystal::peakDistance() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_dampingLength", _wrap_InterferenceFunctionRadialParaCrystal_dampingLength, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_dampingLength", _wrap_InterferenceFunctionRadialParaCrystal_dampingLength, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_dampingLength(InterferenceFunctionRadialParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunctionRadialParaCrystal::dampingLength() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_getChildren", _wrap_InterferenceFunctionRadialParaCrystal_getChildren, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_getChildren", _wrap_InterferenceFunctionRadialParaCrystal_getChildren, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_getChildren(InterferenceFunctionRadialParaCrystal self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > InterferenceFunctionRadialParaCrystal::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_randomSample", _wrap_InterferenceFunctionRadialParaCrystal_randomSample, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionRadialParaCrystal_randomSample", _wrap_InterferenceFunctionRadialParaCrystal_randomSample, METH_O, "\n"
 		"InterferenceFunctionRadialParaCrystal_randomSample(InterferenceFunctionRadialParaCrystal self) -> double\n"
-		"\n"
 		"double InterferenceFunctionRadialParaCrystal::randomSample() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionRadialParaCrystal", _wrap_delete_InterferenceFunctionRadialParaCrystal, METH_VARARGS, (char *)"delete_InterferenceFunctionRadialParaCrystal(InterferenceFunctionRadialParaCrystal self)"},
-	 { (char *)"InterferenceFunctionRadialParaCrystal_swigregister", InterferenceFunctionRadialParaCrystal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_InterferenceFunctionTwin", _wrap_new_InterferenceFunctionTwin, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionRadialParaCrystal", _wrap_delete_InterferenceFunctionRadialParaCrystal, METH_O, "delete_InterferenceFunctionRadialParaCrystal(InterferenceFunctionRadialParaCrystal self)"},
+	 { "InterferenceFunctionRadialParaCrystal_swigregister", InterferenceFunctionRadialParaCrystal_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionRadialParaCrystal_swiginit", InterferenceFunctionRadialParaCrystal_swiginit, METH_VARARGS, NULL},
+	 { "new_InterferenceFunctionTwin", _wrap_new_InterferenceFunctionTwin, METH_VARARGS, "\n"
 		"new_InterferenceFunctionTwin(kvector_t direction, double mean_distance, double std_dev) -> InterferenceFunctionTwin\n"
-		"\n"
 		"InterferenceFunctionTwin::InterferenceFunctionTwin(const kvector_t &direction, double mean_distance, double std_dev)\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionTwin_clone", _wrap_InterferenceFunctionTwin_clone, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionTwin_clone", _wrap_InterferenceFunctionTwin_clone, METH_O, "\n"
 		"InterferenceFunctionTwin_clone(InterferenceFunctionTwin self) -> InterferenceFunctionTwin\n"
-		"\n"
 		"InterferenceFunctionTwin * InterferenceFunctionTwin::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionTwin_accept", _wrap_InterferenceFunctionTwin_accept, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionTwin_accept", _wrap_InterferenceFunctionTwin_accept, METH_VARARGS, "\n"
 		"InterferenceFunctionTwin_accept(InterferenceFunctionTwin self, INodeVisitor visitor)\n"
-		"\n"
 		"void InterferenceFunctionTwin::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionTwin_direction", _wrap_InterferenceFunctionTwin_direction, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionTwin_direction", _wrap_InterferenceFunctionTwin_direction, METH_O, "\n"
 		"InterferenceFunctionTwin_direction(InterferenceFunctionTwin self) -> kvector_t\n"
-		"\n"
 		"kvector_t InterferenceFunctionTwin::direction() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionTwin_meanDistance", _wrap_InterferenceFunctionTwin_meanDistance, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionTwin_meanDistance", _wrap_InterferenceFunctionTwin_meanDistance, METH_O, "\n"
 		"InterferenceFunctionTwin_meanDistance(InterferenceFunctionTwin self) -> double\n"
-		"\n"
 		"double InterferenceFunctionTwin::meanDistance() const\n"
 		"\n"
 		""},
-	 { (char *)"InterferenceFunctionTwin_stdDev", _wrap_InterferenceFunctionTwin_stdDev, METH_VARARGS, (char *)"\n"
+	 { "InterferenceFunctionTwin_stdDev", _wrap_InterferenceFunctionTwin_stdDev, METH_O, "\n"
 		"InterferenceFunctionTwin_stdDev(InterferenceFunctionTwin self) -> double\n"
-		"\n"
 		"double InterferenceFunctionTwin::stdDev() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_InterferenceFunctionTwin", _wrap_delete_InterferenceFunctionTwin, METH_VARARGS, (char *)"delete_InterferenceFunctionTwin(InterferenceFunctionTwin self)"},
-	 { (char *)"InterferenceFunctionTwin_swigregister", InterferenceFunctionTwin_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IPixel", _wrap_delete_IPixel, METH_VARARGS, (char *)"\n"
+	 { "delete_InterferenceFunctionTwin", _wrap_delete_InterferenceFunctionTwin, METH_O, "delete_InterferenceFunctionTwin(InterferenceFunctionTwin self)"},
+	 { "InterferenceFunctionTwin_swigregister", InterferenceFunctionTwin_swigregister, METH_O, NULL},
+	 { "InterferenceFunctionTwin_swiginit", InterferenceFunctionTwin_swiginit, METH_VARARGS, NULL},
+	 { "delete_IPixel", _wrap_delete_IPixel, METH_O, "\n"
 		"delete_IPixel(IPixel self)\n"
-		"\n"
 		"virtual IPixel::~IPixel()\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_clone", _wrap_IPixel_clone, METH_VARARGS, (char *)"\n"
+	 { "IPixel_clone", _wrap_IPixel_clone, METH_O, "\n"
 		"IPixel_clone(IPixel self) -> IPixel\n"
-		"\n"
 		"virtual IPixel* IPixel::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_createZeroSizePixel", _wrap_IPixel_createZeroSizePixel, METH_VARARGS, (char *)"\n"
+	 { "IPixel_createZeroSizePixel", _wrap_IPixel_createZeroSizePixel, METH_VARARGS, "\n"
 		"IPixel_createZeroSizePixel(IPixel self, double x, double y) -> IPixel\n"
-		"\n"
 		"virtual IPixel* IPixel::createZeroSizePixel(double x, double y) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_getK", _wrap_IPixel_getK, METH_VARARGS, (char *)"\n"
+	 { "IPixel_getK", _wrap_IPixel_getK, METH_VARARGS, "\n"
 		"IPixel_getK(IPixel self, double x, double y, double wavelength) -> kvector_t\n"
-		"\n"
 		"virtual kvector_t IPixel::getK(double x, double y, double wavelength) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_getIntegrationFactor", _wrap_IPixel_getIntegrationFactor, METH_VARARGS, (char *)"\n"
+	 { "IPixel_getIntegrationFactor", _wrap_IPixel_getIntegrationFactor, METH_VARARGS, "\n"
 		"IPixel_getIntegrationFactor(IPixel self, double x, double y) -> double\n"
-		"\n"
 		"virtual double IPixel::getIntegrationFactor(double x, double y) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_getSolidAngle", _wrap_IPixel_getSolidAngle, METH_VARARGS, (char *)"\n"
+	 { "IPixel_getSolidAngle", _wrap_IPixel_getSolidAngle, METH_O, "\n"
 		"IPixel_getSolidAngle(IPixel self) -> double\n"
-		"\n"
 		"virtual double IPixel::getSolidAngle() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IPixel_swigregister", IPixel_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SphericalDetector", _wrap_new_SphericalDetector, METH_VARARGS, (char *)"\n"
+	 { "IPixel_swigregister", IPixel_swigregister, METH_O, NULL},
+	 { "new_SphericalDetector", _wrap_new_SphericalDetector, METH_VARARGS, "\n"
 		"SphericalDetector()\n"
 		"SphericalDetector(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
 		"new_SphericalDetector(SphericalDetector other) -> SphericalDetector\n"
-		"\n"
 		"SphericalDetector::SphericalDetector(const SphericalDetector &other)\n"
 		"\n"
 		""},
-	 { (char *)"SphericalDetector_clone", _wrap_SphericalDetector_clone, METH_VARARGS, (char *)"\n"
+	 { "SphericalDetector_clone", _wrap_SphericalDetector_clone, METH_O, "\n"
 		"SphericalDetector_clone(SphericalDetector self) -> SphericalDetector\n"
-		"\n"
 		"SphericalDetector * SphericalDetector::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalDetector_accept", _wrap_SphericalDetector_accept, METH_VARARGS, (char *)"\n"
+	 { "SphericalDetector_accept", _wrap_SphericalDetector_accept, METH_VARARGS, "\n"
 		"SphericalDetector_accept(SphericalDetector self, INodeVisitor visitor)\n"
-		"\n"
 		"void SphericalDetector::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"delete_SphericalDetector", _wrap_delete_SphericalDetector, METH_VARARGS, (char *)"\n"
+	 { "delete_SphericalDetector", _wrap_delete_SphericalDetector, METH_O, "\n"
 		"delete_SphericalDetector(SphericalDetector self)\n"
-		"\n"
 		"SphericalDetector::~SphericalDetector() override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalDetector_defaultAxesUnits", _wrap_SphericalDetector_defaultAxesUnits, METH_VARARGS, (char *)"\n"
+	 { "SphericalDetector_defaultAxesUnits", _wrap_SphericalDetector_defaultAxesUnits, METH_O, "\n"
 		"SphericalDetector_defaultAxesUnits(SphericalDetector self) -> AxesUnits\n"
-		"\n"
 		"AxesUnits SphericalDetector::defaultAxesUnits() const override\n"
 		"\n"
 		"return default axes units \n"
 		"\n"
 		""},
-	 { (char *)"SphericalDetector_swigregister", SphericalDetector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SphericalPixel", _wrap_new_SphericalPixel, METH_VARARGS, (char *)"\n"
+	 { "SphericalDetector_swigregister", SphericalDetector_swigregister, METH_O, NULL},
+	 { "SphericalDetector_swiginit", SphericalDetector_swiginit, METH_VARARGS, NULL},
+	 { "new_SphericalPixel", _wrap_new_SphericalPixel, METH_VARARGS, "\n"
 		"new_SphericalPixel(Bin1D alpha_bin, Bin1D phi_bin) -> SphericalPixel\n"
-		"\n"
 		"SphericalPixel::SphericalPixel(const Bin1D &alpha_bin, const Bin1D &phi_bin)\n"
 		"\n"
 		""},
-	 { (char *)"SphericalPixel_clone", _wrap_SphericalPixel_clone, METH_VARARGS, (char *)"\n"
+	 { "SphericalPixel_clone", _wrap_SphericalPixel_clone, METH_O, "\n"
 		"SphericalPixel_clone(SphericalPixel self) -> SphericalPixel\n"
-		"\n"
 		"SphericalPixel * SphericalPixel::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalPixel_createZeroSizePixel", _wrap_SphericalPixel_createZeroSizePixel, METH_VARARGS, (char *)"\n"
+	 { "SphericalPixel_createZeroSizePixel", _wrap_SphericalPixel_createZeroSizePixel, METH_VARARGS, "\n"
 		"SphericalPixel_createZeroSizePixel(SphericalPixel self, double x, double y) -> SphericalPixel\n"
-		"\n"
 		"SphericalPixel * SphericalPixel::createZeroSizePixel(double x, double y) const override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalPixel_getK", _wrap_SphericalPixel_getK, METH_VARARGS, (char *)"\n"
+	 { "SphericalPixel_getK", _wrap_SphericalPixel_getK, METH_VARARGS, "\n"
 		"SphericalPixel_getK(SphericalPixel self, double x, double y, double wavelength) -> kvector_t\n"
-		"\n"
 		"kvector_t SphericalPixel::getK(double x, double y, double wavelength) const override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalPixel_getIntegrationFactor", _wrap_SphericalPixel_getIntegrationFactor, METH_VARARGS, (char *)"\n"
+	 { "SphericalPixel_getIntegrationFactor", _wrap_SphericalPixel_getIntegrationFactor, METH_VARARGS, "\n"
 		"SphericalPixel_getIntegrationFactor(SphericalPixel self, double x, double y) -> double\n"
-		"\n"
 		"double SphericalPixel::getIntegrationFactor(double x, double y) const override\n"
 		"\n"
 		""},
-	 { (char *)"SphericalPixel_getSolidAngle", _wrap_SphericalPixel_getSolidAngle, METH_VARARGS, (char *)"\n"
+	 { "SphericalPixel_getSolidAngle", _wrap_SphericalPixel_getSolidAngle, METH_O, "\n"
 		"SphericalPixel_getSolidAngle(SphericalPixel self) -> double\n"
-		"\n"
 		"double SphericalPixel::getSolidAngle() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_SphericalPixel", _wrap_delete_SphericalPixel, METH_VARARGS, (char *)"delete_SphericalPixel(SphericalPixel self)"},
-	 { (char *)"SphericalPixel_swigregister", SphericalPixel_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IsGISAXSDetector", _wrap_new_IsGISAXSDetector, METH_VARARGS, (char *)"\n"
+	 { "delete_SphericalPixel", _wrap_delete_SphericalPixel, METH_O, "delete_SphericalPixel(SphericalPixel self)"},
+	 { "SphericalPixel_swigregister", SphericalPixel_swigregister, METH_O, NULL},
+	 { "SphericalPixel_swiginit", SphericalPixel_swiginit, METH_VARARGS, NULL},
+	 { "new_IsGISAXSDetector", _wrap_new_IsGISAXSDetector, METH_VARARGS, "\n"
 		"IsGISAXSDetector()\n"
 		"IsGISAXSDetector(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
 		"new_IsGISAXSDetector(IsGISAXSDetector other) -> IsGISAXSDetector\n"
-		"\n"
 		"IsGISAXSDetector::IsGISAXSDetector(const IsGISAXSDetector &other)\n"
 		"\n"
 		""},
-	 { (char *)"IsGISAXSDetector_clone", _wrap_IsGISAXSDetector_clone, METH_VARARGS, (char *)"\n"
+	 { "IsGISAXSDetector_clone", _wrap_IsGISAXSDetector_clone, METH_O, "\n"
 		"IsGISAXSDetector_clone(IsGISAXSDetector self) -> IsGISAXSDetector\n"
-		"\n"
 		"IsGISAXSDetector * IsGISAXSDetector::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"IsGISAXSDetector_accept", _wrap_IsGISAXSDetector_accept, METH_VARARGS, (char *)"\n"
+	 { "IsGISAXSDetector_accept", _wrap_IsGISAXSDetector_accept, METH_VARARGS, "\n"
 		"IsGISAXSDetector_accept(IsGISAXSDetector self, INodeVisitor visitor)\n"
-		"\n"
 		"void IsGISAXSDetector::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"delete_IsGISAXSDetector", _wrap_delete_IsGISAXSDetector, METH_VARARGS, (char *)"delete_IsGISAXSDetector(IsGISAXSDetector self)"},
-	 { (char *)"IsGISAXSDetector_swigregister", IsGISAXSDetector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_ILatticeOrientation", _wrap_delete_ILatticeOrientation, METH_VARARGS, (char *)"\n"
+	 { "delete_IsGISAXSDetector", _wrap_delete_IsGISAXSDetector, METH_O, "delete_IsGISAXSDetector(IsGISAXSDetector self)"},
+	 { "IsGISAXSDetector_swigregister", IsGISAXSDetector_swigregister, METH_O, NULL},
+	 { "IsGISAXSDetector_swiginit", IsGISAXSDetector_swiginit, METH_VARARGS, NULL},
+	 { "delete_ILatticeOrientation", _wrap_delete_ILatticeOrientation, METH_O, "\n"
 		"delete_ILatticeOrientation(ILatticeOrientation self)\n"
-		"\n"
 		"ILatticeOrientation::~ILatticeOrientation()\n"
 		"\n"
 		""},
-	 { (char *)"ILatticeOrientation_clone", _wrap_ILatticeOrientation_clone, METH_VARARGS, (char *)"\n"
+	 { "ILatticeOrientation_clone", _wrap_ILatticeOrientation_clone, METH_O, "\n"
 		"ILatticeOrientation_clone(ILatticeOrientation self) -> ILatticeOrientation\n"
-		"\n"
 		"virtual ILatticeOrientation* ILatticeOrientation::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"ILatticeOrientation_usePrimitiveLattice", _wrap_ILatticeOrientation_usePrimitiveLattice, METH_VARARGS, (char *)"\n"
+	 { "ILatticeOrientation_usePrimitiveLattice", _wrap_ILatticeOrientation_usePrimitiveLattice, METH_VARARGS, "\n"
 		"ILatticeOrientation_usePrimitiveLattice(ILatticeOrientation self, Lattice lattice)\n"
-		"\n"
 		"virtual void ILatticeOrientation::usePrimitiveLattice(const Lattice &lattice)=0\n"
 		"\n"
 		""},
-	 { (char *)"ILatticeOrientation_transformationMatrix", _wrap_ILatticeOrientation_transformationMatrix, METH_VARARGS, (char *)"\n"
+	 { "ILatticeOrientation_transformationMatrix", _wrap_ILatticeOrientation_transformationMatrix, METH_O, "\n"
 		"ILatticeOrientation_transformationMatrix(ILatticeOrientation self) -> Transform3D\n"
-		"\n"
 		"virtual Transform3D ILatticeOrientation::transformationMatrix() const =0\n"
 		"\n"
 		""},
-	 { (char *)"ILatticeOrientation_swigregister", ILatticeOrientation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_MillerIndex", _wrap_new_MillerIndex, METH_VARARGS, (char *)"\n"
+	 { "ILatticeOrientation_swigregister", ILatticeOrientation_swigregister, METH_O, NULL},
+	 { "new_MillerIndex", _wrap_new_MillerIndex, METH_VARARGS, "\n"
 		"new_MillerIndex(double h_, double k_, double l_) -> MillerIndex\n"
-		"\n"
 		"MillerIndex::MillerIndex(double h_, double k_, double l_)\n"
 		"\n"
 		""},
-	 { (char *)"MillerIndex_h_set", _wrap_MillerIndex_h_set, METH_VARARGS, (char *)"MillerIndex_h_set(MillerIndex self, double h)"},
-	 { (char *)"MillerIndex_h_get", _wrap_MillerIndex_h_get, METH_VARARGS, (char *)"MillerIndex_h_get(MillerIndex self) -> double"},
-	 { (char *)"MillerIndex_k_set", _wrap_MillerIndex_k_set, METH_VARARGS, (char *)"MillerIndex_k_set(MillerIndex self, double k)"},
-	 { (char *)"MillerIndex_k_get", _wrap_MillerIndex_k_get, METH_VARARGS, (char *)"MillerIndex_k_get(MillerIndex self) -> double"},
-	 { (char *)"MillerIndex_l_set", _wrap_MillerIndex_l_set, METH_VARARGS, (char *)"MillerIndex_l_set(MillerIndex self, double l)"},
-	 { (char *)"MillerIndex_l_get", _wrap_MillerIndex_l_get, METH_VARARGS, (char *)"MillerIndex_l_get(MillerIndex self) -> double"},
-	 { (char *)"delete_MillerIndex", _wrap_delete_MillerIndex, METH_VARARGS, (char *)"delete_MillerIndex(MillerIndex self)"},
-	 { (char *)"MillerIndex_swigregister", MillerIndex_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_MillerIndexOrientation", _wrap_new_MillerIndexOrientation, METH_VARARGS, (char *)"\n"
+	 { "MillerIndex_h_set", _wrap_MillerIndex_h_set, METH_VARARGS, "MillerIndex_h_set(MillerIndex self, double h)"},
+	 { "MillerIndex_h_get", _wrap_MillerIndex_h_get, METH_O, "MillerIndex_h_get(MillerIndex self) -> double"},
+	 { "MillerIndex_k_set", _wrap_MillerIndex_k_set, METH_VARARGS, "MillerIndex_k_set(MillerIndex self, double k)"},
+	 { "MillerIndex_k_get", _wrap_MillerIndex_k_get, METH_O, "MillerIndex_k_get(MillerIndex self) -> double"},
+	 { "MillerIndex_l_set", _wrap_MillerIndex_l_set, METH_VARARGS, "MillerIndex_l_set(MillerIndex self, double l)"},
+	 { "MillerIndex_l_get", _wrap_MillerIndex_l_get, METH_O, "MillerIndex_l_get(MillerIndex self) -> double"},
+	 { "delete_MillerIndex", _wrap_delete_MillerIndex, METH_O, "delete_MillerIndex(MillerIndex self)"},
+	 { "MillerIndex_swigregister", MillerIndex_swigregister, METH_O, NULL},
+	 { "MillerIndex_swiginit", MillerIndex_swiginit, METH_VARARGS, NULL},
+	 { "new_MillerIndexOrientation", _wrap_new_MillerIndexOrientation, METH_VARARGS, "\n"
 		"new_MillerIndexOrientation(MillerIndexOrientation::QComponent q1, MillerIndex index1, MillerIndexOrientation::QComponent q2, MillerIndex index2) -> MillerIndexOrientation\n"
-		"\n"
 		"MillerIndexOrientation::MillerIndexOrientation(QComponent q1, MillerIndex index1, QComponent q2, MillerIndex index2)\n"
 		"\n"
 		"This constructor is best explained by an example. Arguments QX, (1,1,0), QY, (0,2,1) mean: Rotate the lattice such that the axis [110] points into x direction, and the axis [021], projected into the yz plane, points into z direction. \n"
 		"\n"
 		""},
-	 { (char *)"delete_MillerIndexOrientation", _wrap_delete_MillerIndexOrientation, METH_VARARGS, (char *)"\n"
+	 { "delete_MillerIndexOrientation", _wrap_delete_MillerIndexOrientation, METH_O, "\n"
 		"delete_MillerIndexOrientation(MillerIndexOrientation self)\n"
-		"\n"
 		"MillerIndexOrientation::~MillerIndexOrientation() override\n"
 		"\n"
 		""},
-	 { (char *)"MillerIndexOrientation_clone", _wrap_MillerIndexOrientation_clone, METH_VARARGS, (char *)"\n"
+	 { "MillerIndexOrientation_clone", _wrap_MillerIndexOrientation_clone, METH_O, "\n"
 		"MillerIndexOrientation_clone(MillerIndexOrientation self) -> MillerIndexOrientation\n"
-		"\n"
 		"MillerIndexOrientation * MillerIndexOrientation::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"MillerIndexOrientation_usePrimitiveLattice", _wrap_MillerIndexOrientation_usePrimitiveLattice, METH_VARARGS, (char *)"\n"
+	 { "MillerIndexOrientation_usePrimitiveLattice", _wrap_MillerIndexOrientation_usePrimitiveLattice, METH_VARARGS, "\n"
 		"MillerIndexOrientation_usePrimitiveLattice(MillerIndexOrientation self, Lattice lattice)\n"
-		"\n"
 		"void MillerIndexOrientation::usePrimitiveLattice(const Lattice &lattice) override\n"
 		"\n"
 		""},
-	 { (char *)"MillerIndexOrientation_transformationMatrix", _wrap_MillerIndexOrientation_transformationMatrix, METH_VARARGS, (char *)"\n"
+	 { "MillerIndexOrientation_transformationMatrix", _wrap_MillerIndexOrientation_transformationMatrix, METH_O, "\n"
 		"MillerIndexOrientation_transformationMatrix(MillerIndexOrientation self) -> Transform3D\n"
-		"\n"
 		"Transform3D MillerIndexOrientation::transformationMatrix() const override\n"
 		"\n"
 		""},
-	 { (char *)"MillerIndexOrientation_swigregister", MillerIndexOrientation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Lattice", _wrap_new_Lattice, METH_VARARGS, (char *)"\n"
+	 { "MillerIndexOrientation_swigregister", MillerIndexOrientation_swigregister, METH_O, NULL},
+	 { "MillerIndexOrientation_swiginit", MillerIndexOrientation_swiginit, METH_VARARGS, NULL},
+	 { "new_Lattice", _wrap_new_Lattice, METH_VARARGS, "\n"
 		"Lattice()\n"
 		"Lattice(kvector_t a1, kvector_t a2, kvector_t a3)\n"
 		"new_Lattice(Lattice lattice) -> Lattice\n"
-		"\n"
 		"Lattice::Lattice(const Lattice &lattice)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Lattice", _wrap_delete_Lattice, METH_VARARGS, (char *)"\n"
+	 { "delete_Lattice", _wrap_delete_Lattice, METH_O, "\n"
 		"delete_Lattice(Lattice self)\n"
-		"\n"
 		"Lattice::~Lattice() override\n"
 		"\n"
 		""},
-	 { (char *)"Lattice_accept", _wrap_Lattice_accept, METH_VARARGS, (char *)"\n"
+	 { "Lattice_accept", _wrap_Lattice_accept, METH_VARARGS, "\n"
 		"Lattice_accept(Lattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void Lattice::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_createTransformedLattice", _wrap_Lattice_createTransformedLattice, METH_VARARGS, (char *)"\n"
+	 { "Lattice_createTransformedLattice", _wrap_Lattice_createTransformedLattice, METH_VARARGS, "\n"
 		"Lattice_createTransformedLattice(Lattice self, Transform3D const & transform) -> Lattice\n"
-		"\n"
 		"Lattice Lattice::createTransformedLattice(const Transform3D &transform) const\n"
 		"\n"
 		"Create transformed lattice. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_initialize", _wrap_Lattice_initialize, METH_VARARGS, (char *)"\n"
+	 { "Lattice_initialize", _wrap_Lattice_initialize, METH_O, "\n"
 		"Lattice_initialize(Lattice self)\n"
-		"\n"
 		"void Lattice::initialize() const\n"
 		"\n"
 		"Initializes cached data. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getBasisVectorA", _wrap_Lattice_getBasisVectorA, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getBasisVectorA", _wrap_Lattice_getBasisVectorA, METH_O, "\n"
 		"Lattice_getBasisVectorA(Lattice self) -> kvector_t\n"
-		"\n"
 		"kvector_t Lattice::getBasisVectorA() const\n"
 		"\n"
 		"Returns basis vector a. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getBasisVectorB", _wrap_Lattice_getBasisVectorB, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getBasisVectorB", _wrap_Lattice_getBasisVectorB, METH_O, "\n"
 		"Lattice_getBasisVectorB(Lattice self) -> kvector_t\n"
-		"\n"
 		"kvector_t Lattice::getBasisVectorB() const\n"
 		"\n"
 		"Returns basis vector b. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getBasisVectorC", _wrap_Lattice_getBasisVectorC, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getBasisVectorC", _wrap_Lattice_getBasisVectorC, METH_O, "\n"
 		"Lattice_getBasisVectorC(Lattice self) -> kvector_t\n"
-		"\n"
 		"kvector_t Lattice::getBasisVectorC() const\n"
 		"\n"
 		"Returns basis vector c. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_resetBasis", _wrap_Lattice_resetBasis, METH_VARARGS, (char *)"\n"
+	 { "Lattice_resetBasis", _wrap_Lattice_resetBasis, METH_VARARGS, "\n"
 		"Lattice_resetBasis(Lattice self, kvector_t a1, kvector_t a2, kvector_t a3)\n"
-		"\n"
 		"void Lattice::resetBasis(const kvector_t a1, const kvector_t a2, const kvector_t a3)\n"
 		"\n"
 		"Resets the basis vectors. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getMillerDirection", _wrap_Lattice_getMillerDirection, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getMillerDirection", _wrap_Lattice_getMillerDirection, METH_VARARGS, "\n"
 		"Lattice_getMillerDirection(Lattice self, double h, double k, double l) -> kvector_t\n"
-		"\n"
 		"kvector_t Lattice::getMillerDirection(double h, double k, double l) const\n"
 		"\n"
 		"Returns normalized direction corresponding to the given Miller indices. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_volume", _wrap_Lattice_volume, METH_VARARGS, (char *)"\n"
+	 { "Lattice_volume", _wrap_Lattice_volume, METH_O, "\n"
 		"Lattice_volume(Lattice self) -> double\n"
-		"\n"
 		"double Lattice::volume() const\n"
 		"\n"
 		"Returns the volume of the unit cell. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getReciprocalLatticeBasis", _wrap_Lattice_getReciprocalLatticeBasis, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getReciprocalLatticeBasis", _wrap_Lattice_getReciprocalLatticeBasis, METH_VARARGS, "\n"
 		"Lattice_getReciprocalLatticeBasis(Lattice self, kvector_t b1, kvector_t b2, kvector_t b3)\n"
-		"\n"
 		"void Lattice::getReciprocalLatticeBasis(kvector_t &b1, kvector_t &b2, kvector_t &b3) const\n"
 		"\n"
 		"Returns the reciprocal basis vectors. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getNearestLatticeVectorCoordinates", _wrap_Lattice_getNearestLatticeVectorCoordinates, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getNearestLatticeVectorCoordinates", _wrap_Lattice_getNearestLatticeVectorCoordinates, METH_VARARGS, "\n"
 		"Lattice_getNearestLatticeVectorCoordinates(Lattice self, kvector_t vector_in) -> ivector_t\n"
-		"\n"
 		"ivector_t Lattice::getNearestLatticeVectorCoordinates(const kvector_t vector_in) const\n"
 		"\n"
 		"Returns the nearest lattice point from a given vector. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_getNearestReciprocalLatticeVectorCoordinates", _wrap_Lattice_getNearestReciprocalLatticeVectorCoordinates, METH_VARARGS, (char *)"\n"
+	 { "Lattice_getNearestReciprocalLatticeVectorCoordinates", _wrap_Lattice_getNearestReciprocalLatticeVectorCoordinates, METH_VARARGS, "\n"
 		"Lattice_getNearestReciprocalLatticeVectorCoordinates(Lattice self, kvector_t vector_in) -> ivector_t\n"
-		"\n"
 		"ivector_t Lattice::getNearestReciprocalLatticeVectorCoordinates(const kvector_t vector_in) const\n"
 		"\n"
 		"Returns the nearest reciprocal lattice point from a given vector. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_reciprocalLatticeVectorsWithinRadius", _wrap_Lattice_reciprocalLatticeVectorsWithinRadius, METH_VARARGS, (char *)"\n"
+	 { "Lattice_reciprocalLatticeVectorsWithinRadius", _wrap_Lattice_reciprocalLatticeVectorsWithinRadius, METH_VARARGS, "\n"
 		"Lattice_reciprocalLatticeVectorsWithinRadius(Lattice self, kvector_t input_vector, double radius) -> vector_kvector_t\n"
-		"\n"
 		"std::vector< kvector_t > Lattice::reciprocalLatticeVectorsWithinRadius(const kvector_t input_vector, double radius) const\n"
 		"\n"
 		"Computes a list of reciprocal lattice vectors within a specified distance of a given vector. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_setSelectionRule", _wrap_Lattice_setSelectionRule, METH_VARARGS, (char *)"\n"
+	 { "Lattice_setSelectionRule", _wrap_Lattice_setSelectionRule, METH_VARARGS, "\n"
 		"Lattice_setSelectionRule(Lattice self, ISelectionRule p_selection_rule)\n"
-		"\n"
 		"void Lattice::setSelectionRule(const ISelectionRule &p_selection_rule)\n"
 		"\n"
 		"Sets a selection rule for the reciprocal vectors. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_createCubicLattice", _wrap_Lattice_createCubicLattice, METH_VARARGS, (char *)"Lattice_createCubicLattice(double a) -> Lattice"},
-	 { (char *)"Lattice_createFCCLattice", _wrap_Lattice_createFCCLattice, METH_VARARGS, (char *)"Lattice_createFCCLattice(double a) -> Lattice"},
-	 { (char *)"Lattice_createHexagonalLattice", _wrap_Lattice_createHexagonalLattice, METH_VARARGS, (char *)"Lattice_createHexagonalLattice(double a, double c) -> Lattice"},
-	 { (char *)"Lattice_createHCPLattice", _wrap_Lattice_createHCPLattice, METH_VARARGS, (char *)"Lattice_createHCPLattice(double a, double c) -> Lattice"},
-	 { (char *)"Lattice_createTetragonalLattice", _wrap_Lattice_createTetragonalLattice, METH_VARARGS, (char *)"Lattice_createTetragonalLattice(double a, double c) -> Lattice"},
-	 { (char *)"Lattice_createBCTLattice", _wrap_Lattice_createBCTLattice, METH_VARARGS, (char *)"Lattice_createBCTLattice(double a, double c) -> Lattice"},
-	 { (char *)"Lattice_onChange", _wrap_Lattice_onChange, METH_VARARGS, (char *)"\n"
+	 { "Lattice_createCubicLattice", _wrap_Lattice_createCubicLattice, METH_O, "Lattice_createCubicLattice(double a) -> Lattice"},
+	 { "Lattice_createFCCLattice", _wrap_Lattice_createFCCLattice, METH_O, "Lattice_createFCCLattice(double a) -> Lattice"},
+	 { "Lattice_createHexagonalLattice", _wrap_Lattice_createHexagonalLattice, METH_VARARGS, "Lattice_createHexagonalLattice(double a, double c) -> Lattice"},
+	 { "Lattice_createHCPLattice", _wrap_Lattice_createHCPLattice, METH_VARARGS, "Lattice_createHCPLattice(double a, double c) -> Lattice"},
+	 { "Lattice_createTetragonalLattice", _wrap_Lattice_createTetragonalLattice, METH_VARARGS, "Lattice_createTetragonalLattice(double a, double c) -> Lattice"},
+	 { "Lattice_createBCTLattice", _wrap_Lattice_createBCTLattice, METH_VARARGS, "Lattice_createBCTLattice(double a, double c) -> Lattice"},
+	 { "Lattice_onChange", _wrap_Lattice_onChange, METH_O, "\n"
 		"Lattice_onChange(Lattice self)\n"
-		"\n"
 		"void Lattice::onChange() override\n"
 		"\n"
 		"Action to be taken in inherited class when a parameter has changed. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice_swigregister", Lattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"CreateFCCLattice", _wrap_CreateFCCLattice, METH_VARARGS, (char *)"\n"
+	 { "Lattice_swigregister", Lattice_swigregister, METH_O, NULL},
+	 { "Lattice_swiginit", Lattice_swiginit, METH_VARARGS, NULL},
+	 { "CreateFCCLattice", _wrap_CreateFCCLattice, METH_VARARGS, "\n"
 		"CreateFCCLattice(double lattice_constant, ILatticeOrientation orientation) -> Lattice\n"
-		"\n"
 		"Lattice LatticeUtils::CreateFCCLattice(double lattice_constant, const ILatticeOrientation &orientation)\n"
 		"\n"
 		""},
-	 { (char *)"CreateHCPLattice", _wrap_CreateHCPLattice, METH_VARARGS, (char *)"\n"
+	 { "CreateHCPLattice", _wrap_CreateHCPLattice, METH_VARARGS, "\n"
 		"CreateHCPLattice(double a, double c, ILatticeOrientation orientation) -> Lattice\n"
-		"\n"
 		"Lattice LatticeUtils::CreateHCPLattice(double a, double c, const ILatticeOrientation &orientation)\n"
 		"\n"
 		""},
-	 { (char *)"CreateBCTLattice", _wrap_CreateBCTLattice, METH_VARARGS, (char *)"\n"
+	 { "CreateBCTLattice", _wrap_CreateBCTLattice, METH_VARARGS, "\n"
 		"CreateBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice\n"
-		"\n"
 		"Lattice LatticeUtils::CreateBCTLattice(double a, double c, const ILatticeOrientation &orientation)\n"
 		"\n"
 		""},
-	 { (char *)"new_Lattice1DParameters", _wrap_new_Lattice1DParameters, METH_VARARGS, (char *)"\n"
+	 { "new_Lattice1DParameters", _wrap_new_Lattice1DParameters, METH_VARARGS, "\n"
 		"Lattice1DParameters()\n"
 		"new_Lattice1DParameters(double length, double xi) -> Lattice1DParameters\n"
-		"\n"
 		"Lattice1DParameters::Lattice1DParameters(double length, double xi)\n"
 		"\n"
 		"Parameters:\n"
@@ -136561,207 +132675,177 @@ static PyMethodDef SwigMethods[] = {
 		" Lattice rotation angle. \n"
 		"\n"
 		""},
-	 { (char *)"Lattice1DParameters_m_length_set", _wrap_Lattice1DParameters_m_length_set, METH_VARARGS, (char *)"Lattice1DParameters_m_length_set(Lattice1DParameters self, double m_length)"},
-	 { (char *)"Lattice1DParameters_m_length_get", _wrap_Lattice1DParameters_m_length_get, METH_VARARGS, (char *)"Lattice1DParameters_m_length_get(Lattice1DParameters self) -> double"},
-	 { (char *)"Lattice1DParameters_m_xi_set", _wrap_Lattice1DParameters_m_xi_set, METH_VARARGS, (char *)"Lattice1DParameters_m_xi_set(Lattice1DParameters self, double m_xi)"},
-	 { (char *)"Lattice1DParameters_m_xi_get", _wrap_Lattice1DParameters_m_xi_get, METH_VARARGS, (char *)"Lattice1DParameters_m_xi_get(Lattice1DParameters self) -> double"},
-	 { (char *)"delete_Lattice1DParameters", _wrap_delete_Lattice1DParameters, METH_VARARGS, (char *)"delete_Lattice1DParameters(Lattice1DParameters self)"},
-	 { (char *)"Lattice1DParameters_swigregister", Lattice1DParameters_swigregister, METH_VARARGS, NULL},
-	 { (char *)"Lattice2D_clone", _wrap_Lattice2D_clone, METH_VARARGS, (char *)"\n"
+	 { "Lattice1DParameters_m_length_set", _wrap_Lattice1DParameters_m_length_set, METH_VARARGS, "Lattice1DParameters_m_length_set(Lattice1DParameters self, double m_length)"},
+	 { "Lattice1DParameters_m_length_get", _wrap_Lattice1DParameters_m_length_get, METH_O, "Lattice1DParameters_m_length_get(Lattice1DParameters self) -> double"},
+	 { "Lattice1DParameters_m_xi_set", _wrap_Lattice1DParameters_m_xi_set, METH_VARARGS, "Lattice1DParameters_m_xi_set(Lattice1DParameters self, double m_xi)"},
+	 { "Lattice1DParameters_m_xi_get", _wrap_Lattice1DParameters_m_xi_get, METH_O, "Lattice1DParameters_m_xi_get(Lattice1DParameters self) -> double"},
+	 { "delete_Lattice1DParameters", _wrap_delete_Lattice1DParameters, METH_O, "delete_Lattice1DParameters(Lattice1DParameters self)"},
+	 { "Lattice1DParameters_swigregister", Lattice1DParameters_swigregister, METH_O, NULL},
+	 { "Lattice1DParameters_swiginit", Lattice1DParameters_swiginit, METH_VARARGS, NULL},
+	 { "Lattice2D_clone", _wrap_Lattice2D_clone, METH_O, "\n"
 		"Lattice2D_clone(Lattice2D self) -> Lattice2D\n"
-		"\n"
 		"Lattice2D* Lattice2D::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_length1", _wrap_Lattice2D_length1, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_length1", _wrap_Lattice2D_length1, METH_O, "\n"
 		"Lattice2D_length1(Lattice2D self) -> double\n"
-		"\n"
 		"virtual double Lattice2D::length1() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_length2", _wrap_Lattice2D_length2, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_length2", _wrap_Lattice2D_length2, METH_O, "\n"
 		"Lattice2D_length2(Lattice2D self) -> double\n"
-		"\n"
 		"virtual double Lattice2D::length2() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_latticeAngle", _wrap_Lattice2D_latticeAngle, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_latticeAngle", _wrap_Lattice2D_latticeAngle, METH_O, "\n"
 		"Lattice2D_latticeAngle(Lattice2D self) -> double\n"
-		"\n"
 		"virtual double Lattice2D::latticeAngle() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_unitCellArea", _wrap_Lattice2D_unitCellArea, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_unitCellArea", _wrap_Lattice2D_unitCellArea, METH_O, "\n"
 		"Lattice2D_unitCellArea(Lattice2D self) -> double\n"
-		"\n"
 		"virtual double Lattice2D::unitCellArea() const =0\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_rotationAngle", _wrap_Lattice2D_rotationAngle, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_rotationAngle", _wrap_Lattice2D_rotationAngle, METH_O, "\n"
 		"Lattice2D_rotationAngle(Lattice2D self) -> double\n"
-		"\n"
 		"double Lattice2D::rotationAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_reciprocalBases", _wrap_Lattice2D_reciprocalBases, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_reciprocalBases", _wrap_Lattice2D_reciprocalBases, METH_O, "\n"
 		"Lattice2D_reciprocalBases(Lattice2D self) -> Lattice2D::ReciprocalBases\n"
-		"\n"
 		"Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const\n"
 		"\n"
 		""},
-	 { (char *)"Lattice2D_setRotationEnabled", _wrap_Lattice2D_setRotationEnabled, METH_VARARGS, (char *)"\n"
+	 { "Lattice2D_setRotationEnabled", _wrap_Lattice2D_setRotationEnabled, METH_VARARGS, "\n"
 		"Lattice2D_setRotationEnabled(Lattice2D self, bool enabled)\n"
-		"\n"
 		"void Lattice2D::setRotationEnabled(bool enabled)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Lattice2D", _wrap_delete_Lattice2D, METH_VARARGS, (char *)"delete_Lattice2D(Lattice2D self)"},
-	 { (char *)"Lattice2D_swigregister", Lattice2D_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_BasicLattice", _wrap_new_BasicLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_Lattice2D", _wrap_delete_Lattice2D, METH_O, "delete_Lattice2D(Lattice2D self)"},
+	 { "Lattice2D_swigregister", Lattice2D_swigregister, METH_O, NULL},
+	 { "new_BasicLattice", _wrap_new_BasicLattice, METH_VARARGS, "\n"
 		"BasicLattice(double length1, double length2, double angle, double rotation_angle=0.0)\n"
-		"new_BasicLattice(double length1, double length2, double angle) -> BasicLattice\n"
-		"\n"
 		"BasicLattice::BasicLattice(double length1, double length2, double angle, double rotation_angle=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_clone", _wrap_BasicLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_clone", _wrap_BasicLattice_clone, METH_O, "\n"
 		"BasicLattice_clone(BasicLattice self) -> BasicLattice\n"
-		"\n"
 		"BasicLattice * BasicLattice::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_accept", _wrap_BasicLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_accept", _wrap_BasicLattice_accept, METH_VARARGS, "\n"
 		"BasicLattice_accept(BasicLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void BasicLattice::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_length1", _wrap_BasicLattice_length1, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_length1", _wrap_BasicLattice_length1, METH_O, "\n"
 		"BasicLattice_length1(BasicLattice self) -> double\n"
-		"\n"
 		"virtual double BasicLattice::length1() const\n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_length2", _wrap_BasicLattice_length2, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_length2", _wrap_BasicLattice_length2, METH_O, "\n"
 		"BasicLattice_length2(BasicLattice self) -> double\n"
-		"\n"
 		"virtual double BasicLattice::length2() const\n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_latticeAngle", _wrap_BasicLattice_latticeAngle, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_latticeAngle", _wrap_BasicLattice_latticeAngle, METH_O, "\n"
 		"BasicLattice_latticeAngle(BasicLattice self) -> double\n"
-		"\n"
 		"virtual double BasicLattice::latticeAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"BasicLattice_unitCellArea", _wrap_BasicLattice_unitCellArea, METH_VARARGS, (char *)"\n"
+	 { "BasicLattice_unitCellArea", _wrap_BasicLattice_unitCellArea, METH_O, "\n"
 		"BasicLattice_unitCellArea(BasicLattice self) -> double\n"
-		"\n"
 		"double BasicLattice::unitCellArea() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_BasicLattice", _wrap_delete_BasicLattice, METH_VARARGS, (char *)"delete_BasicLattice(BasicLattice self)"},
-	 { (char *)"BasicLattice_swigregister", BasicLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SquareLattice", _wrap_new_SquareLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_BasicLattice", _wrap_delete_BasicLattice, METH_O, "delete_BasicLattice(BasicLattice self)"},
+	 { "BasicLattice_swigregister", BasicLattice_swigregister, METH_O, NULL},
+	 { "BasicLattice_swiginit", BasicLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_SquareLattice", _wrap_new_SquareLattice, METH_VARARGS, "\n"
 		"SquareLattice(double length, double rotation_angle=0.0)\n"
-		"new_SquareLattice(double length) -> SquareLattice\n"
-		"\n"
 		"SquareLattice::SquareLattice(double length, double rotation_angle=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_clone", _wrap_SquareLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_clone", _wrap_SquareLattice_clone, METH_O, "\n"
 		"SquareLattice_clone(SquareLattice self) -> SquareLattice\n"
-		"\n"
 		"SquareLattice * SquareLattice::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_accept", _wrap_SquareLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_accept", _wrap_SquareLattice_accept, METH_VARARGS, "\n"
 		"SquareLattice_accept(SquareLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void SquareLattice::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_length1", _wrap_SquareLattice_length1, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_length1", _wrap_SquareLattice_length1, METH_O, "\n"
 		"SquareLattice_length1(SquareLattice self) -> double\n"
-		"\n"
 		"virtual double SquareLattice::length1() const\n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_length2", _wrap_SquareLattice_length2, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_length2", _wrap_SquareLattice_length2, METH_O, "\n"
 		"SquareLattice_length2(SquareLattice self) -> double\n"
-		"\n"
 		"virtual double SquareLattice::length2() const\n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_latticeAngle", _wrap_SquareLattice_latticeAngle, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_latticeAngle", _wrap_SquareLattice_latticeAngle, METH_O, "\n"
 		"SquareLattice_latticeAngle(SquareLattice self) -> double\n"
-		"\n"
 		"double SquareLattice::latticeAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"SquareLattice_unitCellArea", _wrap_SquareLattice_unitCellArea, METH_VARARGS, (char *)"\n"
+	 { "SquareLattice_unitCellArea", _wrap_SquareLattice_unitCellArea, METH_O, "\n"
 		"SquareLattice_unitCellArea(SquareLattice self) -> double\n"
-		"\n"
 		"double SquareLattice::unitCellArea() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_SquareLattice", _wrap_delete_SquareLattice, METH_VARARGS, (char *)"delete_SquareLattice(SquareLattice self)"},
-	 { (char *)"SquareLattice_swigregister", SquareLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_HexagonalLattice", _wrap_new_HexagonalLattice, METH_VARARGS, (char *)"\n"
+	 { "delete_SquareLattice", _wrap_delete_SquareLattice, METH_O, "delete_SquareLattice(SquareLattice self)"},
+	 { "SquareLattice_swigregister", SquareLattice_swigregister, METH_O, NULL},
+	 { "SquareLattice_swiginit", SquareLattice_swiginit, METH_VARARGS, NULL},
+	 { "new_HexagonalLattice", _wrap_new_HexagonalLattice, METH_VARARGS, "\n"
 		"HexagonalLattice(double length, double rotation_angle=0.0)\n"
-		"new_HexagonalLattice(double length) -> HexagonalLattice\n"
-		"\n"
 		"HexagonalLattice::HexagonalLattice(double length, double rotation_angle=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_clone", _wrap_HexagonalLattice_clone, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_clone", _wrap_HexagonalLattice_clone, METH_O, "\n"
 		"HexagonalLattice_clone(HexagonalLattice self) -> HexagonalLattice\n"
-		"\n"
 		"HexagonalLattice * HexagonalLattice::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_accept", _wrap_HexagonalLattice_accept, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_accept", _wrap_HexagonalLattice_accept, METH_VARARGS, "\n"
 		"HexagonalLattice_accept(HexagonalLattice self, INodeVisitor visitor)\n"
-		"\n"
 		"void HexagonalLattice::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_length1", _wrap_HexagonalLattice_length1, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_length1", _wrap_HexagonalLattice_length1, METH_O, "\n"
 		"HexagonalLattice_length1(HexagonalLattice self) -> double\n"
-		"\n"
 		"virtual double HexagonalLattice::length1() const\n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_length2", _wrap_HexagonalLattice_length2, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_length2", _wrap_HexagonalLattice_length2, METH_O, "\n"
 		"HexagonalLattice_length2(HexagonalLattice self) -> double\n"
-		"\n"
 		"virtual double HexagonalLattice::length2() const\n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_latticeAngle", _wrap_HexagonalLattice_latticeAngle, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_latticeAngle", _wrap_HexagonalLattice_latticeAngle, METH_O, "\n"
 		"HexagonalLattice_latticeAngle(HexagonalLattice self) -> double\n"
-		"\n"
 		"double HexagonalLattice::latticeAngle() const\n"
 		"\n"
 		""},
-	 { (char *)"HexagonalLattice_unitCellArea", _wrap_HexagonalLattice_unitCellArea, METH_VARARGS, (char *)"\n"
+	 { "HexagonalLattice_unitCellArea", _wrap_HexagonalLattice_unitCellArea, METH_O, "\n"
 		"HexagonalLattice_unitCellArea(HexagonalLattice self) -> double\n"
-		"\n"
 		"double HexagonalLattice::unitCellArea() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_HexagonalLattice", _wrap_delete_HexagonalLattice, METH_VARARGS, (char *)"delete_HexagonalLattice(HexagonalLattice self)"},
-	 { (char *)"HexagonalLattice_swigregister", HexagonalLattice_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Layer", _wrap_new_Layer, METH_VARARGS, (char *)"\n"
+	 { "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},
+	 { "new_Layer", _wrap_new_Layer, METH_VARARGS, "\n"
 		"Layer(Material material, double thickness=0)\n"
-		"new_Layer(Material material) -> Layer\n"
-		"\n"
 		"Layer::Layer(Material material, double thickness=0)\n"
 		"\n"
 		"Constructor of a layer with thickness and material\n"
@@ -136776,106 +132860,91 @@ static PyMethodDef SwigMethods[] = {
 		"thickness of a layer in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"delete_Layer", _wrap_delete_Layer, METH_VARARGS, (char *)"\n"
+	 { "delete_Layer", _wrap_delete_Layer, METH_O, "\n"
 		"delete_Layer(Layer self)\n"
-		"\n"
 		"Layer::~Layer() override\n"
 		"\n"
 		""},
-	 { (char *)"Layer_clone", _wrap_Layer_clone, METH_VARARGS, (char *)"\n"
+	 { "Layer_clone", _wrap_Layer_clone, METH_O, "\n"
 		"Layer_clone(Layer self) -> Layer\n"
-		"\n"
 		"Layer * Layer::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"Layer_accept", _wrap_Layer_accept, METH_VARARGS, (char *)"\n"
+	 { "Layer_accept", _wrap_Layer_accept, METH_VARARGS, "\n"
 		"Layer_accept(Layer self, INodeVisitor visitor)\n"
-		"\n"
 		"void Layer::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Layer_setThickness", _wrap_Layer_setThickness, METH_VARARGS, (char *)"\n"
+	 { "Layer_setThickness", _wrap_Layer_setThickness, METH_VARARGS, "\n"
 		"Layer_setThickness(Layer self, double thickness)\n"
-		"\n"
 		"void Layer::setThickness(double thickness)\n"
 		"\n"
 		"Sets layer thickness in nanometers. \n"
 		"\n"
 		""},
-	 { (char *)"Layer_thickness", _wrap_Layer_thickness, METH_VARARGS, (char *)"\n"
+	 { "Layer_thickness", _wrap_Layer_thickness, METH_O, "\n"
 		"Layer_thickness(Layer self) -> double\n"
-		"\n"
 		"double Layer::thickness() const\n"
 		"\n"
 		""},
-	 { (char *)"Layer_material", _wrap_Layer_material, METH_VARARGS, (char *)"\n"
+	 { "Layer_material", _wrap_Layer_material, METH_O, "\n"
 		"Layer_material(Layer self) -> Material\n"
-		"\n"
 		"const Material* Layer::material() const override final\n"
 		"\n"
 		"Returns nullptr, unless overwritten to return a specific material. \n"
 		"\n"
 		""},
-	 { (char *)"Layer_setMaterial", _wrap_Layer_setMaterial, METH_VARARGS, (char *)"\n"
+	 { "Layer_setMaterial", _wrap_Layer_setMaterial, METH_VARARGS, "\n"
 		"Layer_setMaterial(Layer self, Material material)\n"
-		"\n"
 		"void Layer::setMaterial(Material material)\n"
 		"\n"
 		""},
-	 { (char *)"Layer_addLayout", _wrap_Layer_addLayout, METH_VARARGS, (char *)"\n"
+	 { "Layer_addLayout", _wrap_Layer_addLayout, METH_VARARGS, "\n"
 		"Layer_addLayout(Layer self, ILayout decoration)\n"
-		"\n"
 		"void Layer::addLayout(const ILayout &decoration)\n"
 		"\n"
 		""},
-	 { (char *)"Layer_numberOfLayouts", _wrap_Layer_numberOfLayouts, METH_VARARGS, (char *)"\n"
+	 { "Layer_numberOfLayouts", _wrap_Layer_numberOfLayouts, METH_O, "\n"
 		"Layer_numberOfLayouts(Layer self) -> size_t\n"
-		"\n"
 		"size_t Layer::numberOfLayouts() const\n"
 		"\n"
 		""},
-	 { (char *)"Layer_layouts", _wrap_Layer_layouts, METH_VARARGS, (char *)"\n"
+	 { "Layer_layouts", _wrap_Layer_layouts, METH_O, "\n"
 		"Layer_layouts(Layer self) -> std::vector< ILayout const *,std::allocator< ILayout const * > >\n"
-		"\n"
 		"std::vector< const ILayout * > Layer::layouts() const\n"
 		"\n"
 		""},
-	 { (char *)"Layer_getChildren", _wrap_Layer_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Layer_getChildren", _wrap_Layer_getChildren, METH_O, "\n"
 		"Layer_getChildren(Layer self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Layer::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"Layer_registerThickness", _wrap_Layer_registerThickness, METH_VARARGS, (char *)"\n"
-		"registerThickness(bool make_registered=True)\n"
-		"Layer_registerThickness(Layer self)\n"
-		"\n"
+	 { "Layer_registerThickness", _wrap_Layer_registerThickness, METH_VARARGS, "\n"
+		"Layer_registerThickness(Layer self, bool make_registered=True)\n"
 		"void Layer::registerThickness(bool make_registered=true)\n"
 		"\n"
 		""},
-	 { (char *)"Layer_setNumberOfSlices", _wrap_Layer_setNumberOfSlices, METH_VARARGS, (char *)"\n"
+	 { "Layer_setNumberOfSlices", _wrap_Layer_setNumberOfSlices, METH_VARARGS, "\n"
 		"Layer_setNumberOfSlices(Layer self, unsigned int n_slices)\n"
-		"\n"
 		"void Layer::setNumberOfSlices(unsigned int n_slices)\n"
 		"\n"
 		""},
-	 { (char *)"Layer_numberOfSlices", _wrap_Layer_numberOfSlices, METH_VARARGS, (char *)"\n"
+	 { "Layer_numberOfSlices", _wrap_Layer_numberOfSlices, METH_O, "\n"
 		"Layer_numberOfSlices(Layer self) -> unsigned int\n"
-		"\n"
 		"unsigned int Layer::numberOfSlices() const\n"
 		"\n"
 		""},
-	 { (char *)"Layer_swigregister", Layer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_LayerRoughness", _wrap_new_LayerRoughness, METH_VARARGS, (char *)"\n"
+	 { "Layer_swigregister", Layer_swigregister, METH_O, NULL},
+	 { "Layer_swiginit", Layer_swiginit, METH_VARARGS, NULL},
+	 { "new_LayerRoughness", _wrap_new_LayerRoughness, METH_VARARGS, "\n"
 		"LayerRoughness()\n"
 		"new_LayerRoughness(double sigma, double hurstParameter, double lateralCorrLength) -> LayerRoughness\n"
-		"\n"
 		"LayerRoughness::LayerRoughness(double sigma, double hurstParameter, double lateralCorrLength)\n"
 		"\n"
 		"Constructor of layer roughness.\n"
@@ -136893,25 +132962,22 @@ static PyMethodDef SwigMethods[] = {
 		"lateral correlation length of the roughness in nanometers \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_clone", _wrap_LayerRoughness_clone, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_clone", _wrap_LayerRoughness_clone, METH_O, "\n"
 		"LayerRoughness_clone(LayerRoughness self) -> LayerRoughness\n"
-		"\n"
 		"LayerRoughness* LayerRoughness::clone() const\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_accept", _wrap_LayerRoughness_accept, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_accept", _wrap_LayerRoughness_accept, METH_VARARGS, "\n"
 		"LayerRoughness_accept(LayerRoughness self, INodeVisitor visitor)\n"
-		"\n"
 		"virtual void LayerRoughness::accept(INodeVisitor *visitor) const\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_getSpectralFun", _wrap_LayerRoughness_getSpectralFun, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_getSpectralFun", _wrap_LayerRoughness_getSpectralFun, METH_VARARGS, "\n"
 		"LayerRoughness_getSpectralFun(LayerRoughness self, kvector_t kvec) -> double\n"
-		"\n"
 		"double LayerRoughness::getSpectralFun(const kvector_t kvec) const\n"
 		"\n"
 		"Returns power spectral density of the surface roughness.\n"
@@ -136921,90 +132987,81 @@ static PyMethodDef SwigMethods[] = {
 		"Based on the article D.K.G. de Boer, Physical review B, Volume 51, Number 8, 15 February 1995 \"X-ray reflection and transmission by rough surfaces\" \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_getCorrFun", _wrap_LayerRoughness_getCorrFun, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_getCorrFun", _wrap_LayerRoughness_getCorrFun, METH_VARARGS, "\n"
 		"LayerRoughness_getCorrFun(LayerRoughness self, kvector_t k) -> double\n"
-		"\n"
 		"double LayerRoughness::getCorrFun(const kvector_t k) const\n"
 		"\n"
 		"Correlation function of the roughness profile. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_setSigma", _wrap_LayerRoughness_setSigma, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_setSigma", _wrap_LayerRoughness_setSigma, METH_VARARGS, "\n"
 		"LayerRoughness_setSigma(LayerRoughness self, double sigma)\n"
-		"\n"
 		"void LayerRoughness::setSigma(double sigma)\n"
 		"\n"
 		"Sets rms of roughness. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_getSigma", _wrap_LayerRoughness_getSigma, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_getSigma", _wrap_LayerRoughness_getSigma, METH_O, "\n"
 		"LayerRoughness_getSigma(LayerRoughness self) -> double\n"
-		"\n"
 		"double LayerRoughness::getSigma() const\n"
 		"\n"
 		"Returns rms of roughness. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_setHurstParameter", _wrap_LayerRoughness_setHurstParameter, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_setHurstParameter", _wrap_LayerRoughness_setHurstParameter, METH_VARARGS, "\n"
 		"LayerRoughness_setHurstParameter(LayerRoughness self, double hurstParameter)\n"
-		"\n"
 		"void LayerRoughness::setHurstParameter(double hurstParameter)\n"
 		"\n"
 		"Sets hurst parameter. It describes how jagged the surface is. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_getHurstParameter", _wrap_LayerRoughness_getHurstParameter, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_getHurstParameter", _wrap_LayerRoughness_getHurstParameter, METH_O, "\n"
 		"LayerRoughness_getHurstParameter(LayerRoughness self) -> double\n"
-		"\n"
 		"double LayerRoughness::getHurstParameter() const\n"
 		"\n"
 		"Returns hurst parameter. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_setLatteralCorrLength", _wrap_LayerRoughness_setLatteralCorrLength, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_setLatteralCorrLength", _wrap_LayerRoughness_setLatteralCorrLength, METH_VARARGS, "\n"
 		"LayerRoughness_setLatteralCorrLength(LayerRoughness self, double lateralCorrLength)\n"
-		"\n"
 		"void LayerRoughness::setLatteralCorrLength(double lateralCorrLength)\n"
 		"\n"
 		"Sets lateral correlation length. \n"
 		"\n"
 		""},
-	 { (char *)"LayerRoughness_getLatteralCorrLength", _wrap_LayerRoughness_getLatteralCorrLength, METH_VARARGS, (char *)"\n"
+	 { "LayerRoughness_getLatteralCorrLength", _wrap_LayerRoughness_getLatteralCorrLength, METH_O, "\n"
 		"LayerRoughness_getLatteralCorrLength(LayerRoughness self) -> double\n"
-		"\n"
 		"double LayerRoughness::getLatteralCorrLength() const\n"
 		"\n"
 		"Returns lateral correlation length. \n"
 		"\n"
 		""},
-	 { (char *)"delete_LayerRoughness", _wrap_delete_LayerRoughness, METH_VARARGS, (char *)"delete_LayerRoughness(LayerRoughness self)"},
-	 { (char *)"LayerRoughness_swigregister", LayerRoughness_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Line", _wrap_new_Line, METH_VARARGS, (char *)"\n"
+	 { "delete_LayerRoughness", _wrap_delete_LayerRoughness, METH_O, "delete_LayerRoughness(LayerRoughness self)"},
+	 { "LayerRoughness_swigregister", LayerRoughness_swigregister, METH_O, NULL},
+	 { "LayerRoughness_swiginit", LayerRoughness_swiginit, METH_VARARGS, NULL},
+	 { "new_Line", _wrap_new_Line, METH_VARARGS, "\n"
 		"new_Line(double x1, double y1, double x2, double y2) -> Line\n"
-		"\n"
 		"Line::Line(double x1, double y1, double x2, double y2)\n"
 		"\n"
 		""},
-	 { (char *)"Line_clone", _wrap_Line_clone, METH_VARARGS, (char *)"\n"
+	 { "Line_clone", _wrap_Line_clone, METH_O, "\n"
 		"Line_clone(Line self) -> Line\n"
-		"\n"
 		"Line* Line::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"Line_contains", _wrap_Line_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "Line_contains", _wrap_Line_contains, METH_VARARGS, "\n"
+		"Line_contains(Line self, double x, double y) -> bool\n"
 		"Line_contains(Line self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool Line::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"delete_Line", _wrap_delete_Line, METH_VARARGS, (char *)"delete_Line(Line self)"},
-	 { (char *)"Line_swigregister", Line_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_VerticalLine", _wrap_new_VerticalLine, METH_VARARGS, (char *)"\n"
+	 { "delete_Line", _wrap_delete_Line, METH_O, "delete_Line(Line self)"},
+	 { "Line_swigregister", Line_swigregister, METH_O, NULL},
+	 { "Line_swiginit", Line_swiginit, METH_VARARGS, NULL},
+	 { "new_VerticalLine", _wrap_new_VerticalLine, METH_O, "\n"
 		"new_VerticalLine(double x) -> VerticalLine\n"
-		"\n"
 		"VerticalLine::VerticalLine(double x)\n"
 		"\n"
 		"Parameters:\n"
@@ -137014,32 +133071,29 @@ static PyMethodDef SwigMethods[] = {
 		"The value at which it crosses x-axes \n"
 		"\n"
 		""},
-	 { (char *)"VerticalLine_clone", _wrap_VerticalLine_clone, METH_VARARGS, (char *)"\n"
+	 { "VerticalLine_clone", _wrap_VerticalLine_clone, METH_O, "\n"
 		"VerticalLine_clone(VerticalLine self) -> VerticalLine\n"
-		"\n"
 		"VerticalLine* VerticalLine::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"VerticalLine_contains", _wrap_VerticalLine_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "VerticalLine_contains", _wrap_VerticalLine_contains, METH_VARARGS, "\n"
+		"VerticalLine_contains(VerticalLine self, double x, double y) -> bool\n"
 		"VerticalLine_contains(VerticalLine self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool VerticalLine::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"VerticalLine_getXpos", _wrap_VerticalLine_getXpos, METH_VARARGS, (char *)"\n"
+	 { "VerticalLine_getXpos", _wrap_VerticalLine_getXpos, METH_O, "\n"
 		"VerticalLine_getXpos(VerticalLine self) -> double\n"
-		"\n"
 		"double VerticalLine::getXpos() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_VerticalLine", _wrap_delete_VerticalLine, METH_VARARGS, (char *)"delete_VerticalLine(VerticalLine self)"},
-	 { (char *)"VerticalLine_swigregister", VerticalLine_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_HorizontalLine", _wrap_new_HorizontalLine, METH_VARARGS, (char *)"\n"
+	 { "delete_VerticalLine", _wrap_delete_VerticalLine, METH_O, "delete_VerticalLine(VerticalLine self)"},
+	 { "VerticalLine_swigregister", VerticalLine_swigregister, METH_O, NULL},
+	 { "VerticalLine_swiginit", VerticalLine_swiginit, METH_VARARGS, NULL},
+	 { "new_HorizontalLine", _wrap_new_HorizontalLine, METH_O, "\n"
 		"new_HorizontalLine(double y) -> HorizontalLine\n"
-		"\n"
 		"HorizontalLine::HorizontalLine(double y)\n"
 		"\n"
 		"Parameters:\n"
@@ -137049,149 +133103,130 @@ static PyMethodDef SwigMethods[] = {
 		"The value at which it crosses y-axes \n"
 		"\n"
 		""},
-	 { (char *)"HorizontalLine_clone", _wrap_HorizontalLine_clone, METH_VARARGS, (char *)"\n"
+	 { "HorizontalLine_clone", _wrap_HorizontalLine_clone, METH_O, "\n"
 		"HorizontalLine_clone(HorizontalLine self) -> HorizontalLine\n"
-		"\n"
 		"HorizontalLine* HorizontalLine::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"HorizontalLine_contains", _wrap_HorizontalLine_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "HorizontalLine_contains", _wrap_HorizontalLine_contains, METH_VARARGS, "\n"
+		"HorizontalLine_contains(HorizontalLine self, double x, double y) -> bool\n"
 		"HorizontalLine_contains(HorizontalLine self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool HorizontalLine::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"HorizontalLine_getYpos", _wrap_HorizontalLine_getYpos, METH_VARARGS, (char *)"\n"
+	 { "HorizontalLine_getYpos", _wrap_HorizontalLine_getYpos, METH_O, "\n"
 		"HorizontalLine_getYpos(HorizontalLine self) -> double\n"
-		"\n"
 		"double HorizontalLine::getYpos() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_HorizontalLine", _wrap_delete_HorizontalLine, METH_VARARGS, (char *)"delete_HorizontalLine(HorizontalLine self)"},
-	 { (char *)"HorizontalLine_swigregister", HorizontalLine_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Material", _wrap_new_Material, METH_VARARGS, (char *)"\n"
+	 { "delete_HorizontalLine", _wrap_delete_HorizontalLine, METH_O, "delete_HorizontalLine(HorizontalLine self)"},
+	 { "HorizontalLine_swigregister", HorizontalLine_swigregister, METH_O, NULL},
+	 { "HorizontalLine_swiginit", HorizontalLine_swiginit, METH_VARARGS, NULL},
+	 { "new_Material", _wrap_new_Material, METH_VARARGS, "\n"
 		"Material(Material material)\n"
 		"new_Material(Material material) -> Material\n"
-		"\n"
 		"Material::Material(std::unique_ptr< BaseMaterialImpl > material_impl)\n"
 		"\n"
 		"Creates material with particular material implementation. \n"
 		"\n"
 		""},
-	 { (char *)"Material_inverted", _wrap_Material_inverted, METH_VARARGS, (char *)"\n"
+	 { "Material_inverted", _wrap_Material_inverted, METH_O, "\n"
 		"Material_inverted(Material self) -> Material\n"
-		"\n"
 		"Material Material::inverted() const\n"
 		"\n"
 		"Constructs a material with inverted magnetization. \n"
 		"\n"
 		""},
-	 { (char *)"Material_refractiveIndex", _wrap_Material_refractiveIndex, METH_VARARGS, (char *)"\n"
+	 { "Material_refractiveIndex", _wrap_Material_refractiveIndex, METH_VARARGS, "\n"
 		"Material_refractiveIndex(Material self, double wavelength) -> complex_t\n"
-		"\n"
 		"complex_t Material::refractiveIndex(double wavelength) const\n"
 		"\n"
 		"Returns refractive index. \n"
 		"\n"
 		""},
-	 { (char *)"Material_refractiveIndex2", _wrap_Material_refractiveIndex2, METH_VARARGS, (char *)"\n"
+	 { "Material_refractiveIndex2", _wrap_Material_refractiveIndex2, METH_VARARGS, "\n"
 		"Material_refractiveIndex2(Material self, double wavelength) -> complex_t\n"
-		"\n"
 		"complex_t Material::refractiveIndex2(double wavelength) const\n"
 		"\n"
 		"Returns squared refractive index. \n"
 		"\n"
 		""},
-	 { (char *)"Material_isScalarMaterial", _wrap_Material_isScalarMaterial, METH_VARARGS, (char *)"\n"
+	 { "Material_isScalarMaterial", _wrap_Material_isScalarMaterial, METH_O, "\n"
 		"Material_isScalarMaterial(Material self) -> bool\n"
-		"\n"
 		"bool Material::isScalarMaterial() const\n"
 		"\n"
 		"Indicates whether the interaction with the material is scalar. This means that different polarization states will be diffracted equally \n"
 		"\n"
 		""},
-	 { (char *)"Material_isMagneticMaterial", _wrap_Material_isMagneticMaterial, METH_VARARGS, (char *)"\n"
+	 { "Material_isMagneticMaterial", _wrap_Material_isMagneticMaterial, METH_O, "\n"
 		"Material_isMagneticMaterial(Material self) -> bool\n"
-		"\n"
 		"bool Material::isMagneticMaterial() const\n"
 		"\n"
 		""},
-	 { (char *)"Material_getName", _wrap_Material_getName, METH_VARARGS, (char *)"\n"
+	 { "Material_getName", _wrap_Material_getName, METH_O, "\n"
 		"Material_getName(Material self) -> std::string\n"
-		"\n"
 		"std::string Material::getName() const\n"
 		"\n"
 		"Returns the name of material. \n"
 		"\n"
 		""},
-	 { (char *)"Material_magnetization", _wrap_Material_magnetization, METH_VARARGS, (char *)"\n"
+	 { "Material_magnetization", _wrap_Material_magnetization, METH_O, "\n"
 		"Material_magnetization(Material self) -> kvector_t\n"
-		"\n"
 		"kvector_t Material::magnetization() const\n"
 		"\n"
 		"Get the magnetization (in A/m) \n"
 		"\n"
 		""},
-	 { (char *)"Material_materialData", _wrap_Material_materialData, METH_VARARGS, (char *)"\n"
+	 { "Material_materialData", _wrap_Material_materialData, METH_O, "\n"
 		"Material_materialData(Material self) -> complex_t\n"
-		"\n"
 		"complex_t Material::materialData() const\n"
 		"\n"
 		"Returns underlying material data. The units of returned values are the same as the ones passed to material factory functions \n"
 		"\n"
 		""},
-	 { (char *)"Material_isEmpty", _wrap_Material_isEmpty, METH_VARARGS, (char *)"\n"
+	 { "Material_isEmpty", _wrap_Material_isEmpty, METH_O, "\n"
 		"Material_isEmpty(Material self) -> bool\n"
-		"\n"
 		"bool Material::isEmpty() const\n"
 		"\n"
 		"Returns true if material underlying data is nullptr. \n"
 		"\n"
 		""},
-	 { (char *)"Material_isDefaultMaterial", _wrap_Material_isDefaultMaterial, METH_VARARGS, (char *)"\n"
+	 { "Material_isDefaultMaterial", _wrap_Material_isDefaultMaterial, METH_O, "\n"
 		"Material_isDefaultMaterial(Material self) -> bool\n"
-		"\n"
 		"bool Material::isDefaultMaterial() const\n"
 		"\n"
 		"Returns true if material has refractive index of (1.0, 0.0) and zero magnetization. \n"
 		"\n"
 		""},
-	 { (char *)"Material_scalarSubtrSLD", _wrap_Material_scalarSubtrSLD, METH_VARARGS, (char *)"\n"
+	 { "Material_scalarSubtrSLD", _wrap_Material_scalarSubtrSLD, METH_VARARGS, "\n"
 		"Material_scalarSubtrSLD(Material self, WavevectorInfo wavevectors) -> complex_t\n"
-		"\n"
 		"complex_t Material::scalarSubtrSLD(const WavevectorInfo &wavevectors) const\n"
 		"\n"
 		"Returns (  $ \\\\pi/\\\\lambda^2 $ - sld), sld (in  $nm^{-2}$) being the scattering length density. \n"
 		"\n"
 		""},
-	 { (char *)"Material_transformedMaterial", _wrap_Material_transformedMaterial, METH_VARARGS, (char *)"\n"
+	 { "Material_transformedMaterial", _wrap_Material_transformedMaterial, METH_VARARGS, "\n"
 		"Material_transformedMaterial(Material self, Transform3D const & transform) -> Material\n"
-		"\n"
 		"Material Material::transformedMaterial(const Transform3D &transform) const\n"
 		"\n"
 		""},
-	 { (char *)"delete_Material", _wrap_delete_Material, METH_VARARGS, (char *)"delete_Material(Material self)"},
-	 { (char *)"Material_swigregister", Material_swigregister, METH_VARARGS, NULL},
-	 { (char *)"HomogeneousMaterial", _wrap_HomogeneousMaterial, METH_VARARGS, (char *)"\n"
+	 { "delete_Material", _wrap_delete_Material, METH_O, "delete_Material(Material self)"},
+	 { "Material_swigregister", Material_swigregister, METH_O, NULL},
+	 { "Material_swiginit", Material_swiginit, METH_VARARGS, NULL},
+	 { "HomogeneousMaterial", _wrap_HomogeneousMaterial, METH_VARARGS, "\n"
 		"HomogeneousMaterial() -> Material\n"
-		"HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization) -> Material\n"
-		"HomogeneousMaterial(std::string const & name, double delta, double beta) -> Material\n"
-		"HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material\n"
-		"HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material\n"
-		"\n"
+		"HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization=kvector_t()) -> Material\n"
+		"HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization=kvector_t()) -> Material\n"
 		"BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())\n"
 		"\n"
 		"Constructs a material with  name,  refractive_index and  magnetization (in A/m). Alternatively,  $\\\\delta$ and  $\\\\beta$ for refractive index  $n = 1 - \\\\delta + i \\\\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with  $n = 1$ and zero magnetization. \n"
 		"\n"
 		""},
-	 { (char *)"MaterialBySLD", _wrap_MaterialBySLD, METH_VARARGS, (char *)"\n"
+	 { "MaterialBySLD", _wrap_MaterialBySLD, METH_VARARGS, "\n"
 		"MaterialBySLD() -> Material\n"
-		"MaterialBySLD(std::string const & name, double sld_real, double sld_imag, kvector_t magnetization) -> Material\n"
-		"MaterialBySLD(std::string const & name, double sld_real, double sld_imag) -> Material\n"
-		"\n"
+		"MaterialBySLD(std::string const & name, double sld_real, double sld_imag, kvector_t magnetization=kvector_t()) -> Material\n"
 		"BA_CORE_API_ Material MaterialBySLD(const std::string &name, double sld_real, double sld_imag, kvector_t magnetization=kvector_t())\n"
 		"\n"
 		"Constructs a wavelength-independent material with a given complex-valued scattering length density (SLD). SLD values for a wide variety of materials can be found on https://sld-calculator.appspot.com/ and https://www.ncnr.nist.gov/resources/activation/ By convention, SLD imaginary part is treated as negative by default, which corresponds to attenuation of the signal. With no parameters given, MaterialBySLD constructs default (vacuum) material with zero sld and zero magnetization.\n"
@@ -137212,88 +133247,77 @@ static PyMethodDef SwigMethods[] = {
 		"magnetization (in A/m) \n"
 		"\n"
 		""},
-	 { (char *)"new_MesoCrystal", _wrap_new_MesoCrystal, METH_VARARGS, (char *)"\n"
+	 { "new_MesoCrystal", _wrap_new_MesoCrystal, METH_VARARGS, "\n"
 		"new_MesoCrystal(IClusteredParticles particle_structure, IFormFactor form_factor) -> MesoCrystal\n"
-		"\n"
 		"MesoCrystal::MesoCrystal(const IClusteredParticles &particle_structure, const IFormFactor &form_factor)\n"
 		"\n"
 		""},
-	 { (char *)"delete_MesoCrystal", _wrap_delete_MesoCrystal, METH_VARARGS, (char *)"\n"
+	 { "delete_MesoCrystal", _wrap_delete_MesoCrystal, METH_O, "\n"
 		"delete_MesoCrystal(MesoCrystal self)\n"
-		"\n"
 		"MesoCrystal::~MesoCrystal()\n"
 		"\n"
 		""},
-	 { (char *)"MesoCrystal_clone", _wrap_MesoCrystal_clone, METH_VARARGS, (char *)"\n"
+	 { "MesoCrystal_clone", _wrap_MesoCrystal_clone, METH_O, "\n"
 		"MesoCrystal_clone(MesoCrystal self) -> MesoCrystal\n"
-		"\n"
 		"MesoCrystal * MesoCrystal::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"MesoCrystal_accept", _wrap_MesoCrystal_accept, METH_VARARGS, (char *)"\n"
+	 { "MesoCrystal_accept", _wrap_MesoCrystal_accept, METH_VARARGS, "\n"
 		"MesoCrystal_accept(MesoCrystal self, INodeVisitor visitor)\n"
-		"\n"
 		"void MesoCrystal::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"MesoCrystal_createSlicedParticle", _wrap_MesoCrystal_createSlicedParticle, METH_VARARGS, (char *)"\n"
+	 { "MesoCrystal_createSlicedParticle", _wrap_MesoCrystal_createSlicedParticle, METH_VARARGS, "\n"
 		"MesoCrystal_createSlicedParticle(MesoCrystal self, ZLimits limits) -> SlicedParticle\n"
-		"\n"
 		"SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const override final\n"
 		"\n"
 		"Create a sliced form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"MesoCrystal_getChildren", _wrap_MesoCrystal_getChildren, METH_VARARGS, (char *)"\n"
+	 { "MesoCrystal_getChildren", _wrap_MesoCrystal_getChildren, METH_O, "\n"
 		"MesoCrystal_getChildren(MesoCrystal self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > MesoCrystal::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"MesoCrystal_swigregister", MesoCrystal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_MultiLayer", _wrap_new_MultiLayer, METH_VARARGS, (char *)"\n"
+	 { "MesoCrystal_swigregister", MesoCrystal_swigregister, METH_O, NULL},
+	 { "MesoCrystal_swiginit", MesoCrystal_swiginit, METH_VARARGS, NULL},
+	 { "new_MultiLayer", _wrap_new_MultiLayer, METH_NOARGS, "\n"
 		"new_MultiLayer() -> MultiLayer\n"
-		"\n"
 		"MultiLayer::MultiLayer()\n"
 		"\n"
 		""},
-	 { (char *)"delete_MultiLayer", _wrap_delete_MultiLayer, METH_VARARGS, (char *)"\n"
+	 { "delete_MultiLayer", _wrap_delete_MultiLayer, METH_O, "\n"
 		"delete_MultiLayer(MultiLayer self)\n"
-		"\n"
 		"MultiLayer::~MultiLayer() override\n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_clone", _wrap_MultiLayer_clone, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_clone", _wrap_MultiLayer_clone, METH_O, "\n"
 		"MultiLayer_clone(MultiLayer self) -> MultiLayer\n"
-		"\n"
 		"MultiLayer * MultiLayer::clone() const final override\n"
 		"\n"
 		"Returns a clone of multilayer with clones of all layers and interfaces between layers \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_accept", _wrap_MultiLayer_accept, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_accept", _wrap_MultiLayer_accept, METH_VARARGS, "\n"
 		"MultiLayer_accept(MultiLayer self, INodeVisitor visitor)\n"
-		"\n"
 		"void MultiLayer::accept(INodeVisitor *visitor) const final override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_numberOfLayers", _wrap_MultiLayer_numberOfLayers, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_numberOfLayers", _wrap_MultiLayer_numberOfLayers, METH_O, "\n"
 		"MultiLayer_numberOfLayers(MultiLayer self) -> size_t\n"
-		"\n"
 		"size_t MultiLayer::numberOfLayers() const\n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_addLayer", _wrap_MultiLayer_addLayer, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_addLayer", _wrap_MultiLayer_addLayer, METH_VARARGS, "\n"
 		"MultiLayer_addLayer(MultiLayer self, Layer layer)\n"
-		"\n"
 		"void MultiLayer::addLayer(const Layer &layer)\n"
 		"\n"
 		"Adds object to multilayer.\n"
@@ -137301,283 +133325,248 @@ static PyMethodDef SwigMethods[] = {
 		"Adds layer with default (zero) roughness. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_addLayerWithTopRoughness", _wrap_MultiLayer_addLayerWithTopRoughness, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_addLayerWithTopRoughness", _wrap_MultiLayer_addLayerWithTopRoughness, METH_VARARGS, "\n"
 		"MultiLayer_addLayerWithTopRoughness(MultiLayer self, Layer layer, LayerRoughness roughness)\n"
-		"\n"
 		"void MultiLayer::addLayerWithTopRoughness(const Layer &layer, const LayerRoughness &roughness)\n"
 		"\n"
 		"Adds layer with top roughness. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_layer", _wrap_MultiLayer_layer, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_layer", _wrap_MultiLayer_layer, METH_VARARGS, "\n"
 		"MultiLayer_layer(MultiLayer self, size_t i_layer) -> Layer\n"
-		"\n"
 		"const Layer * MultiLayer::layer(size_t i_layer) const\n"
 		"\n"
 		"Returns layer with given index. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_layerInterface", _wrap_MultiLayer_layerInterface, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_layerInterface", _wrap_MultiLayer_layerInterface, METH_VARARGS, "\n"
 		"MultiLayer_layerInterface(MultiLayer self, size_t i_interface) -> LayerInterface const *\n"
-		"\n"
 		"const LayerInterface * MultiLayer::layerInterface(size_t i_interface) const\n"
 		"\n"
 		"Returns interface with given index. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_setCrossCorrLength", _wrap_MultiLayer_setCrossCorrLength, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_setCrossCorrLength", _wrap_MultiLayer_setCrossCorrLength, METH_VARARGS, "\n"
 		"MultiLayer_setCrossCorrLength(MultiLayer self, double crossCorrLength)\n"
-		"\n"
 		"void MultiLayer::setCrossCorrLength(double crossCorrLength)\n"
 		"\n"
 		"Sets cross correlation length of roughnesses between interfaces. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_crossCorrLength", _wrap_MultiLayer_crossCorrLength, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_crossCorrLength", _wrap_MultiLayer_crossCorrLength, METH_O, "\n"
 		"MultiLayer_crossCorrLength(MultiLayer self) -> double\n"
-		"\n"
 		"double MultiLayer::crossCorrLength() const\n"
 		"\n"
 		"Returns cross correlation length of roughnesses between interfaces. \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_setExternalField", _wrap_MultiLayer_setExternalField, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_setExternalField", _wrap_MultiLayer_setExternalField, METH_VARARGS, "\n"
 		"MultiLayer_setExternalField(MultiLayer self, kvector_t ext_field)\n"
-		"\n"
 		"void MultiLayer::setExternalField(kvector_t ext_field)\n"
 		"\n"
 		"Sets the external field applied to the multilayer (units: A/m) \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_externalField", _wrap_MultiLayer_externalField, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_externalField", _wrap_MultiLayer_externalField, METH_O, "\n"
 		"MultiLayer_externalField(MultiLayer self) -> kvector_t\n"
-		"\n"
 		"kvector_t MultiLayer::externalField() const\n"
 		"\n"
 		"Returns the external field applied to the multilayer (units: A/m) \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_getChildren", _wrap_MultiLayer_getChildren, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_getChildren", _wrap_MultiLayer_getChildren, METH_O, "\n"
 		"MultiLayer_getChildren(MultiLayer self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > MultiLayer::getChildren() const final override\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_setRoughnessModel", _wrap_MultiLayer_setRoughnessModel, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_setRoughnessModel", _wrap_MultiLayer_setRoughnessModel, METH_VARARGS, "\n"
 		"MultiLayer_setRoughnessModel(MultiLayer self, RoughnessModel roughnessModel)\n"
-		"\n"
 		"void MultiLayer::setRoughnessModel(RoughnessModel roughnessModel)\n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_roughnessModel", _wrap_MultiLayer_roughnessModel, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_roughnessModel", _wrap_MultiLayer_roughnessModel, METH_O, "\n"
 		"MultiLayer_roughnessModel(MultiLayer self) -> RoughnessModel\n"
-		"\n"
 		"RoughnessModel MultiLayer::roughnessModel() const\n"
 		"\n"
 		""},
-	 { (char *)"MultiLayer_swigregister", MultiLayer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"MaterialProfile_cpp", _wrap_MaterialProfile_cpp, METH_VARARGS, (char *)"\n"
+	 { "MultiLayer_swigregister", MultiLayer_swigregister, METH_O, NULL},
+	 { "MultiLayer_swiginit", MultiLayer_swiginit, METH_VARARGS, NULL},
+	 { "MaterialProfile_cpp", _wrap_MaterialProfile_cpp, METH_VARARGS, "\n"
 		"MaterialProfile_cpp(MultiLayer multilayer, int n_points, double z_min, double z_max) -> vector_complex_t\n"
-		"\n"
 		"BA_CORE_API_ std::vector<complex_t> MaterialProfile(const MultiLayer &multilayer, int n_points, double z_min, double z_max)\n"
 		"\n"
 		"Calculate average material profile for given multilayer. \n"
 		"\n"
 		""},
-	 { (char *)"DefaultMaterialProfileLimits", _wrap_DefaultMaterialProfileLimits, METH_VARARGS, (char *)"\n"
+	 { "DefaultMaterialProfileLimits", _wrap_DefaultMaterialProfileLimits, METH_O, "\n"
 		"DefaultMaterialProfileLimits(MultiLayer multilayer) -> pair_double_t\n"
-		"\n"
 		"BA_CORE_API_ std::pair<double, double> DefaultMaterialProfileLimits(const MultiLayer &multilayer)\n"
 		"\n"
 		"Get default z limits for generating a material profile. \n"
 		"\n"
 		""},
-	 { (char *)"GenerateZValues", _wrap_GenerateZValues, METH_VARARGS, (char *)"\n"
+	 { "GenerateZValues", _wrap_GenerateZValues, METH_VARARGS, "\n"
 		"GenerateZValues(int n_points, double z_min, double z_max) -> vdouble1d_t\n"
-		"\n"
 		"BA_CORE_API_ std::vector<double> GenerateZValues(int n_points, double z_min, double z_max)\n"
 		"\n"
 		"Generate z values (equidistant) for use in MaterialProfile. \n"
 		"\n"
 		""},
-	 { (char *)"new_OffSpecSimulation", _wrap_new_OffSpecSimulation, METH_VARARGS, (char *)"\n"
+	 { "new_OffSpecSimulation", _wrap_new_OffSpecSimulation, METH_VARARGS, "\n"
 		"OffSpecSimulation()\n"
 		"OffSpecSimulation(MultiLayer p_sample)\n"
 		"new_OffSpecSimulation(std::shared_ptr< IMultiLayerBuilder > const p_sample_builder) -> OffSpecSimulation\n"
-		"\n"
 		"OffSpecSimulation::OffSpecSimulation(const std::shared_ptr< class IMultiLayerBuilder > p_sample_builder)\n"
 		"\n"
 		""},
-	 { (char *)"delete_OffSpecSimulation", _wrap_delete_OffSpecSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_OffSpecSimulation", _wrap_delete_OffSpecSimulation, METH_O, "\n"
 		"delete_OffSpecSimulation(OffSpecSimulation self)\n"
-		"\n"
 		"OffSpecSimulation::~OffSpecSimulation() final\n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_clone", _wrap_OffSpecSimulation_clone, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_clone", _wrap_OffSpecSimulation_clone, METH_O, "\n"
 		"OffSpecSimulation_clone(OffSpecSimulation self) -> OffSpecSimulation\n"
-		"\n"
 		"OffSpecSimulation* OffSpecSimulation::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_accept", _wrap_OffSpecSimulation_accept, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_accept", _wrap_OffSpecSimulation_accept, METH_VARARGS, "\n"
 		"OffSpecSimulation_accept(OffSpecSimulation self, INodeVisitor visitor)\n"
-		"\n"
 		"void OffSpecSimulation::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_prepareSimulation", _wrap_OffSpecSimulation_prepareSimulation, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_prepareSimulation", _wrap_OffSpecSimulation_prepareSimulation, METH_O, "\n"
 		"OffSpecSimulation_prepareSimulation(OffSpecSimulation self)\n"
-		"\n"
 		"void OffSpecSimulation::prepareSimulation() final\n"
 		"\n"
 		"Put into a clean state for running a simulation. \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_result", _wrap_OffSpecSimulation_result, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_result", _wrap_OffSpecSimulation_result, METH_O, "\n"
 		"OffSpecSimulation_result(OffSpecSimulation self) -> SimulationResult\n"
-		"\n"
 		"SimulationResult OffSpecSimulation::result() const override\n"
 		"\n"
 		"Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_setBeamParameters", _wrap_OffSpecSimulation_setBeamParameters, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_setBeamParameters", _wrap_OffSpecSimulation_setBeamParameters, METH_VARARGS, "\n"
 		"OffSpecSimulation_setBeamParameters(OffSpecSimulation self, double wavelength, IAxis alpha_axis, double phi_i)\n"
-		"\n"
 		"void OffSpecSimulation::setBeamParameters(double wavelength, const IAxis &alpha_axis, double phi_i)\n"
 		"\n"
 		"Sets beam parameters from here (forwarded to  Instrument) \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_beamAxis", _wrap_OffSpecSimulation_beamAxis, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_beamAxis", _wrap_OffSpecSimulation_beamAxis, METH_O, "\n"
 		"OffSpecSimulation_beamAxis(OffSpecSimulation self) -> IAxis\n"
-		"\n"
 		"const IAxis * OffSpecSimulation::beamAxis() const\n"
 		"\n"
 		"Returns axis of the beam. \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_intensityMapSize", _wrap_OffSpecSimulation_intensityMapSize, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_intensityMapSize", _wrap_OffSpecSimulation_intensityMapSize, METH_O, "\n"
 		"OffSpecSimulation_intensityMapSize(OffSpecSimulation self) -> size_t\n"
-		"\n"
 		"size_t OffSpecSimulation::intensityMapSize() const override\n"
 		"\n"
 		"Returns the total number of the intensity values in the simulation result. \n"
 		"\n"
 		""},
-	 { (char *)"OffSpecSimulation_swigregister", OffSpecSimulation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IntensityData", _wrap_new_IntensityData, METH_VARARGS, (char *)"\n"
+	 { "OffSpecSimulation_swigregister", OffSpecSimulation_swigregister, METH_O, NULL},
+	 { "OffSpecSimulation_swiginit", OffSpecSimulation_swiginit, METH_VARARGS, NULL},
+	 { "new_IntensityData", _wrap_new_IntensityData, METH_NOARGS, "\n"
 		"new_IntensityData() -> IntensityData\n"
-		"\n"
 		"OutputData< T >::OutputData(const OutputData &)=delete\n"
 		"\n"
 		""},
-	 { (char *)"delete_IntensityData", _wrap_delete_IntensityData, METH_VARARGS, (char *)"\n"
+	 { "delete_IntensityData", _wrap_delete_IntensityData, METH_O, "\n"
 		"delete_IntensityData(IntensityData self)\n"
-		"\n"
 		"OutputData< T >::~OutputData()\n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_clone", _wrap_IntensityData_clone, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_clone", _wrap_IntensityData_clone, METH_O, "\n"
 		"IntensityData_clone(IntensityData self) -> IntensityData\n"
-		"\n"
 		"OutputData< T > * OutputData< T >::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_copyFrom", _wrap_IntensityData_copyFrom, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_copyFrom", _wrap_IntensityData_copyFrom, METH_VARARGS, "\n"
 		"IntensityData_copyFrom(IntensityData self, IntensityData x)\n"
-		"\n"
 		"void OutputData< T >::copyFrom(const OutputData< T > &x)\n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_meanValues", _wrap_IntensityData_meanValues, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_meanValues", _wrap_IntensityData_meanValues, METH_O, "\n"
 		"IntensityData_meanValues(IntensityData self) -> IntensityData\n"
-		"\n"
 		"OutputData< double > * OutputData< T >::meanValues() const\n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_addAxis", _wrap_IntensityData_addAxis, METH_VARARGS, (char *)"\n"
-		"addAxis(IAxis new_axis)\n"
+	 { "IntensityData_addAxis", _wrap_IntensityData_addAxis, METH_VARARGS, "\n"
+		"IntensityData_addAxis(IntensityData self, IAxis new_axis)\n"
 		"IntensityData_addAxis(IntensityData self, std::string const & name, size_t size, double start, double end)\n"
-		"\n"
 		"void OutputData< T >::addAxis(const std::string &name, size_t size, double start, double end)\n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxis", _wrap_IntensityData_getAxis, METH_VARARGS, (char *)"\n"
-		"getAxis(size_t serial_number) -> IAxis\n"
+	 { "IntensityData_getAxis", _wrap_IntensityData_getAxis, METH_VARARGS, "\n"
+		"IntensityData_getAxis(IntensityData self, size_t serial_number) -> IAxis\n"
 		"IntensityData_getAxis(IntensityData self, std::string const & axis_name) -> IAxis\n"
-		"\n"
 		"const IAxis & OutputData< T >::getAxis(const std::string &axis_name) const\n"
 		"\n"
 		"returns axis with given name \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getRank", _wrap_IntensityData_getRank, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getRank", _wrap_IntensityData_getRank, METH_O, "\n"
 		"IntensityData_getRank(IntensityData self) -> size_t\n"
-		"\n"
 		"size_t OutputData< T >::getRank() const\n"
 		"\n"
 		"Returns number of dimensions. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAllocatedSize", _wrap_IntensityData_getAllocatedSize, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getAllocatedSize", _wrap_IntensityData_getAllocatedSize, METH_O, "\n"
 		"IntensityData_getAllocatedSize(IntensityData self) -> size_t\n"
-		"\n"
 		"size_t OutputData< T >::getAllocatedSize() const\n"
 		"\n"
 		"Returns total size of data buffer (product of bin number in every dimension). \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAllSizes", _wrap_IntensityData_getAllSizes, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getAllSizes", _wrap_IntensityData_getAllSizes, METH_O, "\n"
 		"IntensityData_getAllSizes(IntensityData self) -> std::vector< size_t,std::allocator< size_t > >\n"
-		"\n"
 		"std::vector< size_t > OutputData< T >::getAllSizes() const\n"
 		"\n"
 		"Returns all sizes of its axes. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getRawDataVector", _wrap_IntensityData_getRawDataVector, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getRawDataVector", _wrap_IntensityData_getRawDataVector, METH_O, "\n"
 		"IntensityData_getRawDataVector(IntensityData self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< T > OutputData< T >::getRawDataVector() const\n"
 		"\n"
 		"Returns copy of raw data vector. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_totalSum", _wrap_IntensityData_totalSum, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_totalSum", _wrap_IntensityData_totalSum, METH_O, "\n"
 		"IntensityData_totalSum(IntensityData self) -> double\n"
-		"\n"
 		"T OutputData< T >::totalSum() const\n"
 		"\n"
 		"Returns sum of all values in the data structure. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_begin", _wrap_IntensityData_begin, METH_VARARGS, (char *)"\n"
-		"begin() -> OutputData< double >::iterator\n"
+	 { "IntensityData_begin", _wrap_IntensityData_begin, METH_VARARGS, "\n"
+		"IntensityData_begin(IntensityData self) -> OutputData< double >::iterator\n"
 		"IntensityData_begin(IntensityData self) -> OutputData< double >::const_iterator\n"
-		"\n"
 		"const_iterator OutputData< T >::begin() const\n"
 		"\n"
 		"Returns read-only iterator that points to the first element. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_end", _wrap_IntensityData_end, METH_VARARGS, (char *)"\n"
-		"end() -> OutputData< double >::iterator\n"
+	 { "IntensityData_end", _wrap_IntensityData_end, METH_VARARGS, "\n"
+		"IntensityData_end(IntensityData self) -> OutputData< double >::iterator\n"
 		"IntensityData_end(IntensityData self) -> OutputData< double >::const_iterator\n"
-		"\n"
 		"const_iterator OutputData< T >::end() const\n"
 		"\n"
 		"Returns read-only iterator that points to the one past last element. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxesBinIndices", _wrap_IntensityData_getAxesBinIndices, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getAxesBinIndices", _wrap_IntensityData_getAxesBinIndices, METH_VARARGS, "\n"
 		"IntensityData_getAxesBinIndices(IntensityData self, size_t global_index) -> vector_integer_t\n"
-		"\n"
 		"std::vector< int > OutputData< T >::getAxesBinIndices(size_t global_index) const\n"
 		"\n"
 		"Returns vector of axes indices for given global index\n"
@@ -137591,10 +133580,9 @@ static PyMethodDef SwigMethods[] = {
 		"Vector of bin indices for all axes defined \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxisBinIndex", _wrap_IntensityData_getAxisBinIndex, METH_VARARGS, (char *)"\n"
-		"getAxisBinIndex(size_t global_index, size_t i_selected_axis) -> size_t\n"
+	 { "IntensityData_getAxisBinIndex", _wrap_IntensityData_getAxisBinIndex, METH_VARARGS, "\n"
+		"IntensityData_getAxisBinIndex(IntensityData self, size_t global_index, size_t i_selected_axis) -> size_t\n"
 		"IntensityData_getAxisBinIndex(IntensityData self, size_t global_index, std::string const & axis_name) -> size_t\n"
-		"\n"
 		"size_t OutputData< T >::getAxisBinIndex(size_t global_index, const std::string &axis_name) const\n"
 		"\n"
 		"Returns axis bin index for given global index\n"
@@ -137611,9 +133599,8 @@ static PyMethodDef SwigMethods[] = {
 		"Corresponding bin index for selected axis \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_toGlobalIndex", _wrap_IntensityData_toGlobalIndex, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_toGlobalIndex", _wrap_IntensityData_toGlobalIndex, METH_VARARGS, "\n"
 		"IntensityData_toGlobalIndex(IntensityData self, std::vector< unsigned int,std::allocator< unsigned int > > const & axes_indices) -> size_t\n"
-		"\n"
 		"size_t OutputData< T >::toGlobalIndex(const std::vector< unsigned > &axes_indices) const\n"
 		"\n"
 		"Returns global index for specified indices of axes\n"
@@ -137627,9 +133614,8 @@ static PyMethodDef SwigMethods[] = {
 		"Corresponding global index \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_findGlobalIndex", _wrap_IntensityData_findGlobalIndex, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_findGlobalIndex", _wrap_IntensityData_findGlobalIndex, METH_VARARGS, "\n"
 		"IntensityData_findGlobalIndex(IntensityData self, vdouble1d_t coordinates) -> size_t\n"
-		"\n"
 		"size_t OutputData< T >::findGlobalIndex(const std::vector< double > &coordinates) const\n"
 		"\n"
 		"Returns global index for specified axes values\n"
@@ -137643,10 +133629,9 @@ static PyMethodDef SwigMethods[] = {
 		"Closest global index \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxisValue", _wrap_IntensityData_getAxisValue, METH_VARARGS, (char *)"\n"
-		"getAxisValue(size_t global_index, size_t i_selected_axis) -> double\n"
+	 { "IntensityData_getAxisValue", _wrap_IntensityData_getAxisValue, METH_VARARGS, "\n"
+		"IntensityData_getAxisValue(IntensityData self, size_t global_index, size_t i_selected_axis) -> double\n"
 		"IntensityData_getAxisValue(IntensityData self, size_t global_index, std::string const & axis_name) -> double\n"
-		"\n"
 		"double OutputData< T >::getAxisValue(size_t global_index, const std::string &axis_name) const\n"
 		"\n"
 		"Returns the value of selected axis for given global_index.\n"
@@ -137663,9 +133648,8 @@ static PyMethodDef SwigMethods[] = {
 		"corresponding bin center of selected axis \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxesValues", _wrap_IntensityData_getAxesValues, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getAxesValues", _wrap_IntensityData_getAxesValues, METH_VARARGS, "\n"
 		"IntensityData_getAxesValues(IntensityData self, size_t global_index) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > OutputData< T >::getAxesValues(size_t global_index) const\n"
 		"\n"
 		"Returns values on all defined axes for given globalbin number\n"
@@ -137679,10 +133663,9 @@ static PyMethodDef SwigMethods[] = {
 		"Vector of corresponding bin centers \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getAxisBin", _wrap_IntensityData_getAxisBin, METH_VARARGS, (char *)"\n"
-		"getAxisBin(size_t global_index, size_t i_selected_axis) -> Bin1D\n"
+	 { "IntensityData_getAxisBin", _wrap_IntensityData_getAxisBin, METH_VARARGS, "\n"
+		"IntensityData_getAxisBin(IntensityData self, size_t global_index, size_t i_selected_axis) -> Bin1D\n"
 		"IntensityData_getAxisBin(IntensityData self, size_t global_index, std::string const & axis_name) -> Bin1D\n"
-		"\n"
 		"Bin1D OutputData< T >::getAxisBin(size_t global_index, const std::string &axis_name) const\n"
 		"\n"
 		"Returns bin of selected axis for given global_index.\n"
@@ -137699,230 +133682,201 @@ static PyMethodDef SwigMethods[] = {
 		"Corresponding  Bin1D object \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_clear", _wrap_IntensityData_clear, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_clear", _wrap_IntensityData_clear, METH_O, "\n"
 		"IntensityData_clear(IntensityData self)\n"
-		"\n"
 		"void OutputData< T >::clear()\n"
 		"\n"
 		"Sets object into initial state (no dimensions, data) \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_setAllTo", _wrap_IntensityData_setAllTo, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_setAllTo", _wrap_IntensityData_setAllTo, METH_VARARGS, "\n"
 		"IntensityData_setAllTo(IntensityData self, double const & value)\n"
-		"\n"
 		"void OutputData< T >::setAllTo(const T &value)\n"
 		"\n"
 		"Sets content of output data to specific value. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_scaleAll", _wrap_IntensityData_scaleAll, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_scaleAll", _wrap_IntensityData_scaleAll, METH_VARARGS, "\n"
 		"IntensityData_scaleAll(IntensityData self, double const & factor)\n"
-		"\n"
 		"void OutputData< T >::scaleAll(const T &factor)\n"
 		"\n"
 		"multiply every item of this output data by value \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_setAxisSizes", _wrap_IntensityData_setAxisSizes, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_setAxisSizes", _wrap_IntensityData_setAxisSizes, METH_VARARGS, "\n"
 		"IntensityData_setAxisSizes(IntensityData self, size_t rank, int * n_dims)\n"
-		"\n"
 		"void OutputData< T >::setAxisSizes(size_t rank, int *n_dims)\n"
 		"\n"
 		"Adds 'rank' axes with indicated sizes. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_setRawDataVector", _wrap_IntensityData_setRawDataVector, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_setRawDataVector", _wrap_IntensityData_setRawDataVector, METH_VARARGS, "\n"
 		"IntensityData_setRawDataVector(IntensityData self, vdouble1d_t data_vector)\n"
-		"\n"
 		"void OutputData< T >::setRawDataVector(const std::vector< T > &data_vector)\n"
 		"\n"
 		"Sets new values to raw data vector. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_setRawDataArray", _wrap_IntensityData_setRawDataArray, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_setRawDataArray", _wrap_IntensityData_setRawDataArray, METH_VARARGS, "\n"
 		"IntensityData_setRawDataArray(IntensityData self, double const * source)\n"
-		"\n"
 		"void OutputData< T >::setRawDataArray(const T *source)\n"
 		"\n"
 		"Sets new values to raw data array. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData___iadd__", _wrap_IntensityData___iadd__, METH_VARARGS, (char *)"IntensityData___iadd__(IntensityData self, IntensityData right) -> IntensityData"},
-	 { (char *)"IntensityData___isub__", _wrap_IntensityData___isub__, METH_VARARGS, (char *)"IntensityData___isub__(IntensityData self, IntensityData right) -> IntensityData"},
-	 { (char *)"IntensityData___itruediv__", _wrap_IntensityData___itruediv__, METH_VARARGS, (char *)"IntensityData___itruediv__(IntensityData self, IntensityData right) -> IntensityData"},
-	 { (char *)"IntensityData___imul__", _wrap_IntensityData___imul__, METH_VARARGS, (char *)"IntensityData___imul__(IntensityData self, IntensityData right) -> IntensityData"},
-	 { (char *)"IntensityData_getValue", _wrap_IntensityData_getValue, METH_VARARGS, (char *)"\n"
+	 { "IntensityData___iadd__", _wrap_IntensityData___iadd__, METH_VARARGS, "IntensityData___iadd__(IntensityData self, IntensityData right) -> IntensityData"},
+	 { "IntensityData___isub__", _wrap_IntensityData___isub__, METH_VARARGS, "IntensityData___isub__(IntensityData self, IntensityData right) -> IntensityData"},
+	 { "IntensityData___itruediv__", _wrap_IntensityData___itruediv__, METH_VARARGS, "IntensityData___itruediv__(IntensityData self, IntensityData right) -> IntensityData"},
+	 { "IntensityData___imul__", _wrap_IntensityData___imul__, METH_VARARGS, "IntensityData___imul__(IntensityData self, IntensityData right) -> IntensityData"},
+	 { "IntensityData_getValue", _wrap_IntensityData_getValue, METH_VARARGS, "\n"
 		"IntensityData_getValue(IntensityData self, size_t index) -> double\n"
-		"\n"
 		"double OutputData< T >::getValue(size_t index) const\n"
 		"\n"
 		"Returns value or summed value, depending on T. \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_getArray", _wrap_IntensityData_getArray, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_getArray", _wrap_IntensityData_getArray, METH_O, "\n"
 		"IntensityData_getArray(IntensityData self) -> PyObject *\n"
-		"\n"
 		"PyObject* OutputData< T >::getArray() const\n"
 		"\n"
 		"returns data as Python numpy array \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_isInitialized", _wrap_IntensityData_isInitialized, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_isInitialized", _wrap_IntensityData_isInitialized, METH_O, "\n"
 		"IntensityData_isInitialized(IntensityData self) -> bool\n"
-		"\n"
 		"bool OutputData< T >::isInitialized() const\n"
 		"\n"
 		"returns true if object is correctly initialized \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData_allocate", _wrap_IntensityData_allocate, METH_VARARGS, (char *)"\n"
+	 { "IntensityData_allocate", _wrap_IntensityData_allocate, METH_O, "\n"
 		"IntensityData_allocate(IntensityData self)\n"
-		"\n"
 		"void OutputData< T >::allocate()\n"
 		"\n"
 		"memory allocation for current dimensions configuration \n"
 		"\n"
 		""},
-	 { (char *)"IntensityData___getitem__", _wrap_IntensityData___getitem__, METH_VARARGS, (char *)"IntensityData___getitem__(IntensityData self, unsigned int i) -> double"},
-	 { (char *)"IntensityData___setitem__", _wrap_IntensityData___setitem__, METH_VARARGS, (char *)"IntensityData___setitem__(IntensityData self, unsigned int i, double value) -> double"},
-	 { (char *)"IntensityData_swigregister", IntensityData_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParameterDistribution", _wrap_new_ParameterDistribution, METH_VARARGS, (char *)"\n"
-		"ParameterDistribution(std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits)\n"
-		"ParameterDistribution(std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0)\n"
-		"ParameterDistribution(std::string const & par_name, IDistribution1D distribution, size_t nbr_samples)\n"
+	 { "IntensityData___getitem__", _wrap_IntensityData___getitem__, METH_VARARGS, "IntensityData___getitem__(IntensityData self, unsigned int i) -> double"},
+	 { "IntensityData___setitem__", _wrap_IntensityData___setitem__, METH_VARARGS, "IntensityData___setitem__(IntensityData self, unsigned int i, double value) -> double"},
+	 { "IntensityData_swigregister", IntensityData_swigregister, METH_O, NULL},
+	 { "IntensityData_swiginit", IntensityData_swiginit, METH_VARARGS, NULL},
+	 { "new_ParameterDistribution", _wrap_new_ParameterDistribution, METH_VARARGS, "\n"
+		"ParameterDistribution(std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double sigma_factor=0.0, RealLimits limits=RealLimits())\n"
 		"ParameterDistribution(std::string const & par_name, IDistribution1D distribution, size_t nbr_samples, double xmin, double xmax)\n"
 		"new_ParameterDistribution(ParameterDistribution other) -> ParameterDistribution\n"
-		"\n"
 		"ParameterDistribution::ParameterDistribution(const ParameterDistribution &other)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ParameterDistribution", _wrap_delete_ParameterDistribution, METH_VARARGS, (char *)"\n"
+	 { "delete_ParameterDistribution", _wrap_delete_ParameterDistribution, METH_O, "\n"
 		"delete_ParameterDistribution(ParameterDistribution self)\n"
-		"\n"
 		"ParameterDistribution::~ParameterDistribution()\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_linkParameter", _wrap_ParameterDistribution_linkParameter, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_linkParameter", _wrap_ParameterDistribution_linkParameter, METH_VARARGS, "\n"
 		"ParameterDistribution_linkParameter(ParameterDistribution self, std::string par_name) -> ParameterDistribution\n"
-		"\n"
 		"ParameterDistribution & ParameterDistribution::linkParameter(std::string par_name)\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getMainParameterName", _wrap_ParameterDistribution_getMainParameterName, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getMainParameterName", _wrap_ParameterDistribution_getMainParameterName, METH_O, "\n"
 		"ParameterDistribution_getMainParameterName(ParameterDistribution self) -> std::string\n"
-		"\n"
 		"std::string ParameterDistribution::getMainParameterName() const\n"
 		"\n"
 		"get the main parameter's name \n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getNbrSamples", _wrap_ParameterDistribution_getNbrSamples, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getNbrSamples", _wrap_ParameterDistribution_getNbrSamples, METH_O, "\n"
 		"ParameterDistribution_getNbrSamples(ParameterDistribution self) -> size_t\n"
-		"\n"
 		"size_t ParameterDistribution::getNbrSamples() const\n"
 		"\n"
 		"get number of samples for this distribution \n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getSigmaFactor", _wrap_ParameterDistribution_getSigmaFactor, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getSigmaFactor", _wrap_ParameterDistribution_getSigmaFactor, METH_O, "\n"
 		"ParameterDistribution_getSigmaFactor(ParameterDistribution self) -> double\n"
-		"\n"
 		"double ParameterDistribution::getSigmaFactor() const\n"
 		"\n"
 		"get the sigma factor \n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getDistribution", _wrap_ParameterDistribution_getDistribution, METH_VARARGS, (char *)"\n"
-		"getDistribution() -> IDistribution1D\n"
+	 { "ParameterDistribution_getDistribution", _wrap_ParameterDistribution_getDistribution, METH_VARARGS, "\n"
+		"ParameterDistribution_getDistribution(ParameterDistribution self) -> IDistribution1D\n"
 		"ParameterDistribution_getDistribution(ParameterDistribution self) -> IDistribution1D\n"
-		"\n"
 		"IDistribution1D* ParameterDistribution::getDistribution()\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_generateSamples", _wrap_ParameterDistribution_generateSamples, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_generateSamples", _wrap_ParameterDistribution_generateSamples, METH_O, "\n"
 		"ParameterDistribution_generateSamples(ParameterDistribution self) -> ParameterSampleVector\n"
-		"\n"
 		"std::vector< ParameterSample > ParameterDistribution::generateSamples() const\n"
 		"\n"
 		"generate list of sampled values with their weight \n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getLinkedParameterNames", _wrap_ParameterDistribution_getLinkedParameterNames, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getLinkedParameterNames", _wrap_ParameterDistribution_getLinkedParameterNames, METH_O, "\n"
 		"ParameterDistribution_getLinkedParameterNames(ParameterDistribution self) -> vector_string_t\n"
-		"\n"
 		"std::vector<std::string> ParameterDistribution::getLinkedParameterNames() const\n"
 		"\n"
 		"get list of linked parameter names \n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getLimits", _wrap_ParameterDistribution_getLimits, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getLimits", _wrap_ParameterDistribution_getLimits, METH_O, "\n"
 		"ParameterDistribution_getLimits(ParameterDistribution self) -> RealLimits\n"
-		"\n"
 		"RealLimits ParameterDistribution::getLimits() const\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getMinValue", _wrap_ParameterDistribution_getMinValue, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getMinValue", _wrap_ParameterDistribution_getMinValue, METH_O, "\n"
 		"ParameterDistribution_getMinValue(ParameterDistribution self) -> double\n"
-		"\n"
 		"double ParameterDistribution::getMinValue() const\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_getMaxValue", _wrap_ParameterDistribution_getMaxValue, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_getMaxValue", _wrap_ParameterDistribution_getMaxValue, METH_O, "\n"
 		"ParameterDistribution_getMaxValue(ParameterDistribution self) -> double\n"
-		"\n"
 		"double ParameterDistribution::getMaxValue() const\n"
 		"\n"
 		""},
-	 { (char *)"ParameterDistribution_swigregister", ParameterDistribution_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParameterPool", _wrap_new_ParameterPool, METH_VARARGS, (char *)"\n"
+	 { "ParameterDistribution_swigregister", ParameterDistribution_swigregister, METH_O, NULL},
+	 { "ParameterDistribution_swiginit", ParameterDistribution_swiginit, METH_VARARGS, NULL},
+	 { "new_ParameterPool", _wrap_new_ParameterPool, METH_NOARGS, "\n"
 		"new_ParameterPool() -> ParameterPool\n"
-		"\n"
 		"ParameterPool::ParameterPool()\n"
 		"\n"
 		"Constructs an empty parameter pool. \n"
 		"\n"
 		""},
-	 { (char *)"delete_ParameterPool", _wrap_delete_ParameterPool, METH_VARARGS, (char *)"\n"
+	 { "delete_ParameterPool", _wrap_delete_ParameterPool, METH_O, "\n"
 		"delete_ParameterPool(ParameterPool self)\n"
-		"\n"
 		"ParameterPool::~ParameterPool()\n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_clone", _wrap_ParameterPool_clone, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_clone", _wrap_ParameterPool_clone, METH_O, "\n"
 		"ParameterPool_clone(ParameterPool self) -> ParameterPool\n"
-		"\n"
 		"ParameterPool * ParameterPool::clone() const\n"
 		"\n"
 		"Returns a literal clone. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_copyToExternalPool", _wrap_ParameterPool_copyToExternalPool, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_copyToExternalPool", _wrap_ParameterPool_copyToExternalPool, METH_VARARGS, "\n"
 		"ParameterPool_copyToExternalPool(ParameterPool self, std::string const & prefix, ParameterPool other_pool)\n"
-		"\n"
 		"void ParameterPool::copyToExternalPool(const std::string &prefix, ParameterPool *other_pool) const\n"
 		"\n"
 		"Copies parameters of given pool to  other pool, prepeding  prefix to the parameter names. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_clear", _wrap_ParameterPool_clear, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_clear", _wrap_ParameterPool_clear, METH_O, "\n"
 		"ParameterPool_clear(ParameterPool self)\n"
-		"\n"
 		"void ParameterPool::clear()\n"
 		"\n"
 		"Clears the parameter map. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_size", _wrap_ParameterPool_size, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_size", _wrap_ParameterPool_size, METH_O, "\n"
 		"ParameterPool_size(ParameterPool self) -> size_t\n"
-		"\n"
 		"size_t ParameterPool::size() const\n"
 		"\n"
 		"Returns number of parameters in the pool. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_addParameter", _wrap_ParameterPool_addParameter, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_addParameter", _wrap_ParameterPool_addParameter, METH_VARARGS, "\n"
 		"ParameterPool_addParameter(ParameterPool self, RealParameter newPar) -> RealParameter\n"
-		"\n"
 		"RealParameter & ParameterPool::addParameter(RealParameter *newPar)\n"
 		"\n"
 		"Adds parameter to the pool, and returns reference to the input pointer.\n"
@@ -137930,406 +133884,365 @@ static PyMethodDef SwigMethods[] = {
 		"Returning the input pointer allows us to concatenate function calls like pool->addParameter( new RealParameter(...) ).setLimits(-1,+1).setFixed().setUnit(\"nm\") \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_parameter", _wrap_ParameterPool_parameter, METH_VARARGS, (char *)"\n"
-		"parameter(std::string const & name) -> RealParameter\n"
+	 { "ParameterPool_parameter", _wrap_ParameterPool_parameter, METH_VARARGS, "\n"
+		"ParameterPool_parameter(ParameterPool self, std::string const & name) -> RealParameter\n"
 		"ParameterPool_parameter(ParameterPool self, std::string const & name) -> RealParameter\n"
-		"\n"
 		"const RealParameter * ParameterPool::parameter(const std::string &name) const\n"
 		"\n"
 		"Returns parameter with given  name. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_parameters", _wrap_ParameterPool_parameters, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_parameters", _wrap_ParameterPool_parameters, METH_O, "\n"
 		"ParameterPool_parameters(ParameterPool self) -> std::vector< RealParameter *,std::allocator< RealParameter * > > const\n"
-		"\n"
 		"const std::vector<RealParameter*> ParameterPool::parameters() const\n"
 		"\n"
 		"Returns full vector of parameters. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_getMatchedParameters", _wrap_ParameterPool_getMatchedParameters, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_getMatchedParameters", _wrap_ParameterPool_getMatchedParameters, METH_VARARGS, "\n"
 		"ParameterPool_getMatchedParameters(ParameterPool self, std::string const & pattern) -> std::vector< RealParameter *,std::allocator< RealParameter * > >\n"
-		"\n"
 		"std::vector< RealParameter * > ParameterPool::getMatchedParameters(const std::string &pattern) const\n"
 		"\n"
 		"Returns nonempty vector of parameters that match the  pattern ('*' allowed), or throws. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_getUniqueMatch", _wrap_ParameterPool_getUniqueMatch, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_getUniqueMatch", _wrap_ParameterPool_getUniqueMatch, METH_VARARGS, "\n"
 		"ParameterPool_getUniqueMatch(ParameterPool self, std::string const & pattern) -> RealParameter\n"
-		"\n"
 		"RealParameter * ParameterPool::getUniqueMatch(const std::string &pattern) const\n"
 		"\n"
 		"Returns the one parameter that matches the  pattern (wildcards '*' allowed), or throws. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_setParameterValue", _wrap_ParameterPool_setParameterValue, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_setParameterValue", _wrap_ParameterPool_setParameterValue, METH_VARARGS, "\n"
 		"ParameterPool_setParameterValue(ParameterPool self, std::string const & name, double value)\n"
-		"\n"
 		"void ParameterPool::setParameterValue(const std::string &name, double value)\n"
 		"\n"
 		"Sets parameter value. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_setMatchedParametersValue", _wrap_ParameterPool_setMatchedParametersValue, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_setMatchedParametersValue", _wrap_ParameterPool_setMatchedParametersValue, METH_VARARGS, "\n"
 		"ParameterPool_setMatchedParametersValue(ParameterPool self, std::string const & wildcards, double value) -> int\n"
-		"\n"
 		"int ParameterPool::setMatchedParametersValue(const std::string &wildcards, double value)\n"
 		"\n"
 		"Sets value of the nonzero parameters that match  pattern ('*' allowed), or throws. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_setUniqueMatchValue", _wrap_ParameterPool_setUniqueMatchValue, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_setUniqueMatchValue", _wrap_ParameterPool_setUniqueMatchValue, METH_VARARGS, "\n"
 		"ParameterPool_setUniqueMatchValue(ParameterPool self, std::string const & pattern, double value)\n"
-		"\n"
 		"void ParameterPool::setUniqueMatchValue(const std::string &pattern, double value)\n"
 		"\n"
 		"Sets value of the one parameter that matches  pattern ('*' allowed), or throws. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_parameterNames", _wrap_ParameterPool_parameterNames, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_parameterNames", _wrap_ParameterPool_parameterNames, METH_O, "\n"
 		"ParameterPool_parameterNames(ParameterPool self) -> vector_string_t\n"
-		"\n"
 		"std::vector< std::string > ParameterPool::parameterNames() const\n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool_removeParameter", _wrap_ParameterPool_removeParameter, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool_removeParameter", _wrap_ParameterPool_removeParameter, METH_VARARGS, "\n"
 		"ParameterPool_removeParameter(ParameterPool self, std::string const & name)\n"
-		"\n"
 		"void ParameterPool::removeParameter(const std::string &name)\n"
 		"\n"
 		"Removes parameter with given name from the pool. \n"
 		"\n"
 		""},
-	 { (char *)"ParameterPool___getitem__", _wrap_ParameterPool___getitem__, METH_VARARGS, (char *)"ParameterPool___getitem__(ParameterPool self, size_t index) -> RealParameter"},
-	 { (char *)"ParameterPool_swigregister", ParameterPool_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParameterSample", _wrap_new_ParameterSample, METH_VARARGS, (char *)"\n"
+	 { "ParameterPool___getitem__", _wrap_ParameterPool___getitem__, METH_VARARGS, "ParameterPool___getitem__(ParameterPool self, size_t index) -> RealParameter"},
+	 { "ParameterPool_swigregister", ParameterPool_swigregister, METH_O, NULL},
+	 { "ParameterPool_swiginit", ParameterPool_swiginit, METH_VARARGS, NULL},
+	 { "new_ParameterSample", _wrap_new_ParameterSample, METH_VARARGS, "\n"
 		"ParameterSample(double _value=0., double _weight=1.)\n"
-		"ParameterSample(double _value=0.)\n"
-		"new_ParameterSample() -> ParameterSample\n"
-		"\n"
 		"ParameterSample::ParameterSample(double _value=0., double _weight=1.)\n"
 		"\n"
 		""},
-	 { (char *)"ParameterSample_value_set", _wrap_ParameterSample_value_set, METH_VARARGS, (char *)"ParameterSample_value_set(ParameterSample self, double value)"},
-	 { (char *)"ParameterSample_value_get", _wrap_ParameterSample_value_get, METH_VARARGS, (char *)"ParameterSample_value_get(ParameterSample self) -> double"},
-	 { (char *)"ParameterSample_weight_set", _wrap_ParameterSample_weight_set, METH_VARARGS, (char *)"ParameterSample_weight_set(ParameterSample self, double weight)"},
-	 { (char *)"ParameterSample_weight_get", _wrap_ParameterSample_weight_get, METH_VARARGS, (char *)"ParameterSample_weight_get(ParameterSample self) -> double"},
-	 { (char *)"delete_ParameterSample", _wrap_delete_ParameterSample, METH_VARARGS, (char *)"delete_ParameterSample(ParameterSample self)"},
-	 { (char *)"ParameterSample_swigregister", ParameterSample_swigregister, METH_VARARGS, NULL},
-	 { (char *)"ParameterSampleVector_iterator", _wrap_ParameterSampleVector_iterator, METH_VARARGS, (char *)"ParameterSampleVector_iterator(ParameterSampleVector self) -> SwigPyIterator"},
-	 { (char *)"ParameterSampleVector___nonzero__", _wrap_ParameterSampleVector___nonzero__, METH_VARARGS, (char *)"ParameterSampleVector___nonzero__(ParameterSampleVector self) -> bool"},
-	 { (char *)"ParameterSampleVector___bool__", _wrap_ParameterSampleVector___bool__, METH_VARARGS, (char *)"ParameterSampleVector___bool__(ParameterSampleVector self) -> bool"},
-	 { (char *)"ParameterSampleVector___len__", _wrap_ParameterSampleVector___len__, METH_VARARGS, (char *)"ParameterSampleVector___len__(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
-	 { (char *)"ParameterSampleVector___getslice__", _wrap_ParameterSampleVector___getslice__, METH_VARARGS, (char *)"ParameterSampleVector___getslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j) -> ParameterSampleVector"},
-	 { (char *)"ParameterSampleVector___setslice__", _wrap_ParameterSampleVector___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)\n"
+	 { "ParameterSample_value_set", _wrap_ParameterSample_value_set, METH_VARARGS, "ParameterSample_value_set(ParameterSample self, double value)"},
+	 { "ParameterSample_value_get", _wrap_ParameterSample_value_get, METH_O, "ParameterSample_value_get(ParameterSample self) -> double"},
+	 { "ParameterSample_weight_set", _wrap_ParameterSample_weight_set, METH_VARARGS, "ParameterSample_weight_set(ParameterSample self, double weight)"},
+	 { "ParameterSample_weight_get", _wrap_ParameterSample_weight_get, METH_O, "ParameterSample_weight_get(ParameterSample self) -> double"},
+	 { "delete_ParameterSample", _wrap_delete_ParameterSample, METH_O, "delete_ParameterSample(ParameterSample self)"},
+	 { "ParameterSample_swigregister", ParameterSample_swigregister, METH_O, NULL},
+	 { "ParameterSample_swiginit", ParameterSample_swiginit, METH_VARARGS, NULL},
+	 { "ParameterSampleVector_iterator", _wrap_ParameterSampleVector_iterator, METH_O, "ParameterSampleVector_iterator(ParameterSampleVector self) -> SwigPyIterator"},
+	 { "ParameterSampleVector___nonzero__", _wrap_ParameterSampleVector___nonzero__, METH_O, "ParameterSampleVector___nonzero__(ParameterSampleVector self) -> bool"},
+	 { "ParameterSampleVector___bool__", _wrap_ParameterSampleVector___bool__, METH_O, "ParameterSampleVector___bool__(ParameterSampleVector self) -> bool"},
+	 { "ParameterSampleVector___len__", _wrap_ParameterSampleVector___len__, METH_O, "ParameterSampleVector___len__(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
+	 { "ParameterSampleVector___getslice__", _wrap_ParameterSampleVector___getslice__, METH_VARARGS, "ParameterSampleVector___getslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j) -> ParameterSampleVector"},
+	 { "ParameterSampleVector___setslice__", _wrap_ParameterSampleVector___setslice__, METH_VARARGS, "\n"
+		"ParameterSampleVector___setslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)\n"
 		"ParameterSampleVector___setslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j, ParameterSampleVector v)\n"
 		""},
-	 { (char *)"ParameterSampleVector___delslice__", _wrap_ParameterSampleVector___delslice__, METH_VARARGS, (char *)"ParameterSampleVector___delslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)"},
-	 { (char *)"ParameterSampleVector___delitem__", _wrap_ParameterSampleVector___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< ParameterSample >::difference_type i)\n"
+	 { "ParameterSampleVector___delslice__", _wrap_ParameterSampleVector___delslice__, METH_VARARGS, "ParameterSampleVector___delslice__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, std::vector< ParameterSample >::difference_type j)"},
+	 { "ParameterSampleVector___delitem__", _wrap_ParameterSampleVector___delitem__, METH_VARARGS, "\n"
+		"ParameterSampleVector___delitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i)\n"
 		"ParameterSampleVector___delitem__(ParameterSampleVector self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"ParameterSampleVector___getitem__", _wrap_ParameterSampleVector___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> ParameterSampleVector\n"
+	 { "ParameterSampleVector___getitem__", _wrap_ParameterSampleVector___getitem__, METH_VARARGS, "\n"
+		"ParameterSampleVector___getitem__(ParameterSampleVector self, PySliceObject * slice) -> ParameterSampleVector\n"
 		"ParameterSampleVector___getitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i) -> ParameterSample\n"
 		""},
-	 { (char *)"ParameterSampleVector___setitem__", _wrap_ParameterSampleVector___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, ParameterSampleVector v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "ParameterSampleVector___setitem__", _wrap_ParameterSampleVector___setitem__, METH_VARARGS, "\n"
+		"ParameterSampleVector___setitem__(ParameterSampleVector self, PySliceObject * slice, ParameterSampleVector v)\n"
+		"ParameterSampleVector___setitem__(ParameterSampleVector self, PySliceObject * slice)\n"
 		"ParameterSampleVector___setitem__(ParameterSampleVector self, std::vector< ParameterSample >::difference_type i, ParameterSample x)\n"
 		""},
-	 { (char *)"ParameterSampleVector_pop", _wrap_ParameterSampleVector_pop, METH_VARARGS, (char *)"ParameterSampleVector_pop(ParameterSampleVector self) -> ParameterSample"},
-	 { (char *)"ParameterSampleVector_append", _wrap_ParameterSampleVector_append, METH_VARARGS, (char *)"ParameterSampleVector_append(ParameterSampleVector self, ParameterSample x)"},
-	 { (char *)"ParameterSampleVector_empty", _wrap_ParameterSampleVector_empty, METH_VARARGS, (char *)"ParameterSampleVector_empty(ParameterSampleVector self) -> bool"},
-	 { (char *)"ParameterSampleVector_size", _wrap_ParameterSampleVector_size, METH_VARARGS, (char *)"ParameterSampleVector_size(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
-	 { (char *)"ParameterSampleVector_swap", _wrap_ParameterSampleVector_swap, METH_VARARGS, (char *)"\n"
+	 { "ParameterSampleVector_pop", _wrap_ParameterSampleVector_pop, METH_O, "ParameterSampleVector_pop(ParameterSampleVector self) -> ParameterSample"},
+	 { "ParameterSampleVector_append", _wrap_ParameterSampleVector_append, METH_VARARGS, "ParameterSampleVector_append(ParameterSampleVector self, ParameterSample x)"},
+	 { "ParameterSampleVector_empty", _wrap_ParameterSampleVector_empty, METH_O, "ParameterSampleVector_empty(ParameterSampleVector self) -> bool"},
+	 { "ParameterSampleVector_size", _wrap_ParameterSampleVector_size, METH_O, "ParameterSampleVector_size(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
+	 { "ParameterSampleVector_swap", _wrap_ParameterSampleVector_swap, METH_VARARGS, "\n"
 		"ParameterSampleVector_swap(ParameterSampleVector self, ParameterSampleVector v)\n"
-		"\n"
 		"void swap(OutputDataIterator< TValue, TContainer > &left, OutputDataIterator< TValue, TContainer > &right)\n"
 		"\n"
 		"make Swappable \n"
 		"\n"
 		""},
-	 { (char *)"ParameterSampleVector_begin", _wrap_ParameterSampleVector_begin, METH_VARARGS, (char *)"ParameterSampleVector_begin(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"},
-	 { (char *)"ParameterSampleVector_end", _wrap_ParameterSampleVector_end, METH_VARARGS, (char *)"ParameterSampleVector_end(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"},
-	 { (char *)"ParameterSampleVector_rbegin", _wrap_ParameterSampleVector_rbegin, METH_VARARGS, (char *)"ParameterSampleVector_rbegin(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"},
-	 { (char *)"ParameterSampleVector_rend", _wrap_ParameterSampleVector_rend, METH_VARARGS, (char *)"ParameterSampleVector_rend(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"},
-	 { (char *)"ParameterSampleVector_clear", _wrap_ParameterSampleVector_clear, METH_VARARGS, (char *)"ParameterSampleVector_clear(ParameterSampleVector self)"},
-	 { (char *)"ParameterSampleVector_get_allocator", _wrap_ParameterSampleVector_get_allocator, METH_VARARGS, (char *)"ParameterSampleVector_get_allocator(ParameterSampleVector self) -> std::vector< ParameterSample >::allocator_type"},
-	 { (char *)"ParameterSampleVector_pop_back", _wrap_ParameterSampleVector_pop_back, METH_VARARGS, (char *)"ParameterSampleVector_pop_back(ParameterSampleVector self)"},
-	 { (char *)"ParameterSampleVector_erase", _wrap_ParameterSampleVector_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< ParameterSample >::iterator pos) -> std::vector< ParameterSample >::iterator\n"
+	 { "ParameterSampleVector_begin", _wrap_ParameterSampleVector_begin, METH_O, "ParameterSampleVector_begin(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"},
+	 { "ParameterSampleVector_end", _wrap_ParameterSampleVector_end, METH_O, "ParameterSampleVector_end(ParameterSampleVector self) -> std::vector< ParameterSample >::iterator"},
+	 { "ParameterSampleVector_rbegin", _wrap_ParameterSampleVector_rbegin, METH_O, "ParameterSampleVector_rbegin(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"},
+	 { "ParameterSampleVector_rend", _wrap_ParameterSampleVector_rend, METH_O, "ParameterSampleVector_rend(ParameterSampleVector self) -> std::vector< ParameterSample >::reverse_iterator"},
+	 { "ParameterSampleVector_clear", _wrap_ParameterSampleVector_clear, METH_O, "ParameterSampleVector_clear(ParameterSampleVector self)"},
+	 { "ParameterSampleVector_get_allocator", _wrap_ParameterSampleVector_get_allocator, METH_O, "ParameterSampleVector_get_allocator(ParameterSampleVector self) -> std::vector< ParameterSample >::allocator_type"},
+	 { "ParameterSampleVector_pop_back", _wrap_ParameterSampleVector_pop_back, METH_O, "ParameterSampleVector_pop_back(ParameterSampleVector self)"},
+	 { "ParameterSampleVector_erase", _wrap_ParameterSampleVector_erase, METH_VARARGS, "\n"
+		"ParameterSampleVector_erase(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos) -> std::vector< ParameterSample >::iterator\n"
 		"ParameterSampleVector_erase(ParameterSampleVector self, std::vector< ParameterSample >::iterator first, std::vector< ParameterSample >::iterator last) -> std::vector< ParameterSample >::iterator\n"
 		""},
-	 { (char *)"new_ParameterSampleVector", _wrap_new_ParameterSampleVector, METH_VARARGS, (char *)"\n"
+	 { "new_ParameterSampleVector", _wrap_new_ParameterSampleVector, METH_VARARGS, "\n"
 		"ParameterSampleVector()\n"
-		"ParameterSampleVector(ParameterSampleVector arg2)\n"
+		"ParameterSampleVector(ParameterSampleVector other)\n"
 		"ParameterSampleVector(std::vector< ParameterSample >::size_type size)\n"
 		"new_ParameterSampleVector(std::vector< ParameterSample >::size_type size, ParameterSample value) -> ParameterSampleVector\n"
 		""},
-	 { (char *)"ParameterSampleVector_push_back", _wrap_ParameterSampleVector_push_back, METH_VARARGS, (char *)"ParameterSampleVector_push_back(ParameterSampleVector self, ParameterSample x)"},
-	 { (char *)"ParameterSampleVector_front", _wrap_ParameterSampleVector_front, METH_VARARGS, (char *)"ParameterSampleVector_front(ParameterSampleVector self) -> ParameterSample"},
-	 { (char *)"ParameterSampleVector_back", _wrap_ParameterSampleVector_back, METH_VARARGS, (char *)"ParameterSampleVector_back(ParameterSampleVector self) -> ParameterSample"},
-	 { (char *)"ParameterSampleVector_assign", _wrap_ParameterSampleVector_assign, METH_VARARGS, (char *)"ParameterSampleVector_assign(ParameterSampleVector self, std::vector< ParameterSample >::size_type n, ParameterSample x)"},
-	 { (char *)"ParameterSampleVector_resize", _wrap_ParameterSampleVector_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< ParameterSample >::size_type new_size)\n"
+	 { "ParameterSampleVector_push_back", _wrap_ParameterSampleVector_push_back, METH_VARARGS, "ParameterSampleVector_push_back(ParameterSampleVector self, ParameterSample x)"},
+	 { "ParameterSampleVector_front", _wrap_ParameterSampleVector_front, METH_O, "ParameterSampleVector_front(ParameterSampleVector self) -> ParameterSample"},
+	 { "ParameterSampleVector_back", _wrap_ParameterSampleVector_back, METH_O, "ParameterSampleVector_back(ParameterSampleVector self) -> ParameterSample"},
+	 { "ParameterSampleVector_assign", _wrap_ParameterSampleVector_assign, METH_VARARGS, "ParameterSampleVector_assign(ParameterSampleVector self, std::vector< ParameterSample >::size_type n, ParameterSample x)"},
+	 { "ParameterSampleVector_resize", _wrap_ParameterSampleVector_resize, METH_VARARGS, "\n"
+		"ParameterSampleVector_resize(ParameterSampleVector self, std::vector< ParameterSample >::size_type new_size)\n"
 		"ParameterSampleVector_resize(ParameterSampleVector self, std::vector< ParameterSample >::size_type new_size, ParameterSample x)\n"
 		""},
-	 { (char *)"ParameterSampleVector_insert", _wrap_ParameterSampleVector_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< ParameterSample >::iterator pos, ParameterSample x) -> std::vector< ParameterSample >::iterator\n"
+	 { "ParameterSampleVector_insert", _wrap_ParameterSampleVector_insert, METH_VARARGS, "\n"
+		"ParameterSampleVector_insert(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos, ParameterSample x) -> std::vector< ParameterSample >::iterator\n"
 		"ParameterSampleVector_insert(ParameterSampleVector self, std::vector< ParameterSample >::iterator pos, std::vector< ParameterSample >::size_type n, ParameterSample x)\n"
 		""},
-	 { (char *)"ParameterSampleVector_reserve", _wrap_ParameterSampleVector_reserve, METH_VARARGS, (char *)"ParameterSampleVector_reserve(ParameterSampleVector self, std::vector< ParameterSample >::size_type n)"},
-	 { (char *)"ParameterSampleVector_capacity", _wrap_ParameterSampleVector_capacity, METH_VARARGS, (char *)"ParameterSampleVector_capacity(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
-	 { (char *)"delete_ParameterSampleVector", _wrap_delete_ParameterSampleVector, METH_VARARGS, (char *)"delete_ParameterSampleVector(ParameterSampleVector self)"},
-	 { (char *)"ParameterSampleVector_swigregister", ParameterSampleVector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Particle", _wrap_new_Particle, METH_VARARGS, (char *)"\n"
+	 { "ParameterSampleVector_reserve", _wrap_ParameterSampleVector_reserve, METH_VARARGS, "ParameterSampleVector_reserve(ParameterSampleVector self, std::vector< ParameterSample >::size_type n)"},
+	 { "ParameterSampleVector_capacity", _wrap_ParameterSampleVector_capacity, METH_O, "ParameterSampleVector_capacity(ParameterSampleVector self) -> std::vector< ParameterSample >::size_type"},
+	 { "delete_ParameterSampleVector", _wrap_delete_ParameterSampleVector, METH_O, "delete_ParameterSampleVector(ParameterSampleVector self)"},
+	 { "ParameterSampleVector_swigregister", ParameterSampleVector_swigregister, METH_O, NULL},
+	 { "ParameterSampleVector_swiginit", ParameterSampleVector_swiginit, METH_VARARGS, NULL},
+	 { "new_Particle", _wrap_new_Particle, METH_VARARGS, "\n"
 		"Particle()\n"
 		"Particle(Material material)\n"
 		"Particle(Material material, IFormFactor form_factor)\n"
 		"new_Particle(Material material, IFormFactor form_factor, IRotation rotation) -> Particle\n"
-		"\n"
 		"Particle::Particle(Material material, const IFormFactor &form_factor, const IRotation &rotation)\n"
 		"\n"
 		""},
-	 { (char *)"Particle_clone", _wrap_Particle_clone, METH_VARARGS, (char *)"\n"
+	 { "Particle_clone", _wrap_Particle_clone, METH_O, "\n"
 		"Particle_clone(Particle self) -> Particle\n"
-		"\n"
 		"Particle * Particle::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"Particle_accept", _wrap_Particle_accept, METH_VARARGS, (char *)"\n"
+	 { "Particle_accept", _wrap_Particle_accept, METH_VARARGS, "\n"
 		"Particle_accept(Particle self, INodeVisitor visitor)\n"
-		"\n"
 		"void Particle::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"Particle_createSlicedParticle", _wrap_Particle_createSlicedParticle, METH_VARARGS, (char *)"\n"
+	 { "Particle_createSlicedParticle", _wrap_Particle_createSlicedParticle, METH_VARARGS, "\n"
 		"Particle_createSlicedParticle(Particle self, ZLimits limits) -> SlicedParticle\n"
-		"\n"
 		"SlicedParticle Particle::createSlicedParticle(ZLimits limits) const override final\n"
 		"\n"
 		"Create a sliced form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"Particle_setMaterial", _wrap_Particle_setMaterial, METH_VARARGS, (char *)"\n"
+	 { "Particle_setMaterial", _wrap_Particle_setMaterial, METH_VARARGS, "\n"
 		"Particle_setMaterial(Particle self, Material material)\n"
-		"\n"
 		"void Particle::setMaterial(Material material)\n"
 		"\n"
 		""},
-	 { (char *)"Particle_material", _wrap_Particle_material, METH_VARARGS, (char *)"\n"
+	 { "Particle_material", _wrap_Particle_material, METH_O, "\n"
 		"Particle_material(Particle self) -> Material\n"
-		"\n"
 		"const Material* Particle::material() const override final\n"
 		"\n"
 		"Returns nullptr, unless overwritten to return a specific material. \n"
 		"\n"
 		""},
-	 { (char *)"Particle_setFormFactor", _wrap_Particle_setFormFactor, METH_VARARGS, (char *)"\n"
+	 { "Particle_setFormFactor", _wrap_Particle_setFormFactor, METH_VARARGS, "\n"
 		"Particle_setFormFactor(Particle self, IFormFactor form_factor)\n"
-		"\n"
 		"void Particle::setFormFactor(const IFormFactor &form_factor)\n"
 		"\n"
 		""},
-	 { (char *)"Particle_getChildren", _wrap_Particle_getChildren, METH_VARARGS, (char *)"\n"
+	 { "Particle_getChildren", _wrap_Particle_getChildren, METH_O, "\n"
 		"Particle_getChildren(Particle self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > Particle::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"delete_Particle", _wrap_delete_Particle, METH_VARARGS, (char *)"delete_Particle(Particle self)"},
-	 { (char *)"Particle_swigregister", Particle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParticleComposition", _wrap_new_ParticleComposition, METH_VARARGS, (char *)"\n"
+	 { "delete_Particle", _wrap_delete_Particle, METH_O, "delete_Particle(Particle self)"},
+	 { "Particle_swigregister", Particle_swigregister, METH_O, NULL},
+	 { "Particle_swiginit", Particle_swiginit, METH_VARARGS, NULL},
+	 { "new_ParticleComposition", _wrap_new_ParticleComposition, METH_VARARGS, "\n"
 		"ParticleComposition()\n"
 		"new_ParticleComposition(IParticle particle, vector_kvector_t positions) -> ParticleComposition\n"
-		"\n"
 		"ParticleComposition::ParticleComposition(const IParticle &particle, std::vector< kvector_t > positions)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ParticleComposition", _wrap_delete_ParticleComposition, METH_VARARGS, (char *)"\n"
+	 { "delete_ParticleComposition", _wrap_delete_ParticleComposition, METH_O, "\n"
 		"delete_ParticleComposition(ParticleComposition self)\n"
-		"\n"
 		"ParticleComposition::~ParticleComposition()\n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_clone", _wrap_ParticleComposition_clone, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_clone", _wrap_ParticleComposition_clone, METH_O, "\n"
 		"ParticleComposition_clone(ParticleComposition self) -> ParticleComposition\n"
-		"\n"
 		"ParticleComposition * ParticleComposition::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_accept", _wrap_ParticleComposition_accept, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_accept", _wrap_ParticleComposition_accept, METH_VARARGS, "\n"
 		"ParticleComposition_accept(ParticleComposition self, INodeVisitor visitor)\n"
-		"\n"
 		"void ParticleComposition::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_createFormFactor", _wrap_ParticleComposition_createFormFactor, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_createFormFactor", _wrap_ParticleComposition_createFormFactor, METH_O, "\n"
 		"ParticleComposition_createFormFactor(ParticleComposition self) -> IFormFactor\n"
-		"\n"
 		"IFormFactor * ParticleComposition::createFormFactor() const override final\n"
 		"\n"
 		"Create a form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_addParticle", _wrap_ParticleComposition_addParticle, METH_VARARGS, (char *)"\n"
-		"addParticle(IParticle particle)\n"
+	 { "ParticleComposition_addParticle", _wrap_ParticleComposition_addParticle, METH_VARARGS, "\n"
+		"ParticleComposition_addParticle(ParticleComposition self, IParticle particle)\n"
 		"ParticleComposition_addParticle(ParticleComposition self, IParticle particle, kvector_t position)\n"
-		"\n"
 		"void ParticleComposition::addParticle(const IParticle &particle, kvector_t position)\n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_addParticles", _wrap_ParticleComposition_addParticles, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_addParticles", _wrap_ParticleComposition_addParticles, METH_VARARGS, "\n"
 		"ParticleComposition_addParticles(ParticleComposition self, IParticle particle, vector_kvector_t positions)\n"
-		"\n"
 		"void ParticleComposition::addParticles(const IParticle &particle, std::vector< kvector_t > positions)\n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_nbrParticles", _wrap_ParticleComposition_nbrParticles, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_nbrParticles", _wrap_ParticleComposition_nbrParticles, METH_O, "\n"
 		"ParticleComposition_nbrParticles(ParticleComposition self) -> size_t\n"
-		"\n"
 		"size_t ParticleComposition::nbrParticles() const\n"
 		"\n"
 		"Returns number of different particles. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_getChildren", _wrap_ParticleComposition_getChildren, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_getChildren", _wrap_ParticleComposition_getChildren, METH_O, "\n"
 		"ParticleComposition_getChildren(ParticleComposition self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > ParticleComposition::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_decompose", _wrap_ParticleComposition_decompose, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_decompose", _wrap_ParticleComposition_decompose, METH_O, "\n"
 		"ParticleComposition_decompose(ParticleComposition self) -> SafePointerVector< IParticle >\n"
-		"\n"
 		"SafePointerVector< IParticle > ParticleComposition::decompose() const override final\n"
 		"\n"
 		"Decompose in constituent  IParticle objects. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_bottomTopZ", _wrap_ParticleComposition_bottomTopZ, METH_VARARGS, (char *)"\n"
+	 { "ParticleComposition_bottomTopZ", _wrap_ParticleComposition_bottomTopZ, METH_O, "\n"
 		"ParticleComposition_bottomTopZ(ParticleComposition self) -> ParticleLimits\n"
-		"\n"
 		"ParticleLimits ParticleComposition::bottomTopZ() const override final\n"
 		"\n"
 		"Top and bottom z-coordinate. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleComposition_swigregister", ParticleComposition_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParticleCoreShell", _wrap_new_ParticleCoreShell, METH_VARARGS, (char *)"\n"
-		"ParticleCoreShell(Particle shell, Particle core, kvector_t relative_core_position)\n"
-		"new_ParticleCoreShell(Particle shell, Particle core) -> ParticleCoreShell\n"
-		"\n"
+	 { "ParticleComposition_swigregister", ParticleComposition_swigregister, METH_O, NULL},
+	 { "ParticleComposition_swiginit", ParticleComposition_swiginit, METH_VARARGS, NULL},
+	 { "new_ParticleCoreShell", _wrap_new_ParticleCoreShell, METH_VARARGS, "\n"
+		"ParticleCoreShell(Particle shell, Particle core, kvector_t relative_core_position=kvector_t(0.0, 0.0, 0.0))\n"
 		"ParticleCoreShell::ParticleCoreShell(const Particle &shell, const Particle &core, kvector_t relative_core_position=kvector_t(0.0, 0.0, 0.0))\n"
 		"\n"
 		""},
-	 { (char *)"delete_ParticleCoreShell", _wrap_delete_ParticleCoreShell, METH_VARARGS, (char *)"\n"
+	 { "delete_ParticleCoreShell", _wrap_delete_ParticleCoreShell, METH_O, "\n"
 		"delete_ParticleCoreShell(ParticleCoreShell self)\n"
-		"\n"
 		"ParticleCoreShell::~ParticleCoreShell()\n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_clone", _wrap_ParticleCoreShell_clone, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_clone", _wrap_ParticleCoreShell_clone, METH_O, "\n"
 		"ParticleCoreShell_clone(ParticleCoreShell self) -> ParticleCoreShell\n"
-		"\n"
 		"ParticleCoreShell * ParticleCoreShell::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_accept", _wrap_ParticleCoreShell_accept, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_accept", _wrap_ParticleCoreShell_accept, METH_VARARGS, "\n"
 		"ParticleCoreShell_accept(ParticleCoreShell self, INodeVisitor visitor)\n"
-		"\n"
 		"void ParticleCoreShell::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_createSlicedParticle", _wrap_ParticleCoreShell_createSlicedParticle, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_createSlicedParticle", _wrap_ParticleCoreShell_createSlicedParticle, METH_VARARGS, "\n"
 		"ParticleCoreShell_createSlicedParticle(ParticleCoreShell self, ZLimits limits) -> SlicedParticle\n"
-		"\n"
 		"SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const override final\n"
 		"\n"
 		"Create a sliced form factor for this particle. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_coreParticle", _wrap_ParticleCoreShell_coreParticle, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_coreParticle", _wrap_ParticleCoreShell_coreParticle, METH_O, "\n"
 		"ParticleCoreShell_coreParticle(ParticleCoreShell self) -> Particle\n"
-		"\n"
 		"const Particle * ParticleCoreShell::coreParticle() const\n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_shellParticle", _wrap_ParticleCoreShell_shellParticle, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_shellParticle", _wrap_ParticleCoreShell_shellParticle, METH_O, "\n"
 		"ParticleCoreShell_shellParticle(ParticleCoreShell self) -> Particle\n"
-		"\n"
 		"const Particle * ParticleCoreShell::shellParticle() const\n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_getChildren", _wrap_ParticleCoreShell_getChildren, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_getChildren", _wrap_ParticleCoreShell_getChildren, METH_O, "\n"
 		"ParticleCoreShell_getChildren(ParticleCoreShell self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > ParticleCoreShell::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"ParticleCoreShell_swigregister", ParticleCoreShell_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParticleDistribution", _wrap_new_ParticleDistribution, METH_VARARGS, (char *)"\n"
+	 { "ParticleCoreShell_swigregister", ParticleCoreShell_swigregister, METH_O, NULL},
+	 { "ParticleCoreShell_swiginit", ParticleCoreShell_swiginit, METH_VARARGS, NULL},
+	 { "new_ParticleDistribution", _wrap_new_ParticleDistribution, METH_VARARGS, "\n"
 		"new_ParticleDistribution(IParticle prototype, ParameterDistribution par_distr) -> ParticleDistribution\n"
-		"\n"
 		"ParticleDistribution::ParticleDistribution(const IParticle &prototype, const ParameterDistribution &par_distr)\n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_clone", _wrap_ParticleDistribution_clone, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_clone", _wrap_ParticleDistribution_clone, METH_O, "\n"
 		"ParticleDistribution_clone(ParticleDistribution self) -> ParticleDistribution\n"
-		"\n"
 		"ParticleDistribution * ParticleDistribution::clone() const override final\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_accept", _wrap_ParticleDistribution_accept, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_accept", _wrap_ParticleDistribution_accept, METH_VARARGS, "\n"
 		"ParticleDistribution_accept(ParticleDistribution self, INodeVisitor visitor)\n"
-		"\n"
 		"void ParticleDistribution::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_translate", _wrap_ParticleDistribution_translate, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_translate", _wrap_ParticleDistribution_translate, METH_VARARGS, "\n"
 		"ParticleDistribution_translate(ParticleDistribution self, kvector_t translation)\n"
-		"\n"
 		"void ParticleDistribution::translate(kvector_t translation) override final\n"
 		"\n"
 		"Translates the particle with the given vector. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_rotate", _wrap_ParticleDistribution_rotate, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_rotate", _wrap_ParticleDistribution_rotate, METH_VARARGS, "\n"
 		"ParticleDistribution_rotate(ParticleDistribution self, IRotation rotation)\n"
-		"\n"
 		"void ParticleDistribution::rotate(const IRotation &rotation) override final\n"
 		"\n"
 		"Applies the given rotation to the particle. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_generateParticles", _wrap_ParticleDistribution_generateParticles, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_generateParticles", _wrap_ParticleDistribution_generateParticles, METH_O, "\n"
 		"ParticleDistribution_generateParticles(ParticleDistribution self) -> SafePointerVector< IParticle >\n"
-		"\n"
 		"SafePointerVector< IParticle > ParticleDistribution::generateParticles() const\n"
 		"\n"
 		"Returns list of new particles generated according to a distribution.\n"
@@ -138337,68 +134250,57 @@ static PyMethodDef SwigMethods[] = {
 		"Returns particle clones with parameter values drawn from distribution. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_prototype", _wrap_ParticleDistribution_prototype, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_prototype", _wrap_ParticleDistribution_prototype, METH_O, "\n"
 		"ParticleDistribution_prototype(ParticleDistribution self) -> IParticle\n"
-		"\n"
 		"const IParticle& ParticleDistribution::prototype() const\n"
 		"\n"
 		"Returns the prototype particle, used for generating multiple ones. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_parameterDistribution", _wrap_ParticleDistribution_parameterDistribution, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_parameterDistribution", _wrap_ParticleDistribution_parameterDistribution, METH_O, "\n"
 		"ParticleDistribution_parameterDistribution(ParticleDistribution self) -> ParameterDistribution\n"
-		"\n"
 		"ParameterDistribution ParticleDistribution::parameterDistribution() const\n"
 		"\n"
 		"Returns the distributed parameter data. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleDistribution_getChildren", _wrap_ParticleDistribution_getChildren, METH_VARARGS, (char *)"\n"
+	 { "ParticleDistribution_getChildren", _wrap_ParticleDistribution_getChildren, METH_O, "\n"
 		"ParticleDistribution_getChildren(ParticleDistribution self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > ParticleDistribution::getChildren() const override final\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"delete_ParticleDistribution", _wrap_delete_ParticleDistribution, METH_VARARGS, (char *)"delete_ParticleDistribution(ParticleDistribution self)"},
-	 { (char *)"ParticleDistribution_swigregister", ParticleDistribution_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ParticleLayout", _wrap_new_ParticleLayout, METH_VARARGS, (char *)"\n"
+	 { "delete_ParticleDistribution", _wrap_delete_ParticleDistribution, METH_O, "delete_ParticleDistribution(ParticleDistribution self)"},
+	 { "ParticleDistribution_swigregister", ParticleDistribution_swigregister, METH_O, NULL},
+	 { "ParticleDistribution_swiginit", ParticleDistribution_swiginit, METH_VARARGS, NULL},
+	 { "new_ParticleLayout", _wrap_new_ParticleLayout, METH_VARARGS, "\n"
 		"ParticleLayout()\n"
 		"ParticleLayout(IAbstractParticle particle, double abundance=-1.0)\n"
-		"new_ParticleLayout(IAbstractParticle particle) -> ParticleLayout\n"
-		"\n"
 		"ParticleLayout::ParticleLayout(const IAbstractParticle &particle, double abundance=-1.0)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ParticleLayout", _wrap_delete_ParticleLayout, METH_VARARGS, (char *)"\n"
+	 { "delete_ParticleLayout", _wrap_delete_ParticleLayout, METH_O, "\n"
 		"delete_ParticleLayout(ParticleLayout self)\n"
-		"\n"
 		"ParticleLayout::~ParticleLayout() override\n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_clone", _wrap_ParticleLayout_clone, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_clone", _wrap_ParticleLayout_clone, METH_O, "\n"
 		"ParticleLayout_clone(ParticleLayout self) -> ParticleLayout\n"
-		"\n"
 		"ParticleLayout * ParticleLayout::clone() const final override\n"
 		"\n"
 		"Returns a clone of this  ISample object. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_accept", _wrap_ParticleLayout_accept, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_accept", _wrap_ParticleLayout_accept, METH_VARARGS, "\n"
 		"ParticleLayout_accept(ParticleLayout self, INodeVisitor visitor)\n"
-		"\n"
 		"void ParticleLayout::accept(INodeVisitor *visitor) const final override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_addParticle", _wrap_ParticleLayout_addParticle, METH_VARARGS, (char *)"\n"
-		"addParticle(IAbstractParticle particle, double abundance=-1.0, kvector_t position, IRotation rotation)\n"
-		"addParticle(IAbstractParticle particle, double abundance=-1.0, kvector_t position)\n"
-		"addParticle(IAbstractParticle particle, double abundance=-1.0)\n"
-		"ParticleLayout_addParticle(ParticleLayout self, IAbstractParticle particle)\n"
-		"\n"
+	 { "ParticleLayout_addParticle", _wrap_ParticleLayout_addParticle, METH_VARARGS, "\n"
+		"ParticleLayout_addParticle(ParticleLayout self, IAbstractParticle particle, double abundance=-1.0, kvector_t position=kvector_t(), IRotation rotation=IdentityRotation())\n"
 		"void ParticleLayout::addParticle(const IAbstractParticle &particle, double abundance=-1.0, const kvector_t position=kvector_t(), const IRotation &rotation=IdentityRotation())\n"
 		"\n"
 		"Adds particle to the layout with abundance, position and the rotation defined.\n"
@@ -138419,49 +134321,43 @@ static PyMethodDef SwigMethods[] = {
 		" Particle rotation \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_particles", _wrap_ParticleLayout_particles, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_particles", _wrap_ParticleLayout_particles, METH_O, "\n"
 		"ParticleLayout_particles(ParticleLayout self) -> SafePointerVector< IParticle >\n"
-		"\n"
 		"SafePointerVector< IParticle > ParticleLayout::particles() const final override\n"
 		"\n"
 		"Returns information on all particles (type and abundance) and generates new particles if an  IAbstractParticle denotes a collection \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_interferenceFunction", _wrap_ParticleLayout_interferenceFunction, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_interferenceFunction", _wrap_ParticleLayout_interferenceFunction, METH_O, "\n"
 		"ParticleLayout_interferenceFunction(ParticleLayout self) -> IInterferenceFunction\n"
-		"\n"
 		"const IInterferenceFunction * ParticleLayout::interferenceFunction() const final override\n"
 		"\n"
 		"Returns the interference function. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_getTotalAbundance", _wrap_ParticleLayout_getTotalAbundance, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_getTotalAbundance", _wrap_ParticleLayout_getTotalAbundance, METH_O, "\n"
 		"ParticleLayout_getTotalAbundance(ParticleLayout self) -> double\n"
-		"\n"
 		"double ParticleLayout::getTotalAbundance() const final override\n"
 		"\n"
 		"Get total abundance of all particles. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_setInterferenceFunction", _wrap_ParticleLayout_setInterferenceFunction, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_setInterferenceFunction", _wrap_ParticleLayout_setInterferenceFunction, METH_VARARGS, "\n"
 		"ParticleLayout_setInterferenceFunction(ParticleLayout self, IInterferenceFunction interference_function)\n"
-		"\n"
 		"void ParticleLayout::setInterferenceFunction(const IInterferenceFunction &interference_function)\n"
 		"\n"
 		"Adds interference functions. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_totalParticleSurfaceDensity", _wrap_ParticleLayout_totalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_totalParticleSurfaceDensity", _wrap_ParticleLayout_totalParticleSurfaceDensity, METH_O, "\n"
 		"ParticleLayout_totalParticleSurfaceDensity(ParticleLayout self) -> double\n"
-		"\n"
 		"double ParticleLayout::totalParticleSurfaceDensity() const final override\n"
 		"\n"
 		"Returns surface density of all particles. \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_setTotalParticleSurfaceDensity", _wrap_ParticleLayout_setTotalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_setTotalParticleSurfaceDensity", _wrap_ParticleLayout_setTotalParticleSurfaceDensity, METH_VARARGS, "\n"
 		"ParticleLayout_setTotalParticleSurfaceDensity(ParticleLayout self, double particle_density)\n"
-		"\n"
 		"void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) final override\n"
 		"\n"
 		"Sets total particle surface density.\n"
@@ -138473,299 +134369,258 @@ static PyMethodDef SwigMethods[] = {
 		"number of particles per square nanometer \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_getChildren", _wrap_ParticleLayout_getChildren, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_getChildren", _wrap_ParticleLayout_getChildren, METH_O, "\n"
 		"ParticleLayout_getChildren(ParticleLayout self) -> swig_dummy_type_const_inode_vector\n"
-		"\n"
 		"std::vector< const INode * > ParticleLayout::getChildren() const final override\n"
 		"\n"
 		"Returns a vector of children (const). \n"
 		"\n"
 		""},
-	 { (char *)"ParticleLayout_swigregister", ParticleLayout_swigregister, METH_VARARGS, NULL},
-	 { (char *)"importArrayToOutputData", _wrap_importArrayToOutputData, METH_VARARGS, (char *)"\n"
+	 { "ParticleLayout_swigregister", ParticleLayout_swigregister, METH_O, NULL},
+	 { "ParticleLayout_swiginit", ParticleLayout_swiginit, METH_VARARGS, NULL},
+	 { "importArrayToOutputData", _wrap_importArrayToOutputData, METH_VARARGS, "\n"
 		"importArrayToOutputData(vdouble1d_t vec) -> IntensityData\n"
 		"importArrayToOutputData(vdouble2d_t vec) -> IntensityData\n"
-		"\n"
 		"OutputData< double > * PyArrayImport::importArrayToOutputData(const std::vector< std::vector< double >> &vec)\n"
 		"\n"
 		"for importing 2D array of doubles from python into  OutputData\n"
 		"\n"
 		""},
-	 { (char *)"new_PoissonNoiseBackground", _wrap_new_PoissonNoiseBackground, METH_VARARGS, (char *)"\n"
+	 { "new_PoissonNoiseBackground", _wrap_new_PoissonNoiseBackground, METH_NOARGS, "\n"
 		"new_PoissonNoiseBackground() -> PoissonNoiseBackground\n"
-		"\n"
 		"PoissonNoiseBackground::PoissonNoiseBackground()\n"
 		"\n"
 		""},
-	 { (char *)"delete_PoissonNoiseBackground", _wrap_delete_PoissonNoiseBackground, METH_VARARGS, (char *)"\n"
+	 { "delete_PoissonNoiseBackground", _wrap_delete_PoissonNoiseBackground, METH_O, "\n"
 		"delete_PoissonNoiseBackground(PoissonNoiseBackground self)\n"
-		"\n"
 		"PoissonNoiseBackground::~PoissonNoiseBackground()\n"
 		"\n"
 		""},
-	 { (char *)"PoissonNoiseBackground_clone", _wrap_PoissonNoiseBackground_clone, METH_VARARGS, (char *)"\n"
+	 { "PoissonNoiseBackground_clone", _wrap_PoissonNoiseBackground_clone, METH_O, "\n"
 		"PoissonNoiseBackground_clone(PoissonNoiseBackground self) -> PoissonNoiseBackground\n"
-		"\n"
 		"PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final\n"
 		"\n"
 		""},
-	 { (char *)"PoissonNoiseBackground_accept", _wrap_PoissonNoiseBackground_accept, METH_VARARGS, (char *)"\n"
+	 { "PoissonNoiseBackground_accept", _wrap_PoissonNoiseBackground_accept, METH_VARARGS, "\n"
 		"PoissonNoiseBackground_accept(PoissonNoiseBackground self, INodeVisitor visitor)\n"
-		"\n"
 		"void PoissonNoiseBackground::accept(INodeVisitor *visitor) const override\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"PoissonNoiseBackground_addBackGround", _wrap_PoissonNoiseBackground_addBackGround, METH_VARARGS, (char *)"\n"
+	 { "PoissonNoiseBackground_addBackGround", _wrap_PoissonNoiseBackground_addBackGround, METH_VARARGS, "\n"
 		"PoissonNoiseBackground_addBackGround(PoissonNoiseBackground self, double intensity) -> double\n"
-		"\n"
 		"double PoissonNoiseBackground::addBackGround(double intensity) const override final\n"
 		"\n"
 		""},
-	 { (char *)"PoissonNoiseBackground_swigregister", PoissonNoiseBackground_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Polygon", _wrap_new_Polygon, METH_VARARGS, (char *)"\n"
+	 { "PoissonNoiseBackground_swigregister", PoissonNoiseBackground_swigregister, METH_O, NULL},
+	 { "PoissonNoiseBackground_swiginit", PoissonNoiseBackground_swiginit, METH_VARARGS, NULL},
+	 { "new_Polygon", _wrap_new_Polygon, METH_VARARGS, "\n"
 		"Polygon(vdouble1d_t x, vdouble1d_t y)\n"
 		"Polygon(vdouble2d_t points)\n"
 		"new_Polygon(PolygonPrivate const * d) -> Polygon\n"
-		"\n"
 		"Polygon::Polygon(const PolygonPrivate *d)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Polygon", _wrap_delete_Polygon, METH_VARARGS, (char *)"\n"
+	 { "delete_Polygon", _wrap_delete_Polygon, METH_O, "\n"
 		"delete_Polygon(Polygon self)\n"
-		"\n"
 		"Polygon::~Polygon()\n"
 		"\n"
 		""},
-	 { (char *)"Polygon_clone", _wrap_Polygon_clone, METH_VARARGS, (char *)"\n"
+	 { "Polygon_clone", _wrap_Polygon_clone, METH_O, "\n"
 		"Polygon_clone(Polygon self) -> Polygon\n"
-		"\n"
 		"virtual Polygon* Polygon::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"Polygon_contains", _wrap_Polygon_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "Polygon_contains", _wrap_Polygon_contains, METH_VARARGS, "\n"
+		"Polygon_contains(Polygon self, double x, double y) -> bool\n"
 		"Polygon_contains(Polygon self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool Polygon::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"Polygon_getArea", _wrap_Polygon_getArea, METH_VARARGS, (char *)"\n"
+	 { "Polygon_getArea", _wrap_Polygon_getArea, METH_O, "\n"
 		"Polygon_getArea(Polygon self) -> double\n"
-		"\n"
 		"double Polygon::getArea() const\n"
 		"\n"
 		""},
-	 { (char *)"Polygon_getPoints", _wrap_Polygon_getPoints, METH_VARARGS, (char *)"\n"
+	 { "Polygon_getPoints", _wrap_Polygon_getPoints, METH_VARARGS, "\n"
 		"Polygon_getPoints(Polygon self, vdouble1d_t xpos, vdouble1d_t ypos)\n"
-		"\n"
 		"void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const\n"
 		"\n"
 		""},
-	 { (char *)"Polygon_swigregister", Polygon_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RangedDistributionGate", _wrap_new_RangedDistributionGate, METH_VARARGS, (char *)"\n"
+	 { "Polygon_swigregister", Polygon_swigregister, METH_O, NULL},
+	 { "Polygon_swiginit", Polygon_swiginit, METH_VARARGS, NULL},
+	 { "new_RangedDistributionGate", _wrap_new_RangedDistributionGate, METH_VARARGS, "\n"
 		"RangedDistributionGate()\n"
-		"RangedDistributionGate(size_t n_samples, double sigma_factor, RealLimits limits)\n"
-		"RangedDistributionGate(size_t n_samples, double sigma_factor)\n"
+		"RangedDistributionGate(size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless())\n"
 		"new_RangedDistributionGate(size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionGate\n"
-		"\n"
 		"RangedDistributionGate::RangedDistributionGate(size_t n_samples, double sigma_factor, double min, double max)\n"
 		"\n"
 		"Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). \n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionGate_clone", _wrap_RangedDistributionGate_clone, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionGate_clone", _wrap_RangedDistributionGate_clone, METH_O, "\n"
 		"RangedDistributionGate_clone(RangedDistributionGate self) -> RangedDistributionGate\n"
-		"\n"
 		"RangedDistributionGate * RangedDistributionGate::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RangedDistributionGate", _wrap_delete_RangedDistributionGate, METH_VARARGS, (char *)"\n"
+	 { "delete_RangedDistributionGate", _wrap_delete_RangedDistributionGate, METH_O, "\n"
 		"delete_RangedDistributionGate(RangedDistributionGate self)\n"
-		"\n"
 		"RangedDistributionGate::~RangedDistributionGate() override=default\n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionGate_swigregister", RangedDistributionGate_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RangedDistributionLorentz", _wrap_new_RangedDistributionLorentz, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionGate_swigregister", RangedDistributionGate_swigregister, METH_O, NULL},
+	 { "RangedDistributionGate_swiginit", RangedDistributionGate_swiginit, METH_VARARGS, NULL},
+	 { "new_RangedDistributionLorentz", _wrap_new_RangedDistributionLorentz, METH_VARARGS, "\n"
 		"RangedDistributionLorentz()\n"
-		"RangedDistributionLorentz(size_t n_samples, double hwhm_factor, RealLimits limits)\n"
-		"RangedDistributionLorentz(size_t n_samples, double hwhm_factor)\n"
+		"RangedDistributionLorentz(size_t n_samples, double hwhm_factor, RealLimits limits=RealLimits::limitless())\n"
 		"new_RangedDistributionLorentz(size_t n_samples, double hwhm_factor, double min, double max) -> RangedDistributionLorentz\n"
-		"\n"
 		"RangedDistributionLorentz::RangedDistributionLorentz(size_t n_samples, double hwhm_factor, double min, double max)\n"
 		"\n"
 		"Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  hwhm_factor = 2.0, while the limits are (-inf, +inf). \n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionLorentz_clone", _wrap_RangedDistributionLorentz_clone, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionLorentz_clone", _wrap_RangedDistributionLorentz_clone, METH_O, "\n"
 		"RangedDistributionLorentz_clone(RangedDistributionLorentz self) -> RangedDistributionLorentz\n"
-		"\n"
 		"RangedDistributionLorentz * RangedDistributionLorentz::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RangedDistributionLorentz", _wrap_delete_RangedDistributionLorentz, METH_VARARGS, (char *)"\n"
+	 { "delete_RangedDistributionLorentz", _wrap_delete_RangedDistributionLorentz, METH_O, "\n"
 		"delete_RangedDistributionLorentz(RangedDistributionLorentz self)\n"
-		"\n"
 		"RangedDistributionLorentz::~RangedDistributionLorentz() override=default\n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionLorentz_swigregister", RangedDistributionLorentz_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RangedDistributionGaussian", _wrap_new_RangedDistributionGaussian, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionLorentz_swigregister", RangedDistributionLorentz_swigregister, METH_O, NULL},
+	 { "RangedDistributionLorentz_swiginit", RangedDistributionLorentz_swiginit, METH_VARARGS, NULL},
+	 { "new_RangedDistributionGaussian", _wrap_new_RangedDistributionGaussian, METH_VARARGS, "\n"
 		"RangedDistributionGaussian()\n"
-		"RangedDistributionGaussian(size_t n_samples, double sigma_factor, RealLimits limits)\n"
-		"RangedDistributionGaussian(size_t n_samples, double sigma_factor)\n"
+		"RangedDistributionGaussian(size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless())\n"
 		"new_RangedDistributionGaussian(size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionGaussian\n"
-		"\n"
 		"RangedDistributionGaussian::RangedDistributionGaussian(size_t n_samples, double sigma_factor, double min, double max)\n"
 		"\n"
 		"Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). \n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionGaussian_clone", _wrap_RangedDistributionGaussian_clone, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionGaussian_clone", _wrap_RangedDistributionGaussian_clone, METH_O, "\n"
 		"RangedDistributionGaussian_clone(RangedDistributionGaussian self) -> RangedDistributionGaussian\n"
-		"\n"
 		"RangedDistributionGaussian * RangedDistributionGaussian::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RangedDistributionGaussian", _wrap_delete_RangedDistributionGaussian, METH_VARARGS, (char *)"\n"
+	 { "delete_RangedDistributionGaussian", _wrap_delete_RangedDistributionGaussian, METH_O, "\n"
 		"delete_RangedDistributionGaussian(RangedDistributionGaussian self)\n"
-		"\n"
 		"RangedDistributionGaussian::~RangedDistributionGaussian() override=default\n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionGaussian_swigregister", RangedDistributionGaussian_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RangedDistributionLogNormal", _wrap_new_RangedDistributionLogNormal, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionGaussian_swigregister", RangedDistributionGaussian_swigregister, METH_O, NULL},
+	 { "RangedDistributionGaussian_swiginit", RangedDistributionGaussian_swiginit, METH_VARARGS, NULL},
+	 { "new_RangedDistributionLogNormal", _wrap_new_RangedDistributionLogNormal, METH_VARARGS, "\n"
 		"RangedDistributionLogNormal()\n"
-		"RangedDistributionLogNormal(size_t n_samples, double sigma_factor, RealLimits limits)\n"
-		"RangedDistributionLogNormal(size_t n_samples, double sigma_factor)\n"
+		"RangedDistributionLogNormal(size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless())\n"
 		"new_RangedDistributionLogNormal(size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionLogNormal\n"
-		"\n"
 		"RangedDistributionLogNormal::RangedDistributionLogNormal(size_t n_samples, double sigma_factor, double min, double max)\n"
 		"\n"
 		"Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). \n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionLogNormal_clone", _wrap_RangedDistributionLogNormal_clone, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionLogNormal_clone", _wrap_RangedDistributionLogNormal_clone, METH_O, "\n"
 		"RangedDistributionLogNormal_clone(RangedDistributionLogNormal self) -> RangedDistributionLogNormal\n"
-		"\n"
 		"RangedDistributionLogNormal * RangedDistributionLogNormal::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RangedDistributionLogNormal", _wrap_delete_RangedDistributionLogNormal, METH_VARARGS, (char *)"\n"
+	 { "delete_RangedDistributionLogNormal", _wrap_delete_RangedDistributionLogNormal, METH_O, "\n"
 		"delete_RangedDistributionLogNormal(RangedDistributionLogNormal self)\n"
-		"\n"
 		"RangedDistributionLogNormal::~RangedDistributionLogNormal() override=default\n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionLogNormal_swigregister", RangedDistributionLogNormal_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RangedDistributionCosine", _wrap_new_RangedDistributionCosine, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionLogNormal_swigregister", RangedDistributionLogNormal_swigregister, METH_O, NULL},
+	 { "RangedDistributionLogNormal_swiginit", RangedDistributionLogNormal_swiginit, METH_VARARGS, NULL},
+	 { "new_RangedDistributionCosine", _wrap_new_RangedDistributionCosine, METH_VARARGS, "\n"
 		"RangedDistributionCosine()\n"
-		"RangedDistributionCosine(size_t n_samples, double sigma_factor, RealLimits limits)\n"
-		"RangedDistributionCosine(size_t n_samples, double sigma_factor)\n"
+		"RangedDistributionCosine(size_t n_samples, double sigma_factor, RealLimits limits=RealLimits::limitless())\n"
 		"new_RangedDistributionCosine(size_t n_samples, double sigma_factor, double min, double max) -> RangedDistributionCosine\n"
-		"\n"
 		"RangedDistributionCosine::RangedDistributionCosine(size_t n_samples, double sigma_factor, double min, double max)\n"
 		"\n"
 		"Initializes Ranged distribution with given number of samples, sigma factor (range in standard deviations to take into account during sample generation) and limits (either RealLimits object or just min and max limits). By default  n_samples = 5,  sigma_factor = 2.0, while the limits are (-inf, +inf). \n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionCosine_clone", _wrap_RangedDistributionCosine_clone, METH_VARARGS, (char *)"\n"
+	 { "RangedDistributionCosine_clone", _wrap_RangedDistributionCosine_clone, METH_O, "\n"
 		"RangedDistributionCosine_clone(RangedDistributionCosine self) -> RangedDistributionCosine\n"
-		"\n"
 		"RangedDistributionCosine * RangedDistributionCosine::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RangedDistributionCosine", _wrap_delete_RangedDistributionCosine, METH_VARARGS, (char *)"\n"
+	 { "delete_RangedDistributionCosine", _wrap_delete_RangedDistributionCosine, METH_O, "\n"
 		"delete_RangedDistributionCosine(RangedDistributionCosine self)\n"
-		"\n"
 		"RangedDistributionCosine::~RangedDistributionCosine() override=default\n"
 		"\n"
 		""},
-	 { (char *)"RangedDistributionCosine_swigregister", RangedDistributionCosine_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RealParameter", _wrap_new_RealParameter, METH_VARARGS, (char *)"\n"
-		"RealParameter(std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange, RealLimits limits, Attributes attr)\n"
-		"RealParameter(std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange, RealLimits limits)\n"
-		"RealParameter(std::string const & name, double * par, std::string const & parent_name, std::function< void () > const & onChange)\n"
-		"RealParameter(std::string const & name, double * par, std::string const & parent_name)\n"
-		"new_RealParameter(std::string const & name, double * par) -> RealParameter\n"
-		"\n"
+	 { "RangedDistributionCosine_swigregister", RangedDistributionCosine_swigregister, METH_O, NULL},
+	 { "RangedDistributionCosine_swiginit", RangedDistributionCosine_swiginit, METH_VARARGS, NULL},
+	 { "new_RealParameter", _wrap_new_RealParameter, METH_VARARGS, "\n"
+		"RealParameter(std::string const & name, double * par, std::string const & parent_name=std::string(), std::function< void () > const & onChange=std::function< void () >(), RealLimits limits=RealLimits::limitless(), Attributes attr=Attributes::free())\n"
 		"RealParameter::RealParameter(const std::string &name, double *par, const std::string &parent_name=std::string(), const std::function< void()> &onChange=std::function< void()>(), const RealLimits &limits=RealLimits::limitless(), const Attributes &attr=Attributes::free())\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_clone", _wrap_RealParameter_clone, METH_VARARGS, (char *)"\n"
-		"clone(std::string const & new_name) -> RealParameter\n"
-		"RealParameter_clone(RealParameter self) -> RealParameter\n"
-		"\n"
+	 { "RealParameter_clone", _wrap_RealParameter_clone, METH_VARARGS, "\n"
+		"RealParameter_clone(RealParameter self, std::string const & new_name=\"\") -> RealParameter\n"
 		"RealParameter * RealParameter::clone(const std::string &new_name=\"\") const\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setValue", _wrap_RealParameter_setValue, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setValue", _wrap_RealParameter_setValue, METH_VARARGS, "\n"
 		"RealParameter_setValue(RealParameter self, double value)\n"
-		"\n"
 		"void RealParameter::setValue(double value)\n"
 		"\n"
 		"Sets value of wrapped parameter and emit signal. \n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_value", _wrap_RealParameter_value, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_value", _wrap_RealParameter_value, METH_O, "\n"
 		"RealParameter_value(RealParameter self) -> double\n"
-		"\n"
 		"double RealParameter::value() const\n"
 		"\n"
 		"Returns value of wrapped parameter. \n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setLimits", _wrap_RealParameter_setLimits, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setLimits", _wrap_RealParameter_setLimits, METH_VARARGS, "\n"
 		"RealParameter_setLimits(RealParameter self, RealLimits limits) -> RealParameter\n"
-		"\n"
 		"RealParameter & RealParameter::setLimits(const RealLimits &limits)\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_limits", _wrap_RealParameter_limits, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_limits", _wrap_RealParameter_limits, METH_O, "\n"
 		"RealParameter_limits(RealParameter self) -> RealLimits\n"
-		"\n"
 		"RealLimits RealParameter::limits() const\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setLimited", _wrap_RealParameter_setLimited, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setLimited", _wrap_RealParameter_setLimited, METH_VARARGS, "\n"
 		"RealParameter_setLimited(RealParameter self, double lower, double upper) -> RealParameter\n"
-		"\n"
 		"RealParameter & RealParameter::setLimited(double lower, double upper)\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setPositive", _wrap_RealParameter_setPositive, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setPositive", _wrap_RealParameter_setPositive, METH_O, "\n"
 		"RealParameter_setPositive(RealParameter self) -> RealParameter\n"
-		"\n"
 		"RealParameter & RealParameter::setPositive()\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setNonnegative", _wrap_RealParameter_setNonnegative, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setNonnegative", _wrap_RealParameter_setNonnegative, METH_O, "\n"
 		"RealParameter_setNonnegative(RealParameter self) -> RealParameter\n"
-		"\n"
 		"RealParameter & RealParameter::setNonnegative()\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_setUnit", _wrap_RealParameter_setUnit, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_setUnit", _wrap_RealParameter_setUnit, METH_VARARGS, "\n"
 		"RealParameter_setUnit(RealParameter self, std::string const & name) -> RealParameter\n"
-		"\n"
 		"RealParameter & RealParameter::setUnit(const std::string &name)\n"
 		"\n"
 		""},
-	 { (char *)"RealParameter_unit", _wrap_RealParameter_unit, METH_VARARGS, (char *)"\n"
+	 { "RealParameter_unit", _wrap_RealParameter_unit, METH_O, "\n"
 		"RealParameter_unit(RealParameter self) -> std::string\n"
-		"\n"
 		"std::string RealParameter::unit() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_RealParameter", _wrap_delete_RealParameter, METH_VARARGS, (char *)"delete_RealParameter(RealParameter self)"},
-	 { (char *)"RealParameter_swigregister", RealParameter_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Rectangle", _wrap_new_Rectangle, METH_VARARGS, (char *)"\n"
+	 { "delete_RealParameter", _wrap_delete_RealParameter, METH_O, "delete_RealParameter(RealParameter self)"},
+	 { "RealParameter_swigregister", RealParameter_swigregister, METH_O, NULL},
+	 { "RealParameter_swiginit", RealParameter_swiginit, METH_VARARGS, NULL},
+	 { "new_Rectangle", _wrap_new_Rectangle, METH_VARARGS, "\n"
 		"new_Rectangle(double xlow, double ylow, double xup, double yup) -> Rectangle\n"
-		"\n"
 		"Rectangle::Rectangle(double xlow, double ylow, double xup, double yup)\n"
 		"\n"
 		"Parameters:\n"
@@ -138784,855 +134639,746 @@ static PyMethodDef SwigMethods[] = {
 		"y-coordinate of upper right corner \n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_clone", _wrap_Rectangle_clone, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_clone", _wrap_Rectangle_clone, METH_O, "\n"
 		"Rectangle_clone(Rectangle self) -> Rectangle\n"
-		"\n"
 		"Rectangle* Rectangle::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_contains", _wrap_Rectangle_contains, METH_VARARGS, (char *)"\n"
-		"contains(double x, double y) -> bool\n"
+	 { "Rectangle_contains", _wrap_Rectangle_contains, METH_VARARGS, "\n"
+		"Rectangle_contains(Rectangle self, double x, double y) -> bool\n"
 		"Rectangle_contains(Rectangle self, Bin1D binx, Bin1D biny) -> bool\n"
-		"\n"
 		"bool Rectangle::contains(const Bin1D &binx, const Bin1D &biny) const\n"
 		"\n"
 		"Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition). \n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_getArea", _wrap_Rectangle_getArea, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_getArea", _wrap_Rectangle_getArea, METH_O, "\n"
 		"Rectangle_getArea(Rectangle self) -> double\n"
-		"\n"
 		"double Rectangle::getArea() const\n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_getXlow", _wrap_Rectangle_getXlow, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_getXlow", _wrap_Rectangle_getXlow, METH_O, "\n"
 		"Rectangle_getXlow(Rectangle self) -> double\n"
-		"\n"
 		"double Rectangle::getXlow() const\n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_getYlow", _wrap_Rectangle_getYlow, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_getYlow", _wrap_Rectangle_getYlow, METH_O, "\n"
 		"Rectangle_getYlow(Rectangle self) -> double\n"
-		"\n"
 		"double Rectangle::getYlow() const\n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_getXup", _wrap_Rectangle_getXup, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_getXup", _wrap_Rectangle_getXup, METH_O, "\n"
 		"Rectangle_getXup(Rectangle self) -> double\n"
-		"\n"
 		"double Rectangle::getXup() const\n"
 		"\n"
 		""},
-	 { (char *)"Rectangle_getYup", _wrap_Rectangle_getYup, METH_VARARGS, (char *)"\n"
+	 { "Rectangle_getYup", _wrap_Rectangle_getYup, METH_O, "\n"
 		"Rectangle_getYup(Rectangle self) -> double\n"
-		"\n"
 		"double Rectangle::getYup() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_Rectangle", _wrap_delete_Rectangle, METH_VARARGS, (char *)"delete_Rectangle(Rectangle self)"},
-	 { (char *)"Rectangle_swigregister", Rectangle_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RectangularDetector", _wrap_new_RectangularDetector, METH_VARARGS, (char *)"\n"
+	 { "delete_Rectangle", _wrap_delete_Rectangle, METH_O, "delete_Rectangle(Rectangle self)"},
+	 { "Rectangle_swigregister", Rectangle_swigregister, METH_O, NULL},
+	 { "Rectangle_swiginit", Rectangle_swiginit, METH_VARARGS, NULL},
+	 { "new_RectangularDetector", _wrap_new_RectangularDetector, METH_VARARGS, "\n"
 		"RectangularDetector(size_t nxbins, double width, size_t nybins, double height)\n"
 		"new_RectangularDetector(RectangularDetector other) -> RectangularDetector\n"
-		"\n"
 		"RectangularDetector::RectangularDetector(const RectangularDetector &other)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_clone", _wrap_RectangularDetector_clone, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_clone", _wrap_RectangularDetector_clone, METH_O, "\n"
 		"RectangularDetector_clone(RectangularDetector self) -> RectangularDetector\n"
-		"\n"
 		"RectangularDetector * RectangularDetector::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_accept", _wrap_RectangularDetector_accept, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_accept", _wrap_RectangularDetector_accept, METH_VARARGS, "\n"
 		"RectangularDetector_accept(RectangularDetector self, INodeVisitor visitor)\n"
-		"\n"
 		"void RectangularDetector::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"delete_RectangularDetector", _wrap_delete_RectangularDetector, METH_VARARGS, (char *)"\n"
+	 { "delete_RectangularDetector", _wrap_delete_RectangularDetector, METH_O, "\n"
 		"delete_RectangularDetector(RectangularDetector self)\n"
-		"\n"
 		"RectangularDetector::~RectangularDetector()\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_init", _wrap_RectangularDetector_init, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_init", _wrap_RectangularDetector_init, METH_VARARGS, "\n"
 		"RectangularDetector_init(RectangularDetector self, Beam beam)\n"
-		"\n"
 		"void RectangularDetector::init(const Beam &beam) override\n"
 		"\n"
 		"Inits detector with the beam settings. \n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_setPosition", _wrap_RectangularDetector_setPosition, METH_VARARGS, (char *)"\n"
-		"setPosition(kvector_t normal_to_detector, double u0, double v0, kvector_t direction)\n"
-		"RectangularDetector_setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0)\n"
-		"\n"
+	 { "RectangularDetector_setPosition", _wrap_RectangularDetector_setPosition, METH_VARARGS, "\n"
+		"RectangularDetector_setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0, kvector_t direction=kvector_t(0.0, -1.0, 0.0))\n"
 		"void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0, -1.0, 0.0))\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_setPerpendicularToSampleX", _wrap_RectangularDetector_setPerpendicularToSampleX, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_setPerpendicularToSampleX", _wrap_RectangularDetector_setPerpendicularToSampleX, METH_VARARGS, "\n"
 		"RectangularDetector_setPerpendicularToSampleX(RectangularDetector self, double distance, double u0, double v0)\n"
-		"\n"
 		"void RectangularDetector::setPerpendicularToSampleX(double distance, double u0, double v0)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_setPerpendicularToDirectBeam", _wrap_RectangularDetector_setPerpendicularToDirectBeam, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_setPerpendicularToDirectBeam", _wrap_RectangularDetector_setPerpendicularToDirectBeam, METH_VARARGS, "\n"
 		"RectangularDetector_setPerpendicularToDirectBeam(RectangularDetector self, double distance, double u0, double v0)\n"
-		"\n"
 		"void RectangularDetector::setPerpendicularToDirectBeam(double distance, double u0, double v0)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_setPerpendicularToReflectedBeam", _wrap_RectangularDetector_setPerpendicularToReflectedBeam, METH_VARARGS, (char *)"\n"
-		"setPerpendicularToReflectedBeam(double distance, double u0=0.0, double v0=0.0)\n"
-		"setPerpendicularToReflectedBeam(double distance, double u0=0.0)\n"
-		"RectangularDetector_setPerpendicularToReflectedBeam(RectangularDetector self, double distance)\n"
-		"\n"
+	 { "RectangularDetector_setPerpendicularToReflectedBeam", _wrap_RectangularDetector_setPerpendicularToReflectedBeam, METH_VARARGS, "\n"
+		"RectangularDetector_setPerpendicularToReflectedBeam(RectangularDetector self, double distance, double u0=0.0, double v0=0.0)\n"
 		"void RectangularDetector::setPerpendicularToReflectedBeam(double distance, double u0=0.0, double v0=0.0)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_setDirectBeamPosition", _wrap_RectangularDetector_setDirectBeamPosition, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_setDirectBeamPosition", _wrap_RectangularDetector_setDirectBeamPosition, METH_VARARGS, "\n"
 		"RectangularDetector_setDirectBeamPosition(RectangularDetector self, double u0, double v0)\n"
-		"\n"
 		"void RectangularDetector::setDirectBeamPosition(double u0, double v0)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getWidth", _wrap_RectangularDetector_getWidth, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getWidth", _wrap_RectangularDetector_getWidth, METH_O, "\n"
 		"RectangularDetector_getWidth(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getWidth() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getHeight", _wrap_RectangularDetector_getHeight, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getHeight", _wrap_RectangularDetector_getHeight, METH_O, "\n"
 		"RectangularDetector_getHeight(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getHeight() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getNbinsX", _wrap_RectangularDetector_getNbinsX, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getNbinsX", _wrap_RectangularDetector_getNbinsX, METH_O, "\n"
 		"RectangularDetector_getNbinsX(RectangularDetector self) -> size_t\n"
-		"\n"
 		"size_t RectangularDetector::getNbinsX() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getNbinsY", _wrap_RectangularDetector_getNbinsY, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getNbinsY", _wrap_RectangularDetector_getNbinsY, METH_O, "\n"
 		"RectangularDetector_getNbinsY(RectangularDetector self) -> size_t\n"
-		"\n"
 		"size_t RectangularDetector::getNbinsY() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getNormalVector", _wrap_RectangularDetector_getNormalVector, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getNormalVector", _wrap_RectangularDetector_getNormalVector, METH_O, "\n"
 		"RectangularDetector_getNormalVector(RectangularDetector self) -> kvector_t\n"
-		"\n"
 		"kvector_t RectangularDetector::getNormalVector() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getU0", _wrap_RectangularDetector_getU0, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getU0", _wrap_RectangularDetector_getU0, METH_O, "\n"
 		"RectangularDetector_getU0(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getU0() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getV0", _wrap_RectangularDetector_getV0, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getV0", _wrap_RectangularDetector_getV0, METH_O, "\n"
 		"RectangularDetector_getV0(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getV0() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getDirectionVector", _wrap_RectangularDetector_getDirectionVector, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getDirectionVector", _wrap_RectangularDetector_getDirectionVector, METH_O, "\n"
 		"RectangularDetector_getDirectionVector(RectangularDetector self) -> kvector_t\n"
-		"\n"
 		"kvector_t RectangularDetector::getDirectionVector() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getDistance", _wrap_RectangularDetector_getDistance, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getDistance", _wrap_RectangularDetector_getDistance, METH_O, "\n"
 		"RectangularDetector_getDistance(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getDistance() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getDirectBeamU0", _wrap_RectangularDetector_getDirectBeamU0, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getDirectBeamU0", _wrap_RectangularDetector_getDirectBeamU0, METH_O, "\n"
 		"RectangularDetector_getDirectBeamU0(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getDirectBeamU0() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getDirectBeamV0", _wrap_RectangularDetector_getDirectBeamV0, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getDirectBeamV0", _wrap_RectangularDetector_getDirectBeamV0, METH_O, "\n"
 		"RectangularDetector_getDirectBeamV0(RectangularDetector self) -> double\n"
-		"\n"
 		"double RectangularDetector::getDirectBeamV0() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_getDetectorArrangment", _wrap_RectangularDetector_getDetectorArrangment, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_getDetectorArrangment", _wrap_RectangularDetector_getDetectorArrangment, METH_O, "\n"
 		"RectangularDetector_getDetectorArrangment(RectangularDetector self) -> RectangularDetector::EDetectorArrangement\n"
-		"\n"
 		"RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_defaultAxesUnits", _wrap_RectangularDetector_defaultAxesUnits, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_defaultAxesUnits", _wrap_RectangularDetector_defaultAxesUnits, METH_O, "\n"
 		"RectangularDetector_defaultAxesUnits(RectangularDetector self) -> AxesUnits\n"
-		"\n"
 		"AxesUnits RectangularDetector::defaultAxesUnits() const override\n"
 		"\n"
 		"return default axes units \n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_regionOfInterestPixel", _wrap_RectangularDetector_regionOfInterestPixel, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_regionOfInterestPixel", _wrap_RectangularDetector_regionOfInterestPixel, METH_O, "\n"
 		"RectangularDetector_regionOfInterestPixel(RectangularDetector self) -> RectangularPixel\n"
-		"\n"
 		"RectangularPixel * RectangularDetector::regionOfInterestPixel() const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularDetector_swigregister", RectangularDetector_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RectangularPixel", _wrap_new_RectangularPixel, METH_VARARGS, (char *)"\n"
+	 { "RectangularDetector_swigregister", RectangularDetector_swigregister, METH_O, NULL},
+	 { "RectangularDetector_swiginit", RectangularDetector_swiginit, METH_VARARGS, NULL},
+	 { "new_RectangularPixel", _wrap_new_RectangularPixel, METH_VARARGS, "\n"
 		"new_RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height) -> RectangularPixel\n"
-		"\n"
 		"RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_clone", _wrap_RectangularPixel_clone, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_clone", _wrap_RectangularPixel_clone, METH_O, "\n"
 		"RectangularPixel_clone(RectangularPixel self) -> RectangularPixel\n"
-		"\n"
 		"RectangularPixel * RectangularPixel::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_createZeroSizePixel", _wrap_RectangularPixel_createZeroSizePixel, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_createZeroSizePixel", _wrap_RectangularPixel_createZeroSizePixel, METH_VARARGS, "\n"
 		"RectangularPixel_createZeroSizePixel(RectangularPixel self, double x, double y) -> RectangularPixel\n"
-		"\n"
 		"RectangularPixel * RectangularPixel::createZeroSizePixel(double x, double y) const override\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_getK", _wrap_RectangularPixel_getK, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_getK", _wrap_RectangularPixel_getK, METH_VARARGS, "\n"
 		"RectangularPixel_getK(RectangularPixel self, double x, double y, double wavelength) -> kvector_t\n"
-		"\n"
 		"kvector_t RectangularPixel::getK(double x, double y, double wavelength) const override\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_getPosition", _wrap_RectangularPixel_getPosition, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_getPosition", _wrap_RectangularPixel_getPosition, METH_VARARGS, "\n"
 		"RectangularPixel_getPosition(RectangularPixel self, double x, double y) -> kvector_t\n"
-		"\n"
 		"kvector_t RectangularPixel::getPosition(double x, double y) const\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_getIntegrationFactor", _wrap_RectangularPixel_getIntegrationFactor, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_getIntegrationFactor", _wrap_RectangularPixel_getIntegrationFactor, METH_VARARGS, "\n"
 		"RectangularPixel_getIntegrationFactor(RectangularPixel self, double x, double y) -> double\n"
-		"\n"
 		"double RectangularPixel::getIntegrationFactor(double x, double y) const override\n"
 		"\n"
 		""},
-	 { (char *)"RectangularPixel_getSolidAngle", _wrap_RectangularPixel_getSolidAngle, METH_VARARGS, (char *)"\n"
+	 { "RectangularPixel_getSolidAngle", _wrap_RectangularPixel_getSolidAngle, METH_O, "\n"
 		"RectangularPixel_getSolidAngle(RectangularPixel self) -> double\n"
-		"\n"
 		"double RectangularPixel::getSolidAngle() const override\n"
 		"\n"
 		""},
-	 { (char *)"delete_RectangularPixel", _wrap_delete_RectangularPixel, METH_VARARGS, (char *)"delete_RectangularPixel(RectangularPixel self)"},
-	 { (char *)"RectangularPixel_swigregister", RectangularPixel_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ResolutionFunction2DGaussian", _wrap_new_ResolutionFunction2DGaussian, METH_VARARGS, (char *)"\n"
+	 { "delete_RectangularPixel", _wrap_delete_RectangularPixel, METH_O, "delete_RectangularPixel(RectangularPixel self)"},
+	 { "RectangularPixel_swigregister", RectangularPixel_swigregister, METH_O, NULL},
+	 { "RectangularPixel_swiginit", RectangularPixel_swiginit, METH_VARARGS, NULL},
+	 { "new_ResolutionFunction2DGaussian", _wrap_new_ResolutionFunction2DGaussian, METH_VARARGS, "\n"
 		"new_ResolutionFunction2DGaussian(double sigma_x, double sigma_y) -> ResolutionFunction2DGaussian\n"
-		"\n"
 		"ResolutionFunction2DGaussian::ResolutionFunction2DGaussian(double sigma_x, double sigma_y)\n"
 		"\n"
 		""},
-	 { (char *)"ResolutionFunction2DGaussian_evaluateCDF", _wrap_ResolutionFunction2DGaussian_evaluateCDF, METH_VARARGS, (char *)"\n"
+	 { "ResolutionFunction2DGaussian_evaluateCDF", _wrap_ResolutionFunction2DGaussian_evaluateCDF, METH_VARARGS, "\n"
 		"ResolutionFunction2DGaussian_evaluateCDF(ResolutionFunction2DGaussian self, double x, double y) -> double\n"
-		"\n"
 		"double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const\n"
 		"\n"
 		""},
-	 { (char *)"ResolutionFunction2DGaussian_clone", _wrap_ResolutionFunction2DGaussian_clone, METH_VARARGS, (char *)"\n"
+	 { "ResolutionFunction2DGaussian_clone", _wrap_ResolutionFunction2DGaussian_clone, METH_O, "\n"
 		"ResolutionFunction2DGaussian_clone(ResolutionFunction2DGaussian self) -> ResolutionFunction2DGaussian\n"
-		"\n"
 		"ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const\n"
 		"\n"
 		""},
-	 { (char *)"ResolutionFunction2DGaussian_accept", _wrap_ResolutionFunction2DGaussian_accept, METH_VARARGS, (char *)"\n"
+	 { "ResolutionFunction2DGaussian_accept", _wrap_ResolutionFunction2DGaussian_accept, METH_VARARGS, "\n"
 		"ResolutionFunction2DGaussian_accept(ResolutionFunction2DGaussian self, INodeVisitor visitor)\n"
-		"\n"
 		"void ResolutionFunction2DGaussian::accept(INodeVisitor *visitor) const final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"ResolutionFunction2DGaussian_getSigmaX", _wrap_ResolutionFunction2DGaussian_getSigmaX, METH_VARARGS, (char *)"\n"
+	 { "ResolutionFunction2DGaussian_getSigmaX", _wrap_ResolutionFunction2DGaussian_getSigmaX, METH_O, "\n"
 		"ResolutionFunction2DGaussian_getSigmaX(ResolutionFunction2DGaussian self) -> double\n"
-		"\n"
 		"double ResolutionFunction2DGaussian::getSigmaX() const\n"
 		"\n"
 		""},
-	 { (char *)"ResolutionFunction2DGaussian_getSigmaY", _wrap_ResolutionFunction2DGaussian_getSigmaY, METH_VARARGS, (char *)"\n"
+	 { "ResolutionFunction2DGaussian_getSigmaY", _wrap_ResolutionFunction2DGaussian_getSigmaY, METH_O, "\n"
 		"ResolutionFunction2DGaussian_getSigmaY(ResolutionFunction2DGaussian self) -> double\n"
-		"\n"
 		"double ResolutionFunction2DGaussian::getSigmaY() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_ResolutionFunction2DGaussian", _wrap_delete_ResolutionFunction2DGaussian, METH_VARARGS, (char *)"delete_ResolutionFunction2DGaussian(ResolutionFunction2DGaussian self)"},
-	 { (char *)"ResolutionFunction2DGaussian_swigregister", ResolutionFunction2DGaussian_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_RoughnessModel", _wrap_delete_RoughnessModel, METH_VARARGS, (char *)"delete_RoughnessModel(RoughnessModel self)"},
-	 { (char *)"RoughnessModel_swigregister", RoughnessModel_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_DepthProbeSimulation", _wrap_new_DepthProbeSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_ResolutionFunction2DGaussian", _wrap_delete_ResolutionFunction2DGaussian, METH_O, "delete_ResolutionFunction2DGaussian(ResolutionFunction2DGaussian self)"},
+	 { "ResolutionFunction2DGaussian_swigregister", ResolutionFunction2DGaussian_swigregister, METH_O, NULL},
+	 { "ResolutionFunction2DGaussian_swiginit", ResolutionFunction2DGaussian_swiginit, METH_VARARGS, NULL},
+	 { "delete_RoughnessModel", _wrap_delete_RoughnessModel, METH_O, "delete_RoughnessModel(RoughnessModel self)"},
+	 { "RoughnessModel_swigregister", RoughnessModel_swigregister, METH_O, NULL},
+	 { "new_DepthProbeSimulation", _wrap_new_DepthProbeSimulation, METH_VARARGS, "\n"
 		"DepthProbeSimulation()\n"
 		"DepthProbeSimulation(MultiLayer sample)\n"
 		"new_DepthProbeSimulation(std::shared_ptr< IMultiLayerBuilder > const sample_builder) -> DepthProbeSimulation\n"
-		"\n"
 		"DepthProbeSimulation::DepthProbeSimulation(const std::shared_ptr< IMultiLayerBuilder > sample_builder)\n"
 		"\n"
 		""},
-	 { (char *)"delete_DepthProbeSimulation", _wrap_delete_DepthProbeSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_DepthProbeSimulation", _wrap_delete_DepthProbeSimulation, METH_O, "\n"
 		"delete_DepthProbeSimulation(DepthProbeSimulation self)\n"
-		"\n"
 		"DepthProbeSimulation::~DepthProbeSimulation() override\n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_clone", _wrap_DepthProbeSimulation_clone, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_clone", _wrap_DepthProbeSimulation_clone, METH_O, "\n"
 		"DepthProbeSimulation_clone(DepthProbeSimulation self) -> DepthProbeSimulation\n"
-		"\n"
 		"DepthProbeSimulation * DepthProbeSimulation::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_accept", _wrap_DepthProbeSimulation_accept, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_accept", _wrap_DepthProbeSimulation_accept, METH_VARARGS, "\n"
 		"DepthProbeSimulation_accept(DepthProbeSimulation self, INodeVisitor visitor)\n"
-		"\n"
 		"void DepthProbeSimulation::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_result", _wrap_DepthProbeSimulation_result, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_result", _wrap_DepthProbeSimulation_result, METH_O, "\n"
 		"DepthProbeSimulation_result(DepthProbeSimulation self) -> SimulationResult\n"
-		"\n"
 		"SimulationResult DepthProbeSimulation::result() const override\n"
 		"\n"
 		"Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_setBeamParameters", _wrap_DepthProbeSimulation_setBeamParameters, METH_VARARGS, (char *)"\n"
-		"setBeamParameters(double arg2, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor beam_shape=None)\n"
-		"DepthProbeSimulation_setBeamParameters(DepthProbeSimulation self, double arg3, int nbins, double alpha_i_min, double alpha_i_max)\n"
-		"\n"
+	 { "DepthProbeSimulation_setBeamParameters", _wrap_DepthProbeSimulation_setBeamParameters, METH_VARARGS, "\n"
+		"DepthProbeSimulation_setBeamParameters(DepthProbeSimulation self, double _lambda, int nbins, double alpha_i_min, double alpha_i_max, IFootprintFactor beam_shape=None)\n"
 		"void DepthProbeSimulation::setBeamParameters(double lambda, int nbins, double alpha_i_min, double alpha_i_max, const IFootprintFactor *beam_shape=nullptr)\n"
 		"\n"
 		"Sets beam parameters with alpha_i of the beam defined in the range. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_setZSpan", _wrap_DepthProbeSimulation_setZSpan, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_setZSpan", _wrap_DepthProbeSimulation_setZSpan, METH_VARARGS, "\n"
 		"DepthProbeSimulation_setZSpan(DepthProbeSimulation self, size_t n_bins, double z_min, double z_max)\n"
-		"\n"
 		"void DepthProbeSimulation::setZSpan(size_t n_bins, double z_min, double z_max)\n"
 		"\n"
 		"Set z positions for intensity calculations. Negative z's correspond to the area under sample surface. The more negative z is, the deeper layer corresponds to it. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_getAlphaAxis", _wrap_DepthProbeSimulation_getAlphaAxis, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_getAlphaAxis", _wrap_DepthProbeSimulation_getAlphaAxis, METH_O, "\n"
 		"DepthProbeSimulation_getAlphaAxis(DepthProbeSimulation self) -> IAxis\n"
-		"\n"
 		"const IAxis * DepthProbeSimulation::getAlphaAxis() const\n"
 		"\n"
 		"Returns a pointer to incident angle axis. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_getZAxis", _wrap_DepthProbeSimulation_getZAxis, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_getZAxis", _wrap_DepthProbeSimulation_getZAxis, METH_O, "\n"
 		"DepthProbeSimulation_getZAxis(DepthProbeSimulation self) -> IAxis\n"
-		"\n"
 		"const IAxis * DepthProbeSimulation::getZAxis() const\n"
 		"\n"
 		"Returns a pointer to z-position axis. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_intensityMapSize", _wrap_DepthProbeSimulation_intensityMapSize, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_intensityMapSize", _wrap_DepthProbeSimulation_intensityMapSize, METH_O, "\n"
 		"DepthProbeSimulation_intensityMapSize(DepthProbeSimulation self) -> size_t\n"
-		"\n"
 		"size_t DepthProbeSimulation::intensityMapSize() const override\n"
 		"\n"
 		"Returns the total number of the intensity values in the simulation result. \n"
 		"\n"
 		""},
-	 { (char *)"DepthProbeSimulation_swigregister", DepthProbeSimulation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SpecularSimulation", _wrap_new_SpecularSimulation, METH_VARARGS, (char *)"\n"
+	 { "DepthProbeSimulation_swigregister", DepthProbeSimulation_swigregister, METH_O, NULL},
+	 { "DepthProbeSimulation_swiginit", DepthProbeSimulation_swiginit, METH_VARARGS, NULL},
+	 { "new_SpecularSimulation", _wrap_new_SpecularSimulation, METH_VARARGS, "\n"
 		"SpecularSimulation()\n"
 		"SpecularSimulation(MultiLayer sample)\n"
 		"new_SpecularSimulation(std::shared_ptr< IMultiLayerBuilder > const sample_builder) -> SpecularSimulation\n"
-		"\n"
 		"SpecularSimulation::SpecularSimulation(const std::shared_ptr< IMultiLayerBuilder > sample_builder)\n"
 		"\n"
 		""},
-	 { (char *)"delete_SpecularSimulation", _wrap_delete_SpecularSimulation, METH_VARARGS, (char *)"\n"
+	 { "delete_SpecularSimulation", _wrap_delete_SpecularSimulation, METH_O, "\n"
 		"delete_SpecularSimulation(SpecularSimulation self)\n"
-		"\n"
 		"SpecularSimulation::~SpecularSimulation() override\n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_clone", _wrap_SpecularSimulation_clone, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_clone", _wrap_SpecularSimulation_clone, METH_O, "\n"
 		"SpecularSimulation_clone(SpecularSimulation self) -> SpecularSimulation\n"
-		"\n"
 		"SpecularSimulation * SpecularSimulation::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_prepareSimulation", _wrap_SpecularSimulation_prepareSimulation, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_prepareSimulation", _wrap_SpecularSimulation_prepareSimulation, METH_O, "\n"
 		"SpecularSimulation_prepareSimulation(SpecularSimulation self)\n"
-		"\n"
 		"void SpecularSimulation::prepareSimulation() override\n"
 		"\n"
 		"Put into a clean state for running a simulation. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_accept", _wrap_SpecularSimulation_accept, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_accept", _wrap_SpecularSimulation_accept, METH_VARARGS, "\n"
 		"SpecularSimulation_accept(SpecularSimulation self, INodeVisitor visitor)\n"
-		"\n"
 		"void SpecularSimulation::accept(INodeVisitor *visitor) const override final\n"
 		"\n"
 		"Calls the  INodeVisitor's visit method. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_result", _wrap_SpecularSimulation_result, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_result", _wrap_SpecularSimulation_result, METH_O, "\n"
 		"SpecularSimulation_result(SpecularSimulation self) -> SimulationResult\n"
-		"\n"
 		"SimulationResult SpecularSimulation::result() const override\n"
 		"\n"
 		"Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays. If simulation was not run, returns an array of proper size filled with zeros. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_setScan", _wrap_SpecularSimulation_setScan, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_setScan", _wrap_SpecularSimulation_setScan, METH_VARARGS, "\n"
 		"SpecularSimulation_setScan(SpecularSimulation self, ISpecularScan const & scan)\n"
-		"\n"
 		"void SpecularSimulation::setScan(const ISpecularScan &scan)\n"
 		"\n"
 		"Sets chosen specular scan to the simulation. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_coordinateAxis", _wrap_SpecularSimulation_coordinateAxis, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_coordinateAxis", _wrap_SpecularSimulation_coordinateAxis, METH_O, "\n"
 		"SpecularSimulation_coordinateAxis(SpecularSimulation self) -> IAxis\n"
-		"\n"
 		"const IAxis * SpecularSimulation::coordinateAxis() const\n"
 		"\n"
 		"Returns a pointer to coordinate axis. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_footprintFactor", _wrap_SpecularSimulation_footprintFactor, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_footprintFactor", _wrap_SpecularSimulation_footprintFactor, METH_O, "\n"
 		"SpecularSimulation_footprintFactor(SpecularSimulation self) -> IFootprintFactor\n"
-		"\n"
 		"const IFootprintFactor * SpecularSimulation::footprintFactor() const\n"
 		"\n"
 		"Returns a pointer to footprint factor holder. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_intensityMapSize", _wrap_SpecularSimulation_intensityMapSize, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_intensityMapSize", _wrap_SpecularSimulation_intensityMapSize, METH_O, "\n"
 		"SpecularSimulation_intensityMapSize(SpecularSimulation self) -> size_t\n"
-		"\n"
 		"size_t SpecularSimulation::intensityMapSize() const override\n"
 		"\n"
 		"Returns the total number of the intensity values in the simulation result. \n"
 		"\n"
 		""},
-	 { (char *)"SpecularSimulation_swigregister", SpecularSimulation_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_ThreadInfo", _wrap_new_ThreadInfo, METH_VARARGS, (char *)"\n"
+	 { "SpecularSimulation_swigregister", SpecularSimulation_swigregister, METH_O, NULL},
+	 { "SpecularSimulation_swiginit", SpecularSimulation_swiginit, METH_VARARGS, NULL},
+	 { "new_ThreadInfo", _wrap_new_ThreadInfo, METH_NOARGS, "\n"
 		"new_ThreadInfo() -> ThreadInfo\n"
-		"\n"
 		"ThreadInfo::ThreadInfo()\n"
 		"\n"
 		""},
-	 { (char *)"ThreadInfo_n_threads_set", _wrap_ThreadInfo_n_threads_set, METH_VARARGS, (char *)"ThreadInfo_n_threads_set(ThreadInfo self, unsigned int n_threads)"},
-	 { (char *)"ThreadInfo_n_threads_get", _wrap_ThreadInfo_n_threads_get, METH_VARARGS, (char *)"ThreadInfo_n_threads_get(ThreadInfo self) -> unsigned int"},
-	 { (char *)"ThreadInfo_n_batches_set", _wrap_ThreadInfo_n_batches_set, METH_VARARGS, (char *)"ThreadInfo_n_batches_set(ThreadInfo self, unsigned int n_batches)"},
-	 { (char *)"ThreadInfo_n_batches_get", _wrap_ThreadInfo_n_batches_get, METH_VARARGS, (char *)"ThreadInfo_n_batches_get(ThreadInfo self) -> unsigned int"},
-	 { (char *)"ThreadInfo_current_batch_set", _wrap_ThreadInfo_current_batch_set, METH_VARARGS, (char *)"ThreadInfo_current_batch_set(ThreadInfo self, unsigned int current_batch)"},
-	 { (char *)"ThreadInfo_current_batch_get", _wrap_ThreadInfo_current_batch_get, METH_VARARGS, (char *)"ThreadInfo_current_batch_get(ThreadInfo self) -> unsigned int"},
-	 { (char *)"delete_ThreadInfo", _wrap_delete_ThreadInfo, METH_VARARGS, (char *)"delete_ThreadInfo(ThreadInfo self)"},
-	 { (char *)"ThreadInfo_swigregister", ThreadInfo_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SampleBuilderFactoryTemp", _wrap_new_SampleBuilderFactoryTemp, METH_VARARGS, (char *)"\n"
+	 { "ThreadInfo_n_threads_set", _wrap_ThreadInfo_n_threads_set, METH_VARARGS, "ThreadInfo_n_threads_set(ThreadInfo self, unsigned int n_threads)"},
+	 { "ThreadInfo_n_threads_get", _wrap_ThreadInfo_n_threads_get, METH_O, "ThreadInfo_n_threads_get(ThreadInfo self) -> unsigned int"},
+	 { "ThreadInfo_n_batches_set", _wrap_ThreadInfo_n_batches_set, METH_VARARGS, "ThreadInfo_n_batches_set(ThreadInfo self, unsigned int n_batches)"},
+	 { "ThreadInfo_n_batches_get", _wrap_ThreadInfo_n_batches_get, METH_O, "ThreadInfo_n_batches_get(ThreadInfo self) -> unsigned int"},
+	 { "ThreadInfo_current_batch_set", _wrap_ThreadInfo_current_batch_set, METH_VARARGS, "ThreadInfo_current_batch_set(ThreadInfo self, unsigned int current_batch)"},
+	 { "ThreadInfo_current_batch_get", _wrap_ThreadInfo_current_batch_get, METH_O, "ThreadInfo_current_batch_get(ThreadInfo self) -> unsigned int"},
+	 { "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},
+	 { "new_SampleBuilderFactoryTemp", _wrap_new_SampleBuilderFactoryTemp, METH_NOARGS, "\n"
 		"new_SampleBuilderFactoryTemp() -> SampleBuilderFactoryTemp\n"
-		"\n"
 		"IFactory< Key, AbstractProduct >::IFactory()\n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_createItem", _wrap_SampleBuilderFactoryTemp_createItem, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_createItem", _wrap_SampleBuilderFactoryTemp_createItem, METH_VARARGS, "\n"
 		"SampleBuilderFactoryTemp_createItem(SampleBuilderFactoryTemp self, std::string const & item_key) -> IMultiLayerBuilder\n"
-		"\n"
 		"AbstractProduct* IFactory< Key, AbstractProduct >::createItem(const Key &item_key)\n"
 		"\n"
 		"Creates object by calling creation function corresponded to given identifier. \n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_registerItem", _wrap_SampleBuilderFactoryTemp_registerItem, METH_VARARGS, (char *)"\n"
-		"registerItem(std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn, std::string const & itemDescription) -> bool\n"
-		"SampleBuilderFactoryTemp_registerItem(SampleBuilderFactoryTemp self, std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn) -> bool\n"
-		"\n"
+	 { "SampleBuilderFactoryTemp_registerItem", _wrap_SampleBuilderFactoryTemp_registerItem, METH_VARARGS, "\n"
+		"SampleBuilderFactoryTemp_registerItem(SampleBuilderFactoryTemp self, std::string const & item_key, IFactory< std::string,IMultiLayerBuilder >::CreateItemCallback CreateFn, std::string const & itemDescription=\"\") -> bool\n"
 		"bool IFactory< Key, AbstractProduct >::registerItem(const Key &item_key, CreateItemCallback CreateFn, const std::string &itemDescription=\"\")\n"
 		"\n"
 		"Registers object's creation function and store object description. \n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_contains", _wrap_SampleBuilderFactoryTemp_contains, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_contains", _wrap_SampleBuilderFactoryTemp_contains, METH_VARARGS, "\n"
 		"SampleBuilderFactoryTemp_contains(SampleBuilderFactoryTemp self, std::string const & item_key) -> bool\n"
-		"\n"
 		"bool IFactory< Key, AbstractProduct >::contains(const Key &item_key) const\n"
 		"\n"
 		""},
-	 { (char *)"delete_SampleBuilderFactoryTemp", _wrap_delete_SampleBuilderFactoryTemp, METH_VARARGS, (char *)"\n"
+	 { "delete_SampleBuilderFactoryTemp", _wrap_delete_SampleBuilderFactoryTemp, METH_O, "\n"
 		"delete_SampleBuilderFactoryTemp(SampleBuilderFactoryTemp self)\n"
-		"\n"
 		"IFactory< Key, AbstractProduct >::~IFactory()\n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_size", _wrap_SampleBuilderFactoryTemp_size, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_size", _wrap_SampleBuilderFactoryTemp_size, METH_O, "\n"
 		"SampleBuilderFactoryTemp_size(SampleBuilderFactoryTemp self) -> size_t\n"
-		"\n"
 		"size_t IFactory< Key, AbstractProduct >::size() const\n"
 		"\n"
 		"Returns number of registered objects. \n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_begin", _wrap_SampleBuilderFactoryTemp_begin, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_begin", _wrap_SampleBuilderFactoryTemp_begin, METH_O, "\n"
 		"SampleBuilderFactoryTemp_begin(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator\n"
-		"\n"
 		"const_iterator IFactory< Key, AbstractProduct >::begin() const\n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_end", _wrap_SampleBuilderFactoryTemp_end, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_end", _wrap_SampleBuilderFactoryTemp_end, METH_O, "\n"
 		"SampleBuilderFactoryTemp_end(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator\n"
-		"\n"
 		"const_iterator IFactory< Key, AbstractProduct >::end() const\n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactoryTemp_swigregister", SampleBuilderFactoryTemp_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SampleBuilderFactory", _wrap_new_SampleBuilderFactory, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactoryTemp_swigregister", SampleBuilderFactoryTemp_swigregister, METH_O, NULL},
+	 { "SampleBuilderFactoryTemp_swiginit", SampleBuilderFactoryTemp_swiginit, METH_VARARGS, NULL},
+	 { "new_SampleBuilderFactory", _wrap_new_SampleBuilderFactory, METH_NOARGS, "\n"
 		"new_SampleBuilderFactory() -> SampleBuilderFactory\n"
-		"\n"
 		"SampleBuilderFactory::SampleBuilderFactory()\n"
 		"\n"
 		""},
-	 { (char *)"SampleBuilderFactory_createSample", _wrap_SampleBuilderFactory_createSample, METH_VARARGS, (char *)"\n"
+	 { "SampleBuilderFactory_createSample", _wrap_SampleBuilderFactory_createSample, METH_VARARGS, "\n"
 		"SampleBuilderFactory_createSample(SampleBuilderFactory self, std::string const & name) -> MultiLayer\n"
-		"\n"
 		"MultiLayer * SampleBuilderFactory::createSample(const std::string &name)\n"
 		"\n"
 		"Retrieves a SampleBuilder from the registry, does the build, and returns the result. \n"
 		"\n"
 		""},
-	 { (char *)"delete_SampleBuilderFactory", _wrap_delete_SampleBuilderFactory, METH_VARARGS, (char *)"delete_SampleBuilderFactory(SampleBuilderFactory self)"},
-	 { (char *)"SampleBuilderFactory_swigregister", SampleBuilderFactory_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SimulationFactoryTemp", _wrap_new_SimulationFactoryTemp, METH_VARARGS, (char *)"\n"
+	 { "delete_SampleBuilderFactory", _wrap_delete_SampleBuilderFactory, METH_O, "delete_SampleBuilderFactory(SampleBuilderFactory self)"},
+	 { "SampleBuilderFactory_swigregister", SampleBuilderFactory_swigregister, METH_O, NULL},
+	 { "SampleBuilderFactory_swiginit", SampleBuilderFactory_swiginit, METH_VARARGS, NULL},
+	 { "new_SimulationFactoryTemp", _wrap_new_SimulationFactoryTemp, METH_NOARGS, "\n"
 		"new_SimulationFactoryTemp() -> SimulationFactoryTemp\n"
-		"\n"
 		"IFactory< Key, AbstractProduct >::IFactory()\n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_createItem", _wrap_SimulationFactoryTemp_createItem, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_createItem", _wrap_SimulationFactoryTemp_createItem, METH_VARARGS, "\n"
 		"SimulationFactoryTemp_createItem(SimulationFactoryTemp self, std::string const & item_key) -> Simulation\n"
-		"\n"
 		"AbstractProduct* IFactory< Key, AbstractProduct >::createItem(const Key &item_key)\n"
 		"\n"
 		"Creates object by calling creation function corresponded to given identifier. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_registerItem", _wrap_SimulationFactoryTemp_registerItem, METH_VARARGS, (char *)"\n"
-		"registerItem(std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn, std::string const & itemDescription) -> bool\n"
-		"SimulationFactoryTemp_registerItem(SimulationFactoryTemp self, std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn) -> bool\n"
-		"\n"
+	 { "SimulationFactoryTemp_registerItem", _wrap_SimulationFactoryTemp_registerItem, METH_VARARGS, "\n"
+		"SimulationFactoryTemp_registerItem(SimulationFactoryTemp self, std::string const & item_key, IFactory< std::string,Simulation >::CreateItemCallback CreateFn, std::string const & itemDescription=\"\") -> bool\n"
 		"bool IFactory< Key, AbstractProduct >::registerItem(const Key &item_key, CreateItemCallback CreateFn, const std::string &itemDescription=\"\")\n"
 		"\n"
 		"Registers object's creation function and store object description. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_contains", _wrap_SimulationFactoryTemp_contains, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_contains", _wrap_SimulationFactoryTemp_contains, METH_VARARGS, "\n"
 		"SimulationFactoryTemp_contains(SimulationFactoryTemp self, std::string const & item_key) -> bool\n"
-		"\n"
 		"bool IFactory< Key, AbstractProduct >::contains(const Key &item_key) const\n"
 		"\n"
 		""},
-	 { (char *)"delete_SimulationFactoryTemp", _wrap_delete_SimulationFactoryTemp, METH_VARARGS, (char *)"\n"
+	 { "delete_SimulationFactoryTemp", _wrap_delete_SimulationFactoryTemp, METH_O, "\n"
 		"delete_SimulationFactoryTemp(SimulationFactoryTemp self)\n"
-		"\n"
 		"IFactory< Key, AbstractProduct >::~IFactory()\n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_size", _wrap_SimulationFactoryTemp_size, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_size", _wrap_SimulationFactoryTemp_size, METH_O, "\n"
 		"SimulationFactoryTemp_size(SimulationFactoryTemp self) -> size_t\n"
-		"\n"
 		"size_t IFactory< Key, AbstractProduct >::size() const\n"
 		"\n"
 		"Returns number of registered objects. \n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_begin", _wrap_SimulationFactoryTemp_begin, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_begin", _wrap_SimulationFactoryTemp_begin, METH_O, "\n"
 		"SimulationFactoryTemp_begin(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator\n"
-		"\n"
 		"const_iterator IFactory< Key, AbstractProduct >::begin() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_end", _wrap_SimulationFactoryTemp_end, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_end", _wrap_SimulationFactoryTemp_end, METH_O, "\n"
 		"SimulationFactoryTemp_end(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator\n"
-		"\n"
 		"const_iterator IFactory< Key, AbstractProduct >::end() const\n"
 		"\n"
 		""},
-	 { (char *)"SimulationFactoryTemp_swigregister", SimulationFactoryTemp_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_SimulationFactory", _wrap_new_SimulationFactory, METH_VARARGS, (char *)"\n"
+	 { "SimulationFactoryTemp_swigregister", SimulationFactoryTemp_swigregister, METH_O, NULL},
+	 { "SimulationFactoryTemp_swiginit", SimulationFactoryTemp_swiginit, METH_VARARGS, NULL},
+	 { "new_SimulationFactory", _wrap_new_SimulationFactory, METH_NOARGS, "\n"
 		"new_SimulationFactory() -> SimulationFactory\n"
-		"\n"
 		"SimulationFactory::SimulationFactory()\n"
 		"\n"
 		""},
-	 { (char *)"delete_SimulationFactory", _wrap_delete_SimulationFactory, METH_VARARGS, (char *)"delete_SimulationFactory(SimulationFactory self)"},
-	 { (char *)"SimulationFactory_swigregister", SimulationFactory_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_AxesUnits", _wrap_delete_AxesUnits, METH_VARARGS, (char *)"delete_AxesUnits(AxesUnits self)"},
-	 { (char *)"AxesUnits_swigregister", AxesUnits_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IUnitConverter", _wrap_delete_IUnitConverter, METH_VARARGS, (char *)"\n"
+	 { "delete_SimulationFactory", _wrap_delete_SimulationFactory, METH_O, "delete_SimulationFactory(SimulationFactory self)"},
+	 { "SimulationFactory_swigregister", SimulationFactory_swigregister, METH_O, NULL},
+	 { "SimulationFactory_swiginit", SimulationFactory_swiginit, METH_VARARGS, NULL},
+	 { "delete_AxesUnits", _wrap_delete_AxesUnits, METH_O, "delete_AxesUnits(AxesUnits self)"},
+	 { "AxesUnits_swigregister", AxesUnits_swigregister, METH_O, NULL},
+	 { "delete_IUnitConverter", _wrap_delete_IUnitConverter, METH_O, "\n"
 		"delete_IUnitConverter(IUnitConverter self)\n"
-		"\n"
 		"IUnitConverter::~IUnitConverter()\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_clone", _wrap_IUnitConverter_clone, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_clone", _wrap_IUnitConverter_clone, METH_O, "\n"
 		"IUnitConverter_clone(IUnitConverter self) -> IUnitConverter\n"
-		"\n"
 		"virtual IUnitConverter* IUnitConverter::clone() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_dimension", _wrap_IUnitConverter_dimension, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_dimension", _wrap_IUnitConverter_dimension, METH_O, "\n"
 		"IUnitConverter_dimension(IUnitConverter self) -> size_t\n"
-		"\n"
 		"virtual size_t IUnitConverter::dimension() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_calculateMin", _wrap_IUnitConverter_calculateMin, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_calculateMin", _wrap_IUnitConverter_calculateMin, METH_VARARGS, "\n"
 		"IUnitConverter_calculateMin(IUnitConverter self, size_t i_axis, AxesUnits units_type) -> double\n"
-		"\n"
 		"virtual double IUnitConverter::calculateMin(size_t i_axis, AxesUnits units_type) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_calculateMax", _wrap_IUnitConverter_calculateMax, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_calculateMax", _wrap_IUnitConverter_calculateMax, METH_VARARGS, "\n"
 		"IUnitConverter_calculateMax(IUnitConverter self, size_t i_axis, AxesUnits units_type) -> double\n"
-		"\n"
 		"virtual double IUnitConverter::calculateMax(size_t i_axis, AxesUnits units_type) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_axisSize", _wrap_IUnitConverter_axisSize, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_axisSize", _wrap_IUnitConverter_axisSize, METH_VARARGS, "\n"
 		"IUnitConverter_axisSize(IUnitConverter self, size_t i_axis) -> size_t\n"
-		"\n"
 		"virtual size_t IUnitConverter::axisSize(size_t i_axis) const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_axisName", _wrap_IUnitConverter_axisName, METH_VARARGS, (char *)"\n"
-		"axisName(size_t i_axis, AxesUnits units_type) -> std::string\n"
-		"IUnitConverter_axisName(IUnitConverter self, size_t i_axis) -> std::string\n"
-		"\n"
+	 { "IUnitConverter_axisName", _wrap_IUnitConverter_axisName, METH_VARARGS, "\n"
+		"IUnitConverter_axisName(IUnitConverter self, size_t i_axis, AxesUnits units_type=AxesUnits::DEFAULT) -> std::string\n"
 		"std::string IUnitConverter::axisName(size_t i_axis, AxesUnits units_type=AxesUnits::DEFAULT) const\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_availableUnits", _wrap_IUnitConverter_availableUnits, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_availableUnits", _wrap_IUnitConverter_availableUnits, METH_O, "\n"
 		"IUnitConverter_availableUnits(IUnitConverter self) -> std::vector< AxesUnits,std::allocator< AxesUnits > >\n"
-		"\n"
 		"virtual std::vector<AxesUnits> IUnitConverter::availableUnits() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_defaultUnits", _wrap_IUnitConverter_defaultUnits, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_defaultUnits", _wrap_IUnitConverter_defaultUnits, METH_O, "\n"
 		"IUnitConverter_defaultUnits(IUnitConverter self) -> AxesUnits\n"
-		"\n"
 		"virtual AxesUnits IUnitConverter::defaultUnits() const =0\n"
 		"\n"
 		""},
-	 { (char *)"IUnitConverter_swigregister", IUnitConverter_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_IterationInfo", _wrap_new_IterationInfo, METH_VARARGS, (char *)"\n"
+	 { "IUnitConverter_swigregister", IUnitConverter_swigregister, METH_O, NULL},
+	 { "new_IterationInfo", _wrap_new_IterationInfo, METH_NOARGS, "\n"
 		"new_IterationInfo() -> IterationInfo\n"
-		"\n"
 		"IterationInfo::IterationInfo()\n"
 		"\n"
 		""},
-	 { (char *)"IterationInfo_update", _wrap_IterationInfo_update, METH_VARARGS, (char *)"\n"
+	 { "IterationInfo_update", _wrap_IterationInfo_update, METH_VARARGS, "\n"
 		"IterationInfo_update(IterationInfo self, Parameters params, double chi2)\n"
-		"\n"
 		"void IterationInfo::update(const Fit::Parameters &params, double chi2)\n"
 		"\n"
 		""},
-	 { (char *)"IterationInfo_iterationCount", _wrap_IterationInfo_iterationCount, METH_VARARGS, (char *)"\n"
+	 { "IterationInfo_iterationCount", _wrap_IterationInfo_iterationCount, METH_O, "\n"
 		"IterationInfo_iterationCount(IterationInfo self) -> unsigned int\n"
-		"\n"
 		"unsigned IterationInfo::iterationCount() const\n"
 		"\n"
 		"Returns current number of minimizer iterations. \n"
 		"\n"
 		""},
-	 { (char *)"IterationInfo_chi2", _wrap_IterationInfo_chi2, METH_VARARGS, (char *)"\n"
+	 { "IterationInfo_chi2", _wrap_IterationInfo_chi2, METH_O, "\n"
 		"IterationInfo_chi2(IterationInfo self) -> double\n"
-		"\n"
 		"double IterationInfo::chi2() const\n"
 		"\n"
 		""},
-	 { (char *)"IterationInfo_parameters", _wrap_IterationInfo_parameters, METH_VARARGS, (char *)"\n"
+	 { "IterationInfo_parameters", _wrap_IterationInfo_parameters, METH_O, "\n"
 		"IterationInfo_parameters(IterationInfo self) -> Parameters\n"
-		"\n"
 		"Fit::Parameters IterationInfo::parameters() const\n"
 		"\n"
 		""},
-	 { (char *)"IterationInfo_parameterMap", _wrap_IterationInfo_parameterMap, METH_VARARGS, (char *)"\n"
+	 { "IterationInfo_parameterMap", _wrap_IterationInfo_parameterMap, METH_O, "\n"
 		"IterationInfo_parameterMap(IterationInfo self) -> map_string_double_t\n"
-		"\n"
 		"std::map< std::string, double > IterationInfo::parameterMap() const\n"
 		"\n"
 		"Returns map of fit parameter names and its current values. \n"
 		"\n"
 		""},
-	 { (char *)"delete_IterationInfo", _wrap_delete_IterationInfo, METH_VARARGS, (char *)"delete_IterationInfo(IterationInfo self)"},
-	 { (char *)"IterationInfo_swigregister", IterationInfo_swigregister, METH_VARARGS, NULL},
-	 { (char *)"FindPeaks", _wrap_FindPeaks, METH_VARARGS, (char *)"\n"
-		"FindPeaks(Histogram2D hist, double sigma=2, std::string const & option, double threshold=0.05) -> vector_pair_double_t\n"
-		"FindPeaks(Histogram2D hist, double sigma=2, std::string const & option) -> vector_pair_double_t\n"
-		"FindPeaks(Histogram2D hist, double sigma=2) -> vector_pair_double_t\n"
-		"FindPeaks(Histogram2D hist) -> vector_pair_double_t\n"
-		"\n"
+	 { "delete_IterationInfo", _wrap_delete_IterationInfo, METH_O, "delete_IterationInfo(IterationInfo self)"},
+	 { "IterationInfo_swigregister", IterationInfo_swigregister, METH_O, NULL},
+	 { "IterationInfo_swiginit", IterationInfo_swiginit, METH_VARARGS, NULL},
+	 { "FindPeaks", _wrap_FindPeaks, METH_VARARGS, "\n"
+		"FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pair_double_t\n"
 		"std::vector< std::pair< double, double > > SpectrumUtils::FindPeaks(const Histogram2D &hist, double sigma=2, const std::string &option={}, double threshold=0.05)\n"
 		"\n"
 		""},
-	 { (char *)"delete_ScanResolution", _wrap_delete_ScanResolution, METH_VARARGS, (char *)"\n"
+	 { "delete_ScanResolution", _wrap_delete_ScanResolution, METH_O, "\n"
 		"delete_ScanResolution(ScanResolution self)\n"
-		"\n"
 		"ScanResolution::~ScanResolution() override\n"
 		"\n"
 		""},
-	 { (char *)"ScanResolution_scanRelativeResolution", _wrap_ScanResolution_scanRelativeResolution, METH_VARARGS, (char *)"\n"
-		"scanRelativeResolution(RangedDistribution const & distr, double stddev) -> ScanResolution\n"
+	 { "ScanResolution_scanRelativeResolution", _wrap_ScanResolution_scanRelativeResolution, METH_VARARGS, "\n"
+		"ScanResolution_scanRelativeResolution(RangedDistribution const & distr, double stddev) -> ScanResolution\n"
 		"ScanResolution_scanRelativeResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution\n"
 		""},
-	 { (char *)"ScanResolution_scanAbsoluteResolution", _wrap_ScanResolution_scanAbsoluteResolution, METH_VARARGS, (char *)"\n"
-		"scanAbsoluteResolution(RangedDistribution const & distr, double stddev) -> ScanResolution\n"
+	 { "ScanResolution_scanAbsoluteResolution", _wrap_ScanResolution_scanAbsoluteResolution, METH_VARARGS, "\n"
+		"ScanResolution_scanAbsoluteResolution(RangedDistribution const & distr, double stddev) -> ScanResolution\n"
 		"ScanResolution_scanAbsoluteResolution(RangedDistribution const & distr, vdouble1d_t stddevs) -> ScanResolution\n"
 		""},
-	 { (char *)"ScanResolution_swigregister", ScanResolution_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_AngularSpecScan", _wrap_new_AngularSpecScan, METH_VARARGS, (char *)"\n"
+	 { "ScanResolution_swigregister", ScanResolution_swigregister, METH_O, NULL},
+	 { "new_AngularSpecScan", _wrap_new_AngularSpecScan, METH_VARARGS, "\n"
 		"AngularSpecScan(double wl, vdouble1d_t inc_angle)\n"
 		"AngularSpecScan(double wl, IAxis inc_angle)\n"
 		"new_AngularSpecScan(double wl, int nbins, double alpha_i_min, double alpha_i_max) -> AngularSpecScan\n"
-		"\n"
 		"AngularSpecScan::AngularSpecScan(double wl, int nbins, double alpha_i_min, double alpha_i_max)\n"
 		"\n"
 		"Sets angle-defined specular scan. The first parameter is always a wavelength in nm. Second parameter is either a numpy array of incident angles in radians or an  IAxis object with angle values. Alternatively an axis can be defined in-place, then the second passed parameter is the number of bins, third - minimum on-axis angle value, fourth - maximum on-axis angle value. \n"
 		"\n"
 		""},
-	 { (char *)"delete_AngularSpecScan", _wrap_delete_AngularSpecScan, METH_VARARGS, (char *)"\n"
+	 { "delete_AngularSpecScan", _wrap_delete_AngularSpecScan, METH_O, "\n"
 		"delete_AngularSpecScan(AngularSpecScan self)\n"
-		"\n"
 		"AngularSpecScan::~AngularSpecScan() override\n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_clone", _wrap_AngularSpecScan_clone, METH_VARARGS, (char *)"\n"
+	 { "AngularSpecScan_clone", _wrap_AngularSpecScan_clone, METH_O, "\n"
 		"AngularSpecScan_clone(AngularSpecScan self) -> AngularSpecScan\n"
-		"\n"
 		"AngularSpecScan * AngularSpecScan::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setFootprintFactor", _wrap_AngularSpecScan_setFootprintFactor, METH_VARARGS, (char *)"\n"
+	 { "AngularSpecScan_setFootprintFactor", _wrap_AngularSpecScan_setFootprintFactor, METH_VARARGS, "\n"
 		"AngularSpecScan_setFootprintFactor(AngularSpecScan self, IFootprintFactor f_factor)\n"
-		"\n"
 		"void AngularSpecScan::setFootprintFactor(const IFootprintFactor *f_factor)\n"
 		"\n"
 		"Sets footprint correction factor. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setWavelengthResolution", _wrap_AngularSpecScan_setWavelengthResolution, METH_VARARGS, (char *)"\n"
+	 { "AngularSpecScan_setWavelengthResolution", _wrap_AngularSpecScan_setWavelengthResolution, METH_VARARGS, "\n"
 		"AngularSpecScan_setWavelengthResolution(AngularSpecScan self, ScanResolution resolution)\n"
-		"\n"
 		"void AngularSpecScan::setWavelengthResolution(const ScanResolution &resolution)\n"
 		"\n"
 		"Sets wavelength resolution values via  ScanResolution object. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setRelativeWavelengthResolution", _wrap_AngularSpecScan_setRelativeWavelengthResolution, METH_VARARGS, (char *)"\n"
-		"setRelativeWavelengthResolution(RangedDistribution const & distr, double rel_dev)\n"
+	 { "AngularSpecScan_setRelativeWavelengthResolution", _wrap_AngularSpecScan_setRelativeWavelengthResolution, METH_VARARGS, "\n"
+		"AngularSpecScan_setRelativeWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, double rel_dev)\n"
 		"AngularSpecScan_setRelativeWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)\n"
-		"\n"
 		"void AngularSpecScan::setRelativeWavelengthResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)\n"
 		"\n"
 		"Sets wavelength resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setAbsoluteWavelengthResolution", _wrap_AngularSpecScan_setAbsoluteWavelengthResolution, METH_VARARGS, (char *)"\n"
-		"setAbsoluteWavelengthResolution(RangedDistribution const & distr, double std_dev)\n"
+	 { "AngularSpecScan_setAbsoluteWavelengthResolution", _wrap_AngularSpecScan_setAbsoluteWavelengthResolution, METH_VARARGS, "\n"
+		"AngularSpecScan_setAbsoluteWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, double std_dev)\n"
 		"AngularSpecScan_setAbsoluteWavelengthResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)\n"
-		"\n"
 		"void AngularSpecScan::setAbsoluteWavelengthResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)\n"
 		"\n"
 		"Sets wavelength resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setAngleResolution", _wrap_AngularSpecScan_setAngleResolution, METH_VARARGS, (char *)"\n"
+	 { "AngularSpecScan_setAngleResolution", _wrap_AngularSpecScan_setAngleResolution, METH_VARARGS, "\n"
 		"AngularSpecScan_setAngleResolution(AngularSpecScan self, ScanResolution resolution)\n"
-		"\n"
 		"void AngularSpecScan::setAngleResolution(const ScanResolution &resolution)\n"
 		"\n"
 		"Sets angle resolution values via  ScanResolution object. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setRelativeAngularResolution", _wrap_AngularSpecScan_setRelativeAngularResolution, METH_VARARGS, (char *)"\n"
-		"setRelativeAngularResolution(RangedDistribution const & distr, double rel_dev)\n"
+	 { "AngularSpecScan_setRelativeAngularResolution", _wrap_AngularSpecScan_setRelativeAngularResolution, METH_VARARGS, "\n"
+		"AngularSpecScan_setRelativeAngularResolution(AngularSpecScan self, RangedDistribution const & distr, double rel_dev)\n"
 		"AngularSpecScan_setRelativeAngularResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)\n"
-		"\n"
 		"void AngularSpecScan::setRelativeAngularResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)\n"
 		"\n"
 		"Sets angular resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_setAbsoluteAngularResolution", _wrap_AngularSpecScan_setAbsoluteAngularResolution, METH_VARARGS, (char *)"\n"
-		"setAbsoluteAngularResolution(RangedDistribution const & distr, double std_dev)\n"
+	 { "AngularSpecScan_setAbsoluteAngularResolution", _wrap_AngularSpecScan_setAbsoluteAngularResolution, METH_VARARGS, "\n"
+		"AngularSpecScan_setAbsoluteAngularResolution(AngularSpecScan self, RangedDistribution const & distr, double std_dev)\n"
 		"AngularSpecScan_setAbsoluteAngularResolution(AngularSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)\n"
-		"\n"
 		"void AngularSpecScan::setAbsoluteAngularResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)\n"
 		"\n"
 		"Sets angular resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the inclination angle axis. \n"
 		"\n"
 		""},
-	 { (char *)"AngularSpecScan_swigregister", AngularSpecScan_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_QSpecScan", _wrap_new_QSpecScan, METH_VARARGS, (char *)"\n"
+	 { "AngularSpecScan_swigregister", AngularSpecScan_swigregister, METH_O, NULL},
+	 { "AngularSpecScan_swiginit", AngularSpecScan_swiginit, METH_VARARGS, NULL},
+	 { "new_QSpecScan", _wrap_new_QSpecScan, METH_VARARGS, "\n"
 		"QSpecScan(vdouble1d_t qs_nm)\n"
 		"QSpecScan(IAxis qs_nm)\n"
 		"new_QSpecScan(int nbins, double qz_min, double qz_max) -> QSpecScan\n"
-		"\n"
 		"QSpecScan::QSpecScan(int nbins, double qz_min, double qz_max)\n"
 		"\n"
 		"Sets q-defined specular scan. Accepts either numpy array of q-values sorted in ascending order or an  IAxis object with q-values. Alternatively an axis can be defined in-place, then the first passed parameter is the number of bins, second - minimum on-axis q-value, third - maximum on-axis q_value. \n"
 		"\n"
 		""},
-	 { (char *)"delete_QSpecScan", _wrap_delete_QSpecScan, METH_VARARGS, (char *)"\n"
+	 { "delete_QSpecScan", _wrap_delete_QSpecScan, METH_O, "\n"
 		"delete_QSpecScan(QSpecScan self)\n"
-		"\n"
 		"QSpecScan::~QSpecScan() override\n"
 		"\n"
 		""},
-	 { (char *)"QSpecScan_clone", _wrap_QSpecScan_clone, METH_VARARGS, (char *)"\n"
+	 { "QSpecScan_clone", _wrap_QSpecScan_clone, METH_O, "\n"
 		"QSpecScan_clone(QSpecScan self) -> QSpecScan\n"
-		"\n"
 		"QSpecScan * QSpecScan::clone() const override\n"
 		"\n"
 		""},
-	 { (char *)"QSpecScan_setQResolution", _wrap_QSpecScan_setQResolution, METH_VARARGS, (char *)"\n"
+	 { "QSpecScan_setQResolution", _wrap_QSpecScan_setQResolution, METH_VARARGS, "\n"
 		"QSpecScan_setQResolution(QSpecScan self, ScanResolution resolution)\n"
-		"\n"
 		"void QSpecScan::setQResolution(const ScanResolution &resolution)\n"
 		"\n"
 		"Sets q resolution values via  ScanResolution object. \n"
 		"\n"
 		""},
-	 { (char *)"QSpecScan_setRelativeQResolution", _wrap_QSpecScan_setRelativeQResolution, METH_VARARGS, (char *)"\n"
-		"setRelativeQResolution(RangedDistribution const & distr, double rel_dev)\n"
+	 { "QSpecScan_setRelativeQResolution", _wrap_QSpecScan_setRelativeQResolution, METH_VARARGS, "\n"
+		"QSpecScan_setRelativeQResolution(QSpecScan self, RangedDistribution const & distr, double rel_dev)\n"
 		"QSpecScan_setRelativeQResolution(QSpecScan self, RangedDistribution const & distr, vdouble1d_t rel_dev)\n"
-		"\n"
 		"void QSpecScan::setRelativeQResolution(const RangedDistribution &distr, const std::vector< double > &rel_dev)\n"
 		"\n"
 		"Sets qz resolution values via  RangedDistribution and values of relative deviations (that is,  rel_dev equals standard deviation divided by the mean value).  rel_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the qz-axis. \n"
 		"\n"
 		""},
-	 { (char *)"QSpecScan_setAbsoluteQResolution", _wrap_QSpecScan_setAbsoluteQResolution, METH_VARARGS, (char *)"\n"
-		"setAbsoluteQResolution(RangedDistribution const & distr, double std_dev)\n"
+	 { "QSpecScan_setAbsoluteQResolution", _wrap_QSpecScan_setAbsoluteQResolution, METH_VARARGS, "\n"
+		"QSpecScan_setAbsoluteQResolution(QSpecScan self, RangedDistribution const & distr, double std_dev)\n"
 		"QSpecScan_setAbsoluteQResolution(QSpecScan self, RangedDistribution const & distr, vdouble1d_t std_dev)\n"
-		"\n"
 		"void QSpecScan::setAbsoluteQResolution(const RangedDistribution &distr, const std::vector< double > &std_dev)\n"
 		"\n"
 		"Sets qz resolution values via  RangedDistribution and values of standard deviations.  std_dev can be either single-valued or a numpy array. In the latter case the length of the array should coinside with the length of the qz-axis. \n"
 		"\n"
 		""},
-	 { (char *)"QSpecScan_swigregister", QSpecScan_swigregister, METH_VARARGS, NULL},
+	 { "QSpecScan_swigregister", QSpecScan_swigregister, METH_O, NULL},
+	 { "QSpecScan_swiginit", QSpecScan_swiginit, METH_VARARGS, NULL},
+	 { NULL, NULL, 0, NULL }
+};
+
+static PyMethodDef SwigMethods_proxydocs[] = {
 	 { NULL, NULL, 0, NULL }
 };
 
@@ -142600,7 +138346,6 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato
 static swig_type_info _swigt__p_bool = {"_p_bool", "bool *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_const_iterator = {"_p_const_iterator", "const_iterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_reference *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_corr_matrix_t = {"_p_corr_matrix_t", "corr_matrix_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
@@ -142613,7 +138358,6 @@ static swig_type_info _swigt__p_mapped_type = {"_p_mapped_type", "mapped_type *"
 static swig_type_info _swigt__p_observer_t = {"_p_observer_t", "observer_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_parameters_t = {"_p_parameters_t", "parameters_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_second_type = {"_p_second_type", "second_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0};
@@ -142945,7 +138689,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_bool,
   &_swigt__p_char,
   &_swigt__p_const_iterator,
-  &_swigt__p_const_reference,
   &_swigt__p_corr_matrix_t,
   &_swigt__p_difference_type,
   &_swigt__p_double,
@@ -142958,7 +138701,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_observer_t,
   &_swigt__p_p_PyObject,
   &_swigt__p_parameters_t,
-  &_swigt__p_reference,
   &_swigt__p_second_type,
   &_swigt__p_short,
   &_swigt__p_signed_char,
@@ -143290,7 +139032,6 @@ static swig_cast_info _swigc__p_allocator_type[] = {  {&_swigt__p_allocator_type
 static swig_cast_info _swigc__p_bool[] = {  {&_swigt__p_bool, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_const_iterator[] = {  {&_swigt__p_const_iterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_const_reference[] = {  {&_swigt__p_const_reference, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_corr_matrix_t[] = {  {&_swigt__p_corr_matrix_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_difference_type[] = {  {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
@@ -143303,7 +139044,6 @@ static swig_cast_info _swigc__p_mapped_type[] = {  {&_swigt__p_mapped_type, 0, 0
 static swig_cast_info _swigc__p_observer_t[] = {  {&_swigt__p_observer_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_PyObject[] = {  {&_swigt__p_p_PyObject, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_parameters_t[] = {  {&_swigt__p_parameters_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_reference[] = {  {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_second_type[] = {  {&_swigt__p_second_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -143635,7 +139375,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_bool,
   _swigc__p_char,
   _swigc__p_const_iterator,
-  _swigc__p_const_reference,
   _swigc__p_corr_matrix_t,
   _swigc__p_difference_type,
   _swigc__p_double,
@@ -143648,7 +139387,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_observer_t,
   _swigc__p_p_PyObject,
   _swigc__p_parameters_t,
-  _swigc__p_reference,
   _swigc__p_second_type,
   _swigc__p_short,
   _swigc__p_signed_char,
@@ -143822,7 +139560,7 @@ SWIG_InitializeModule(void *clientdata) {
   
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
-  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+  printf("SWIG_InitializeModule: size %lu\n", (unsigned long)swig_module.size);
 #endif
   for (i = 0; i < swig_module.size; ++i) {
     swig_type_info *type = 0;
@@ -143830,7 +139568,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_cast_info *cast;
     
 #ifdef SWIGRUNTIME_DEBUG
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
 #endif
     
     /* if there is another module already loaded */
@@ -143905,7 +139643,7 @@ SWIG_InitializeModule(void *clientdata) {
   for (i = 0; i < swig_module.size; ++i) {
     int j = 0;
     swig_cast_info *cast = swig_module.cast_initial[i];
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
     while (cast->type) {
       printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
       cast++;
@@ -144027,17 +139765,6 @@ extern "C" {
     return str;
   }
   
-  SWIGINTERN int
-  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-    char *tmp;
-    PyObject *str = swig_varlink_str(v);
-    fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(str);
-    return 0;
-  }
-  
   SWIGINTERN void
   swig_varlink_dealloc(swig_varlinkobject *v) {
     swig_globalvar *var = v->vars;
@@ -144096,11 +139823,11 @@ extern "C" {
         PyObject_HEAD_INIT(NULL)
         0,                                  /* ob_size */
 #endif
-        (char *)"swigvarlink",              /* tp_name */
+        "swigvarlink",                      /* tp_name */
         sizeof(swig_varlinkobject),         /* tp_basicsize */
         0,                                  /* tp_itemsize */
         (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-        (printfunc) swig_varlink_print,     /* tp_print */
+        0,                                  /* tp_print */
         (getattrfunc) swig_varlink_getattr, /* tp_getattr */
         (setattrfunc) swig_varlink_setattr, /* tp_setattr */
         0,                                  /* tp_compare */
@@ -144120,15 +139847,9 @@ extern "C" {
         0,                                  /* tp_clear */
         0,                                  /* tp_richcompare */
         0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
         0,                                  /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
         0,                                  /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
         0,                                  /* tp_finalize */
 #endif
@@ -144136,20 +139857,14 @@ extern "C" {
         0,                                  /* tp_allocs */
         0,                                  /* tp_frees */
         0,                                  /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
         0,                                  /* tp_prev */
-#endif
         0                                   /* tp_next */
 #endif
       };
       varlink_type = tmp;
       type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-      varlink_type.ob_type = &PyType_Type;
-#else
       if (PyType_Ready(&varlink_type) < 0)
       return NULL;
-#endif
     }
     return &varlink_type;
   }
@@ -144165,14 +139880,14 @@ extern "C" {
   }
   
   SWIGINTERN void 
-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+  SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
     swig_varlinkobject *v = (swig_varlinkobject *) p;
     swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
     if (gv) {
       size_t size = strlen(name)+1;
       gv->name = (char *)malloc(size);
       if (gv->name) {
-        strncpy(gv->name,name,size);
+        memcpy(gv->name, name, size);
         gv->get_attr = get_attr;
         gv->set_attr = set_attr;
         gv->next = v->vars;
@@ -144183,9 +139898,11 @@ extern "C" {
   
   SWIGINTERN PyObject *
   SWIG_globals(void) {
-    static PyObject *_SWIG_globals = 0; 
-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
-    return _SWIG_globals;
+    static PyObject *globals = 0;
+    if (!globals) {
+      globals = SWIG_newvarlink();
+    }
+    return globals;
   }
   
   /* -----------------------------------------------------------------------------
@@ -144251,9 +139968,9 @@ extern "C" {
             char *ndoc = (char*)malloc(ldoc + lptr + 10);
             if (ndoc) {
               char *buff = ndoc;
-              strncpy(buff, methods[i].ml_doc, ldoc);
+              memcpy(buff, methods[i].ml_doc, ldoc);
               buff += ldoc;
-              strncpy(buff, "swig_ptr: ", 10);
+              memcpy(buff, "swig_ptr: ", 10);
               buff += 10;
               SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
               methods[i].ml_doc = ndoc;
@@ -144264,6 +139981,64 @@ extern "C" {
     }
   } 
   
+  /* -----------------------------------------------------------------------------
+   * Method creation and docstring support functions
+   * ----------------------------------------------------------------------------- */
+  
+  /* -----------------------------------------------------------------------------
+   * Function to find the method definition with the correct docstring for the
+   * proxy module as opposed to the low-level API
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name) {
+    /* Find the function in the modified method table */
+    size_t offset = 0;
+    int found = 0;
+    while (SwigMethods_proxydocs[offset].ml_meth != NULL) {
+      if (strcmp(SwigMethods_proxydocs[offset].ml_name, name) == 0) {
+        found = 1;
+        break;
+      }
+      offset++;
+    }
+    /* Use the copy with the modified docstring if available */
+    return found ? &SwigMethods_proxydocs[offset] : NULL;
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * Wrapper of PyInstanceMethod_New() used in Python 3
+   * It is exported to the generated module, used for -fastproxy
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
+    if (PyCFunction_Check(func)) {
+      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
+      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
+      if (ml)
+      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
+    }
+#if PY_VERSION_HEX >= 0x03000000
+    return PyInstanceMethod_New(func);
+#else
+    return PyMethod_New(func, NULL, NULL);
+#endif
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * Wrapper of PyStaticMethod_New()
+   * It is exported to the generated module, used for -fastproxy
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
+    if (PyCFunction_Check(func)) {
+      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
+      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
+      if (ml)
+      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
+    }
+    return PyStaticMethod_New(func);
+  }
+  
 #ifdef __cplusplus
 }
 #endif
@@ -144283,20 +140058,12 @@ PyObject*
 void
 #endif
 SWIG_init(void) {
-  PyObject *m, *d, *md;
+  PyObject *m, *d, *md, *globals;
+  
 #if PY_VERSION_HEX >= 0x03000000
   static struct PyModuleDef SWIG_module = {
-# if PY_VERSION_HEX >= 0x03020000
     PyModuleDef_HEAD_INIT,
-# else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-# endif
-    (char *) SWIG_name,
+    SWIG_name,
     NULL,
     -1,
     SwigMethods,
@@ -144315,8 +140082,8 @@ SWIG_init(void) {
     (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
   };
   static SwigPyGetSet thisown_getset_closure = {
-    (PyCFunction) SwigPyObject_own,
-    (PyCFunction) SwigPyObject_own
+    SwigPyObject_own,
+    SwigPyObject_own
   };
   static PyGetSetDef thisown_getset_def = {
     (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
@@ -144347,13 +140114,23 @@ SWIG_init(void) {
   assert(metatype);
 #endif
   
+  (void)globals;
+  
+  /* Create singletons now to avoid potential deadlocks with multi-threaded usage after module initialization */
+  SWIG_This();
+  SWIG_Python_TypeCache();
+  SwigPyPacked_type();
+#ifndef SWIGPYTHON_BUILTIN
+  SwigPyObject_type();
+#endif
+  
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
 #if PY_VERSION_HEX >= 0x03000000
   m = PyModule_Create(&SWIG_module);
 #else
-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+  m = Py_InitModule(SWIG_name, SwigMethods);
 #endif
   
   md = d = PyModule_GetDict(m);
@@ -144403,30 +140180,44 @@ SWIG_init(void) {
   
   SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
   
+  // thread safe initialization
+  swig::container_owner_attribute();
+  
+  
   import_array();
   
-  PyDict_SetItemString(md,(char *)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char *)"major_version_number",Swig_var_major_version_number_get, Swig_var_major_version_number_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"minor_version_number",Swig_var_minor_version_number_get, Swig_var_minor_version_number_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"patch_version_number",Swig_var_patch_version_number_get, Swig_var_patch_version_number_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"nanometer",Swig_var_nanometer_get, Swig_var_nanometer_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"angstrom",Swig_var_angstrom_get, Swig_var_angstrom_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"micrometer",Swig_var_micrometer_get, Swig_var_micrometer_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"millimeter",Swig_var_millimeter_get, Swig_var_millimeter_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"meter",Swig_var_meter_get, Swig_var_meter_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"nm",Swig_var_nm_get, Swig_var_nm_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"nm2",Swig_var_nm2_get, Swig_var_nm2_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"barn",Swig_var_barn_get, Swig_var_barn_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"radian",Swig_var_radian_get, Swig_var_radian_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"milliradian",Swig_var_milliradian_get, Swig_var_milliradian_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"degree",Swig_var_degree_get, Swig_var_degree_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"steradian",Swig_var_steradian_get, Swig_var_steradian_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"rad",Swig_var_rad_get, Swig_var_rad_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"mrad",Swig_var_mrad_get, Swig_var_mrad_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"sr",Swig_var_sr_get, Swig_var_sr_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"deg",Swig_var_deg_get, Swig_var_deg_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"tesla",Swig_var_tesla_get, Swig_var_tesla_set);
-  SWIG_addvarlink(SWIG_globals(),(char *)"gauss",Swig_var_gauss_get, Swig_var_gauss_set);
+  globals = SWIG_globals();
+  if (!globals) {
+    PyErr_SetString(PyExc_TypeError, "Failure to create SWIG globals.");
+#if PY_VERSION_HEX >= 0x03000000
+    return NULL;
+#else
+    return;
+#endif
+  }
+  PyDict_SetItemString(md, "cvar", globals);
+  Py_DECREF(globals);
+  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_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);
+  SWIG_addvarlink(globals, "millimeter", Swig_var_millimeter_get, Swig_var_millimeter_set);
+  SWIG_addvarlink(globals, "meter", Swig_var_meter_get, Swig_var_meter_set);
+  SWIG_addvarlink(globals, "nm", Swig_var_nm_get, Swig_var_nm_set);
+  SWIG_addvarlink(globals, "nm2", Swig_var_nm2_get, Swig_var_nm2_set);
+  SWIG_addvarlink(globals, "barn", Swig_var_barn_get, Swig_var_barn_set);
+  SWIG_addvarlink(globals, "radian", Swig_var_radian_get, Swig_var_radian_set);
+  SWIG_addvarlink(globals, "milliradian", Swig_var_milliradian_get, Swig_var_milliradian_set);
+  SWIG_addvarlink(globals, "degree", Swig_var_degree_get, Swig_var_degree_set);
+  SWIG_addvarlink(globals, "steradian", Swig_var_steradian_get, Swig_var_steradian_set);
+  SWIG_addvarlink(globals, "rad", Swig_var_rad_get, Swig_var_rad_set);
+  SWIG_addvarlink(globals, "mrad", Swig_var_mrad_get, Swig_var_mrad_set);
+  SWIG_addvarlink(globals, "sr", Swig_var_sr_get, Swig_var_sr_set);
+  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_Python_SetConstant(d, "IHistogram_INTEGRAL",SWIG_From_int(static_cast< int >(IHistogram::INTEGRAL)));
diff --git a/auto/Wrap/libBornAgainCore_wrap.h b/auto/Wrap/libBornAgainCore_wrap.h
index 10432ab279a44b97411a86b647958e262bb97da9..16df47111a7e4cde0429410621f37eaf52ccc688 100644
--- a/auto/Wrap/libBornAgainCore_wrap.h
+++ b/auto/Wrap/libBornAgainCore_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -89,7 +89,7 @@ public:
     virtual void onChange();
     virtual void accept(INodeVisitor *visitor) const;
     virtual std::string treeToString() const;
-    virtual std::vector< INode const *,std::allocator< INode const * > > getChildren() const;
+    virtual std::vector< INode const *, std::allocator< INode const * > > getChildren() const;
     virtual void setParent(INode const *newParent);
 
 /* Internal director utilities */
@@ -138,7 +138,7 @@ public:
     virtual void onChange();
     virtual void accept(INodeVisitor *visitor) const;
     virtual std::string treeToString() const;
-    virtual std::vector< INode const *,std::allocator< INode const * > > getChildren() const;
+    virtual std::vector< INode const *, std::allocator< INode const * > > getChildren() const;
     virtual void setParent(INode const *newParent);
     virtual Material const *material() const;
 
@@ -267,7 +267,7 @@ public:
     SwigDirector_FitObjective(PyObject *self);
     virtual ~SwigDirector_FitObjective();
     virtual double evaluate(Fit::Parameters const &params);
-    virtual std::vector< double,std::allocator< double > > evaluate_residuals(Fit::Parameters const &params);
+    virtual std::vector< double, std::allocator< double > > evaluate_residuals(Fit::Parameters const &params);
 
 /* Internal director utilities */
 public:
@@ -361,7 +361,7 @@ public:
     virtual void onChange();
     virtual void accept(INodeVisitor *visitor) const;
     virtual std::string treeToString() const;
-    virtual std::vector< INode const *,std::allocator< INode const * > > getChildren() const;
+    virtual std::vector< INode const *, std::allocator< INode const * > > getChildren() const;
     virtual void setParent(INode const *newParent);
     virtual Material const *material() const;
     virtual void setAmbientMaterial(Material arg0);
@@ -425,7 +425,7 @@ public:
     virtual void onChange();
     virtual void accept(INodeVisitor *visitor) const;
     virtual std::string treeToString() const;
-    virtual std::vector< INode const *,std::allocator< INode const * > > getChildren() const;
+    virtual std::vector< INode const *, std::allocator< INode const * > > getChildren() const;
     virtual void setParent(INode const *newParent);
     virtual Material const *material() const;
     virtual void setAmbientMaterial(Material arg0);
@@ -491,7 +491,7 @@ public:
     virtual void onChange();
     virtual void accept(INodeVisitor *visitor) const;
     virtual std::string treeToString() const;
-    virtual std::vector< INode const *,std::allocator< INode const * > > getChildren() const;
+    virtual std::vector< INode const *, std::allocator< INode const * > > getChildren() const;
     virtual void setParent(INode const *newParent);
     virtual Material const *material() const;
     virtual double evaluate(kvector_t const q, double outer_iff = 1.0) const;
diff --git a/auto/Wrap/libBornAgainFit.py b/auto/Wrap/libBornAgainFit.py
index 345b42bdd43d5ba310fd8726977290575067add4..804284749c37a543dac370bf2c6c0b29dfeed88c 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -1,85 +1,20 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.12
+# Version 4.0.1
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 from sys import version_info as _swig_python_version_info
-if _swig_python_version_info >= (2, 7, 0):
-    def swig_import_helper():
-        import importlib
-        pkg = __name__.rpartition('.')[0]
-        mname = '.'.join((pkg, '_libBornAgainFit')).lstrip('.')
-        try:
-            return importlib.import_module(mname)
-        except ImportError:
-            return importlib.import_module('_libBornAgainFit')
-    _libBornAgainFit = swig_import_helper()
-    del swig_import_helper
-elif _swig_python_version_info >= (2, 6, 0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_libBornAgainFit', [dirname(__file__)])
-        except ImportError:
-            import _libBornAgainFit
-            return _libBornAgainFit
-        try:
-            _mod = imp.load_module('_libBornAgainFit', fp, pathname, description)
-        finally:
-            if fp is not None:
-                fp.close()
-        return _mod
-    _libBornAgainFit = swig_import_helper()
-    del swig_import_helper
-else:
-    import _libBornAgainFit
-del _swig_python_version_info
+if _swig_python_version_info < (2, 7, 0):
+    raise RuntimeError("Python 2.7 or later required")
 
-try:
-    _swig_property = property
-except NameError:
-    pass  # Python < 2.2 doesn't have 'property'.
+import _libBornAgainFit
 
 try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
 
-def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
-    if (name == "thisown"):
-        return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name, None)
-    if method:
-        return method(self, value)
-    if (not static):
-        if _newclass:
-            object.__setattr__(self, name, value)
-        else:
-            self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-
-def _swig_setattr(self, class_type, name, value):
-    return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-
-
-def _swig_getattr(self, class_type, name):
-    if (name == "thisown"):
-        return self.this.own()
-    method = class_type.__swig_getmethods__.get(name, None)
-    if method:
-        return method(self)
-    raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
-
-
 def _swig_repr(self):
     try:
         strthis = "proxy of " + self.this.__repr__()
@@ -87,1361 +22,1131 @@ def _swig_repr(self):
         strthis = ""
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
-try:
-    _object = object
-    _newclass = 1
-except __builtin__.Exception:
-    class _object:
-        pass
-    _newclass = 0
 
-try:
-    import weakref
-    weakref_proxy = weakref.proxy
-except __builtin__.Exception:
-    weakref_proxy = lambda x: x
+def _swig_setattr_nondynamic_instance_variable(set):
+    def set_instance_attr(self, name, value):
+        if name == "thisown":
+            self.this.own(value)
+        elif name == "this":
+            set(self, name, value)
+        elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add instance attributes to %s" % self)
+    return set_instance_attr
+
+
+def _swig_setattr_nondynamic_class_variable(set):
+    def set_class_attr(cls, name, value):
+        if hasattr(cls, name) and not isinstance(getattr(cls, name), property):
+            set(cls, name, value)
+        else:
+            raise AttributeError("You cannot add class attributes to %s" % cls)
+    return set_class_attr
+
 
+def _swig_add_metaclass(metaclass):
+    """Class decorator for adding a metaclass to a SWIG wrapped class - a slimmed down version of six.add_metaclass"""
+    def wrapper(cls):
+        return metaclass(cls.__name__, cls.__bases__, cls.__dict__.copy())
+    return wrapper
 
-class SwigPyIterator(_object):
-    """Proxy of C++ swig::SwigPyIterator class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SwigPyIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SwigPyIterator, name)
+class _SwigNonDynamicMeta(type):
+    """Meta class to enforce nondynamic attributes (no new attributes) for a class"""
+    __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
+
+
+import weakref
+
+class SwigPyIterator(object):
+    r"""Proxy of C++ swig::SwigPyIterator class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainFit.delete_SwigPyIterator
-    __del__ = lambda self: None
 
     def value(self):
-        """value(SwigPyIterator self) -> PyObject *"""
+        r"""value(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainFit.SwigPyIterator_value(self)
 
-
     def incr(self, n=1):
-        """
-        incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator
-        incr(SwigPyIterator self) -> SwigPyIterator
-        """
+        r"""incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator_incr(self, n)
 
-
     def decr(self, n=1):
-        """
-        decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator
-        decr(SwigPyIterator self) -> SwigPyIterator
-        """
+        r"""decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator_decr(self, n)
 
-
     def distance(self, x):
-        """distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"""
+        r"""distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"""
         return _libBornAgainFit.SwigPyIterator_distance(self, x)
 
-
     def equal(self, x):
-        """equal(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""equal(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainFit.SwigPyIterator_equal(self, x)
 
-
     def copy(self):
-        """copy(SwigPyIterator self) -> SwigPyIterator"""
+        r"""copy(SwigPyIterator self) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator_copy(self)
 
-
     def next(self):
-        """next(SwigPyIterator self) -> PyObject *"""
+        r"""next(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainFit.SwigPyIterator_next(self)
 
-
     def __next__(self):
-        """__next__(SwigPyIterator self) -> PyObject *"""
+        r"""__next__(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainFit.SwigPyIterator___next__(self)
 
-
     def previous(self):
-        """previous(SwigPyIterator self) -> PyObject *"""
+        r"""previous(SwigPyIterator self) -> PyObject *"""
         return _libBornAgainFit.SwigPyIterator_previous(self)
 
-
     def advance(self, n):
-        """advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator_advance(self, n)
 
-
     def __eq__(self, x):
-        """__eq__(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""__eq__(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainFit.SwigPyIterator___eq__(self, x)
 
-
     def __ne__(self, x):
-        """__ne__(SwigPyIterator self, SwigPyIterator x) -> bool"""
+        r"""__ne__(SwigPyIterator self, SwigPyIterator x) -> bool"""
         return _libBornAgainFit.SwigPyIterator___ne__(self, x)
 
-
     def __iadd__(self, n):
-        """__iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator___iadd__(self, n)
 
-
     def __isub__(self, n):
-        """__isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator___isub__(self, n)
 
-
     def __add__(self, n):
-        """__add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
+        r"""__add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"""
         return _libBornAgainFit.SwigPyIterator___add__(self, n)
 
-
     def __sub__(self, *args):
-        """
+        r"""
         __sub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator
         __sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t
         """
         return _libBornAgainFit.SwigPyIterator___sub__(self, *args)
-
     def __iter__(self):
         return self
-SwigPyIterator_swigregister = _libBornAgainFit.SwigPyIterator_swigregister
-SwigPyIterator_swigregister(SwigPyIterator)
+
+# Register SwigPyIterator in _libBornAgainFit:
+_libBornAgainFit.SwigPyIterator_swigregister(SwigPyIterator)
 
 SHARED_PTR_DISOWN = _libBornAgainFit.SHARED_PTR_DISOWN
-class vdouble1d_t(_object):
-    """Proxy of C++ std::vector<(double)> class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble1d_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vdouble1d_t, name)
+class vdouble1d_t(object):
+    r"""Proxy of C++ std::vector< double > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vdouble1d_t self) -> SwigPyIterator"""
+        r"""iterator(vdouble1d_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vdouble1d_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vdouble1d_t self) -> bool"""
+        r"""__nonzero__(vdouble1d_t self) -> bool"""
         return _libBornAgainFit.vdouble1d_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vdouble1d_t self) -> bool"""
+        r"""__bool__(vdouble1d_t self) -> bool"""
         return _libBornAgainFit.vdouble1d_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""__len__(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainFit.vdouble1d_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"""
+        r"""__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"""
         return _libBornAgainFit.vdouble1d_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)
         __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)
         """
         return _libBornAgainFit.vdouble1d_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"""
+        r"""__delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"""
         return _libBornAgainFit.vdouble1d_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vdouble1d_t self, std::vector< double >::difference_type i)
         __delitem__(vdouble1d_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vdouble1d_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vdouble1d_t self, PySliceObject * slice) -> vdouble1d_t
         __getitem__(vdouble1d_t self, std::vector< double >::difference_type i) -> std::vector< double >::value_type const &
         """
         return _libBornAgainFit.vdouble1d_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vdouble1d_t self, PySliceObject * slice, vdouble1d_t v)
         __setitem__(vdouble1d_t self, PySliceObject * slice)
         __setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)
         """
         return _libBornAgainFit.vdouble1d_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vdouble1d_t self) -> std::vector< double >::value_type"""
+        r"""pop(vdouble1d_t self) -> std::vector< double >::value_type"""
         return _libBornAgainFit.vdouble1d_t_pop(self)
 
-
     def append(self, x):
-        """append(vdouble1d_t self, std::vector< double >::value_type const & x)"""
+        r"""append(vdouble1d_t self, std::vector< double >::value_type const & x)"""
         return _libBornAgainFit.vdouble1d_t_append(self, x)
 
-
     def empty(self):
-        """empty(vdouble1d_t self) -> bool"""
+        r"""empty(vdouble1d_t self) -> bool"""
         return _libBornAgainFit.vdouble1d_t_empty(self)
 
-
     def size(self):
-        """size(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""size(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainFit.vdouble1d_t_size(self)
 
-
     def swap(self, v):
-        """swap(vdouble1d_t self, vdouble1d_t v)"""
+        r"""swap(vdouble1d_t self, vdouble1d_t v)"""
         return _libBornAgainFit.vdouble1d_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vdouble1d_t self) -> std::vector< double >::iterator"""
+        r"""begin(vdouble1d_t self) -> std::vector< double >::iterator"""
         return _libBornAgainFit.vdouble1d_t_begin(self)
 
-
     def end(self):
-        """end(vdouble1d_t self) -> std::vector< double >::iterator"""
+        r"""end(vdouble1d_t self) -> std::vector< double >::iterator"""
         return _libBornAgainFit.vdouble1d_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
+        r"""rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
         return _libBornAgainFit.vdouble1d_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
+        r"""rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"""
         return _libBornAgainFit.vdouble1d_t_rend(self)
 
-
     def clear(self):
-        """clear(vdouble1d_t self)"""
+        r"""clear(vdouble1d_t self)"""
         return _libBornAgainFit.vdouble1d_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"""
+        r"""get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"""
         return _libBornAgainFit.vdouble1d_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vdouble1d_t self)"""
+        r"""pop_back(vdouble1d_t self)"""
         return _libBornAgainFit.vdouble1d_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vdouble1d_t self, std::vector< double >::iterator pos) -> std::vector< double >::iterator
         erase(vdouble1d_t self, std::vector< double >::iterator first, std::vector< double >::iterator last) -> std::vector< double >::iterator
         """
         return _libBornAgainFit.vdouble1d_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vdouble1d_t self) -> vdouble1d_t
+        __init__(vdouble1d_t self, vdouble1d_t other) -> vdouble1d_t
+        __init__(vdouble1d_t self, std::vector< double >::size_type size) -> vdouble1d_t
+        __init__(vdouble1d_t self, std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t
         """
-        __init__(std::vector<(double)> self) -> vdouble1d_t
-        __init__(std::vector<(double)> self, vdouble1d_t arg2) -> vdouble1d_t
-        __init__(std::vector<(double)> self, std::vector< double >::size_type size) -> vdouble1d_t
-        __init__(std::vector<(double)> self, std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t
-        """
-        this = _libBornAgainFit.new_vdouble1d_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vdouble1d_t_swiginit(self, _libBornAgainFit.new_vdouble1d_t(*args))
 
     def push_back(self, x):
-        """push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"""
+        r"""push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"""
         return _libBornAgainFit.vdouble1d_t_push_back(self, x)
 
-
     def front(self):
-        """front(vdouble1d_t self) -> std::vector< double >::value_type const &"""
+        r"""front(vdouble1d_t self) -> std::vector< double >::value_type const &"""
         return _libBornAgainFit.vdouble1d_t_front(self)
 
-
     def back(self):
-        """back(vdouble1d_t self) -> std::vector< double >::value_type const &"""
+        r"""back(vdouble1d_t self) -> std::vector< double >::value_type const &"""
         return _libBornAgainFit.vdouble1d_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"""
+        r"""assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"""
         return _libBornAgainFit.vdouble1d_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vdouble1d_t self, std::vector< double >::size_type new_size)
         resize(vdouble1d_t self, std::vector< double >::size_type new_size, std::vector< double >::value_type const & x)
         """
         return _libBornAgainFit.vdouble1d_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator
         insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::size_type n, std::vector< double >::value_type const & x)
         """
         return _libBornAgainFit.vdouble1d_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vdouble1d_t self, std::vector< double >::size_type n)"""
+        r"""reserve(vdouble1d_t self, std::vector< double >::size_type n)"""
         return _libBornAgainFit.vdouble1d_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vdouble1d_t self) -> std::vector< double >::size_type"""
+        r"""capacity(vdouble1d_t self) -> std::vector< double >::size_type"""
         return _libBornAgainFit.vdouble1d_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vdouble1d_t
-    __del__ = lambda self: None
-vdouble1d_t_swigregister = _libBornAgainFit.vdouble1d_t_swigregister
-vdouble1d_t_swigregister(vdouble1d_t)
 
-class vdouble2d_t(_object):
-    """Proxy of C++ std::vector<(std::vector<(double)>)> class."""
+# Register vdouble1d_t in _libBornAgainFit:
+_libBornAgainFit.vdouble1d_t_swigregister(vdouble1d_t)
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble2d_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vdouble2d_t, name)
+class vdouble2d_t(object):
+    r"""Proxy of C++ std::vector< std::vector< double > > class."""
+
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vdouble2d_t self) -> SwigPyIterator"""
+        r"""iterator(vdouble2d_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vdouble2d_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vdouble2d_t self) -> bool"""
+        r"""__nonzero__(vdouble2d_t self) -> bool"""
         return _libBornAgainFit.vdouble2d_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vdouble2d_t self) -> bool"""
+        r"""__bool__(vdouble2d_t self) -> bool"""
         return _libBornAgainFit.vdouble2d_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""__len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainFit.vdouble2d_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"""
+        r"""__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"""
         return _libBornAgainFit.vdouble2d_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)
         __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)
         """
         return _libBornAgainFit.vdouble2d_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"""
+        r"""__delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"""
         return _libBornAgainFit.vdouble2d_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i)
         __delitem__(vdouble2d_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vdouble2d_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vdouble2d_t self, PySliceObject * slice) -> vdouble2d_t
         __getitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i) -> vdouble1d_t
         """
         return _libBornAgainFit.vdouble2d_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vdouble2d_t self, PySliceObject * slice, vdouble2d_t v)
         __setitem__(vdouble2d_t self, PySliceObject * slice)
         __setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)
         """
         return _libBornAgainFit.vdouble2d_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vdouble2d_t self) -> vdouble1d_t"""
+        r"""pop(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainFit.vdouble2d_t_pop(self)
 
-
     def append(self, x):
-        """append(vdouble2d_t self, vdouble1d_t x)"""
+        r"""append(vdouble2d_t self, vdouble1d_t x)"""
         return _libBornAgainFit.vdouble2d_t_append(self, x)
 
-
     def empty(self):
-        """empty(vdouble2d_t self) -> bool"""
+        r"""empty(vdouble2d_t self) -> bool"""
         return _libBornAgainFit.vdouble2d_t_empty(self)
 
-
     def size(self):
-        """size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainFit.vdouble2d_t_size(self)
 
-
     def swap(self, v):
-        """swap(vdouble2d_t self, vdouble2d_t v)"""
+        r"""swap(vdouble2d_t self, vdouble2d_t v)"""
         return _libBornAgainFit.vdouble2d_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
+        r"""begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
         return _libBornAgainFit.vdouble2d_t_begin(self)
 
-
     def end(self):
-        """end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
+        r"""end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"""
         return _libBornAgainFit.vdouble2d_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
+        r"""rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
         return _libBornAgainFit.vdouble2d_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
+        r"""rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"""
         return _libBornAgainFit.vdouble2d_t_rend(self)
 
-
     def clear(self):
-        """clear(vdouble2d_t self)"""
+        r"""clear(vdouble2d_t self)"""
         return _libBornAgainFit.vdouble2d_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"""
+        r"""get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"""
         return _libBornAgainFit.vdouble2d_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vdouble2d_t self)"""
+        r"""pop_back(vdouble2d_t self)"""
         return _libBornAgainFit.vdouble2d_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator
         erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator first, std::vector< std::vector< double > >::iterator last) -> std::vector< std::vector< double > >::iterator
         """
         return _libBornAgainFit.vdouble2d_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vdouble2d_t self) -> vdouble2d_t
+        __init__(vdouble2d_t self, vdouble2d_t other) -> vdouble2d_t
+        __init__(vdouble2d_t self, std::vector< std::vector< double > >::size_type size) -> vdouble2d_t
+        __init__(vdouble2d_t self, std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t
         """
-        __init__(std::vector<(std::vector<(double)>)> self) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, vdouble2d_t arg2) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, std::vector< std::vector< double > >::size_type size) -> vdouble2d_t
-        __init__(std::vector<(std::vector<(double)>)> self, std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t
-        """
-        this = _libBornAgainFit.new_vdouble2d_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vdouble2d_t_swiginit(self, _libBornAgainFit.new_vdouble2d_t(*args))
 
     def push_back(self, x):
-        """push_back(vdouble2d_t self, vdouble1d_t x)"""
+        r"""push_back(vdouble2d_t self, vdouble1d_t x)"""
         return _libBornAgainFit.vdouble2d_t_push_back(self, x)
 
-
     def front(self):
-        """front(vdouble2d_t self) -> vdouble1d_t"""
+        r"""front(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainFit.vdouble2d_t_front(self)
 
-
     def back(self):
-        """back(vdouble2d_t self) -> vdouble1d_t"""
+        r"""back(vdouble2d_t self) -> vdouble1d_t"""
         return _libBornAgainFit.vdouble2d_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"""
+        r"""assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"""
         return _libBornAgainFit.vdouble2d_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size)
         resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size, vdouble1d_t x)
         """
         return _libBornAgainFit.vdouble2d_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator
         insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)
         """
         return _libBornAgainFit.vdouble2d_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"""
+        r"""reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"""
         return _libBornAgainFit.vdouble2d_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
+        r"""capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"""
         return _libBornAgainFit.vdouble2d_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vdouble2d_t
-    __del__ = lambda self: None
-vdouble2d_t_swigregister = _libBornAgainFit.vdouble2d_t_swigregister
-vdouble2d_t_swigregister(vdouble2d_t)
 
-class vector_integer_t(_object):
-    """Proxy of C++ std::vector<(int)> class."""
+# Register vdouble2d_t in _libBornAgainFit:
+_libBornAgainFit.vdouble2d_t_swigregister(vdouble2d_t)
+
+class vector_integer_t(object):
+    r"""Proxy of C++ std::vector< int > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_integer_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_integer_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_integer_t self) -> SwigPyIterator"""
+        r"""iterator(vector_integer_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vector_integer_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_integer_t self) -> bool"""
+        r"""__nonzero__(vector_integer_t self) -> bool"""
         return _libBornAgainFit.vector_integer_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_integer_t self) -> bool"""
+        r"""__bool__(vector_integer_t self) -> bool"""
         return _libBornAgainFit.vector_integer_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""__len__(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainFit.vector_integer_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"""
+        r"""__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"""
         return _libBornAgainFit.vector_integer_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)
         __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)
         """
         return _libBornAgainFit.vector_integer_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"""
+        r"""__delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"""
         return _libBornAgainFit.vector_integer_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_integer_t self, std::vector< int >::difference_type i)
         __delitem__(vector_integer_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vector_integer_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_integer_t self, PySliceObject * slice) -> vector_integer_t
         __getitem__(vector_integer_t self, std::vector< int >::difference_type i) -> std::vector< int >::value_type const &
         """
         return _libBornAgainFit.vector_integer_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_integer_t self, PySliceObject * slice, vector_integer_t v)
         __setitem__(vector_integer_t self, PySliceObject * slice)
         __setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)
         """
         return _libBornAgainFit.vector_integer_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_integer_t self) -> std::vector< int >::value_type"""
+        r"""pop(vector_integer_t self) -> std::vector< int >::value_type"""
         return _libBornAgainFit.vector_integer_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_integer_t self, std::vector< int >::value_type const & x)"""
+        r"""append(vector_integer_t self, std::vector< int >::value_type const & x)"""
         return _libBornAgainFit.vector_integer_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_integer_t self) -> bool"""
+        r"""empty(vector_integer_t self) -> bool"""
         return _libBornAgainFit.vector_integer_t_empty(self)
 
-
     def size(self):
-        """size(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""size(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainFit.vector_integer_t_size(self)
 
-
     def swap(self, v):
-        """swap(vector_integer_t self, vector_integer_t v)"""
+        r"""swap(vector_integer_t self, vector_integer_t v)"""
         return _libBornAgainFit.vector_integer_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_integer_t self) -> std::vector< int >::iterator"""
+        r"""begin(vector_integer_t self) -> std::vector< int >::iterator"""
         return _libBornAgainFit.vector_integer_t_begin(self)
 
-
     def end(self):
-        """end(vector_integer_t self) -> std::vector< int >::iterator"""
+        r"""end(vector_integer_t self) -> std::vector< int >::iterator"""
         return _libBornAgainFit.vector_integer_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
+        r"""rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
         return _libBornAgainFit.vector_integer_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
+        r"""rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"""
         return _libBornAgainFit.vector_integer_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_integer_t self)"""
+        r"""clear(vector_integer_t self)"""
         return _libBornAgainFit.vector_integer_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"""
+        r"""get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"""
         return _libBornAgainFit.vector_integer_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_integer_t self)"""
+        r"""pop_back(vector_integer_t self)"""
         return _libBornAgainFit.vector_integer_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_integer_t self, std::vector< int >::iterator pos) -> std::vector< int >::iterator
         erase(vector_integer_t self, std::vector< int >::iterator first, std::vector< int >::iterator last) -> std::vector< int >::iterator
         """
         return _libBornAgainFit.vector_integer_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_integer_t self) -> vector_integer_t
+        __init__(vector_integer_t self, vector_integer_t other) -> vector_integer_t
+        __init__(vector_integer_t self, std::vector< int >::size_type size) -> vector_integer_t
+        __init__(vector_integer_t self, std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t
         """
-        __init__(std::vector<(int)> self) -> vector_integer_t
-        __init__(std::vector<(int)> self, vector_integer_t arg2) -> vector_integer_t
-        __init__(std::vector<(int)> self, std::vector< int >::size_type size) -> vector_integer_t
-        __init__(std::vector<(int)> self, std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t
-        """
-        this = _libBornAgainFit.new_vector_integer_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vector_integer_t_swiginit(self, _libBornAgainFit.new_vector_integer_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_integer_t self, std::vector< int >::value_type const & x)"""
+        r"""push_back(vector_integer_t self, std::vector< int >::value_type const & x)"""
         return _libBornAgainFit.vector_integer_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_integer_t self) -> std::vector< int >::value_type const &"""
+        r"""front(vector_integer_t self) -> std::vector< int >::value_type const &"""
         return _libBornAgainFit.vector_integer_t_front(self)
 
-
     def back(self):
-        """back(vector_integer_t self) -> std::vector< int >::value_type const &"""
+        r"""back(vector_integer_t self) -> std::vector< int >::value_type const &"""
         return _libBornAgainFit.vector_integer_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"""
+        r"""assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"""
         return _libBornAgainFit.vector_integer_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_integer_t self, std::vector< int >::size_type new_size)
         resize(vector_integer_t self, std::vector< int >::size_type new_size, std::vector< int >::value_type const & x)
         """
         return _libBornAgainFit.vector_integer_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator
         insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::size_type n, std::vector< int >::value_type const & x)
         """
         return _libBornAgainFit.vector_integer_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_integer_t self, std::vector< int >::size_type n)"""
+        r"""reserve(vector_integer_t self, std::vector< int >::size_type n)"""
         return _libBornAgainFit.vector_integer_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_integer_t self) -> std::vector< int >::size_type"""
+        r"""capacity(vector_integer_t self) -> std::vector< int >::size_type"""
         return _libBornAgainFit.vector_integer_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vector_integer_t
-    __del__ = lambda self: None
-vector_integer_t_swigregister = _libBornAgainFit.vector_integer_t_swigregister
-vector_integer_t_swigregister(vector_integer_t)
 
-class vector_longinteger_t(_object):
-    """Proxy of C++ std::vector<(unsigned long)> class."""
+# Register vector_integer_t in _libBornAgainFit:
+_libBornAgainFit.vector_integer_t_swigregister(vector_integer_t)
+
+class vector_longinteger_t(object):
+    r"""Proxy of C++ std::vector< unsigned long > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_longinteger_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_longinteger_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_longinteger_t self) -> SwigPyIterator"""
+        r"""iterator(vector_longinteger_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vector_longinteger_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_longinteger_t self) -> bool"""
+        r"""__nonzero__(vector_longinteger_t self) -> bool"""
         return _libBornAgainFit.vector_longinteger_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_longinteger_t self) -> bool"""
+        r"""__bool__(vector_longinteger_t self) -> bool"""
         return _libBornAgainFit.vector_longinteger_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""__len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainFit.vector_longinteger_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"""
+        r"""__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"""
         return _libBornAgainFit.vector_longinteger_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)
         __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)
         """
         return _libBornAgainFit.vector_longinteger_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"""
+        r"""__delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"""
         return _libBornAgainFit.vector_longinteger_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i)
         __delitem__(vector_longinteger_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vector_longinteger_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_longinteger_t self, PySliceObject * slice) -> vector_longinteger_t
         __getitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i) -> std::vector< unsigned long >::value_type const &
         """
         return _libBornAgainFit.vector_longinteger_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_longinteger_t self, PySliceObject * slice, vector_longinteger_t v)
         __setitem__(vector_longinteger_t self, PySliceObject * slice)
         __setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainFit.vector_longinteger_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"""
+        r"""pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"""
         return _libBornAgainFit.vector_longinteger_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
+        r"""append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainFit.vector_longinteger_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_longinteger_t self) -> bool"""
+        r"""empty(vector_longinteger_t self) -> bool"""
         return _libBornAgainFit.vector_longinteger_t_empty(self)
 
-
     def size(self):
-        """size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainFit.vector_longinteger_t_size(self)
 
-
     def swap(self, v):
-        """swap(vector_longinteger_t self, vector_longinteger_t v)"""
+        r"""swap(vector_longinteger_t self, vector_longinteger_t v)"""
         return _libBornAgainFit.vector_longinteger_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
+        r"""begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
         return _libBornAgainFit.vector_longinteger_t_begin(self)
 
-
     def end(self):
-        """end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
+        r"""end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"""
         return _libBornAgainFit.vector_longinteger_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
+        r"""rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
         return _libBornAgainFit.vector_longinteger_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
+        r"""rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"""
         return _libBornAgainFit.vector_longinteger_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_longinteger_t self)"""
+        r"""clear(vector_longinteger_t self)"""
         return _libBornAgainFit.vector_longinteger_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"""
+        r"""get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"""
         return _libBornAgainFit.vector_longinteger_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_longinteger_t self)"""
+        r"""pop_back(vector_longinteger_t self)"""
         return _libBornAgainFit.vector_longinteger_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_longinteger_t self, std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator
         erase(vector_longinteger_t self, std::vector< unsigned long >::iterator first, std::vector< unsigned long >::iterator last) -> std::vector< unsigned long >::iterator
         """
         return _libBornAgainFit.vector_longinteger_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_longinteger_t self) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, vector_longinteger_t other) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, std::vector< unsigned long >::size_type size) -> vector_longinteger_t
+        __init__(vector_longinteger_t self, std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t
         """
-        __init__(std::vector<(unsigned long)> self) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, vector_longinteger_t arg2) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, std::vector< unsigned long >::size_type size) -> vector_longinteger_t
-        __init__(std::vector<(unsigned long)> self, std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t
-        """
-        this = _libBornAgainFit.new_vector_longinteger_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vector_longinteger_t_swiginit(self, _libBornAgainFit.new_vector_longinteger_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
+        r"""push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainFit.vector_longinteger_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
+        r"""front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
         return _libBornAgainFit.vector_longinteger_t_front(self)
 
-
     def back(self):
-        """back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
+        r"""back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"""
         return _libBornAgainFit.vector_longinteger_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"""
+        r"""assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"""
         return _libBornAgainFit.vector_longinteger_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size)
         resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainFit.vector_longinteger_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator
         insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)
         """
         return _libBornAgainFit.vector_longinteger_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"""
+        r"""reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"""
         return _libBornAgainFit.vector_longinteger_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
+        r"""capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"""
         return _libBornAgainFit.vector_longinteger_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vector_longinteger_t
-    __del__ = lambda self: None
-vector_longinteger_t_swigregister = _libBornAgainFit.vector_longinteger_t_swigregister
-vector_longinteger_t_swigregister(vector_longinteger_t)
 
-class vector_complex_t(_object):
-    """Proxy of C++ std::vector<(std::complex<(double)>)> class."""
+# Register vector_longinteger_t in _libBornAgainFit:
+_libBornAgainFit.vector_longinteger_t_swigregister(vector_longinteger_t)
+
+class vector_complex_t(object):
+    r"""Proxy of C++ std::vector< std::complex< double > > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_complex_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_complex_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_complex_t self) -> SwigPyIterator"""
+        r"""iterator(vector_complex_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vector_complex_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_complex_t self) -> bool"""
+        r"""__nonzero__(vector_complex_t self) -> bool"""
         return _libBornAgainFit.vector_complex_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_complex_t self) -> bool"""
+        r"""__bool__(vector_complex_t self) -> bool"""
         return _libBornAgainFit.vector_complex_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""__len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainFit.vector_complex_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"""
+        r"""__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"""
         return _libBornAgainFit.vector_complex_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)
         __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)
         """
         return _libBornAgainFit.vector_complex_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"""
+        r"""__delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"""
         return _libBornAgainFit.vector_complex_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i)
         __delitem__(vector_complex_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vector_complex_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_complex_t self, PySliceObject * slice) -> vector_complex_t
         __getitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i) -> std::vector< std::complex< double > >::value_type const &
         """
         return _libBornAgainFit.vector_complex_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_complex_t self, PySliceObject * slice, vector_complex_t v)
         __setitem__(vector_complex_t self, PySliceObject * slice)
         __setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainFit.vector_complex_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"""
+        r"""pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"""
         return _libBornAgainFit.vector_complex_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainFit.vector_complex_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_complex_t self) -> bool"""
+        r"""empty(vector_complex_t self) -> bool"""
         return _libBornAgainFit.vector_complex_t_empty(self)
 
-
     def size(self):
-        """size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainFit.vector_complex_t_size(self)
 
-
     def swap(self, v):
-        """swap(vector_complex_t self, vector_complex_t v)"""
+        r"""swap(vector_complex_t self, vector_complex_t v)"""
         return _libBornAgainFit.vector_complex_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
+        r"""begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
         return _libBornAgainFit.vector_complex_t_begin(self)
 
-
     def end(self):
-        """end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
+        r"""end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"""
         return _libBornAgainFit.vector_complex_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
+        r"""rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
         return _libBornAgainFit.vector_complex_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
+        r"""rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"""
         return _libBornAgainFit.vector_complex_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_complex_t self)"""
+        r"""clear(vector_complex_t self)"""
         return _libBornAgainFit.vector_complex_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"""
+        r"""get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"""
         return _libBornAgainFit.vector_complex_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_complex_t self)"""
+        r"""pop_back(vector_complex_t self)"""
         return _libBornAgainFit.vector_complex_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_complex_t self, std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator
         erase(vector_complex_t self, std::vector< std::complex< double > >::iterator first, std::vector< std::complex< double > >::iterator last) -> std::vector< std::complex< double > >::iterator
         """
         return _libBornAgainFit.vector_complex_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_complex_t self) -> vector_complex_t
+        __init__(vector_complex_t self, vector_complex_t other) -> vector_complex_t
+        __init__(vector_complex_t self, std::vector< std::complex< double > >::size_type size) -> vector_complex_t
+        __init__(vector_complex_t self, std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t
         """
-        __init__(std::vector<(std::complex<(double)>)> self) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, vector_complex_t arg2) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, std::vector< std::complex< double > >::size_type size) -> vector_complex_t
-        __init__(std::vector<(std::complex<(double)>)> self, std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t
-        """
-        this = _libBornAgainFit.new_vector_complex_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vector_complex_t_swiginit(self, _libBornAgainFit.new_vector_complex_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainFit.vector_complex_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
+        r"""front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
         return _libBornAgainFit.vector_complex_t_front(self)
 
-
     def back(self):
-        """back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
+        r"""back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"""
         return _libBornAgainFit.vector_complex_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"""
+        r"""assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"""
         return _libBornAgainFit.vector_complex_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size)
         resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainFit.vector_complex_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator
         insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)
         """
         return _libBornAgainFit.vector_complex_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"""
+        r"""reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"""
         return _libBornAgainFit.vector_complex_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
+        r"""capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"""
         return _libBornAgainFit.vector_complex_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vector_complex_t
-    __del__ = lambda self: None
-vector_complex_t_swigregister = _libBornAgainFit.vector_complex_t_swigregister
-vector_complex_t_swigregister(vector_complex_t)
 
-class vector_string_t(_object):
-    """Proxy of C++ std::vector<(std::string)> class."""
+# Register vector_complex_t in _libBornAgainFit:
+_libBornAgainFit.vector_complex_t_swigregister(vector_complex_t)
+
+class vector_string_t(object):
+    r"""Proxy of C++ std::vector< std::string > class."""
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vector_string_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vector_string_t, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def iterator(self):
-        """iterator(vector_string_t self) -> SwigPyIterator"""
+        r"""iterator(vector_string_t self) -> SwigPyIterator"""
         return _libBornAgainFit.vector_string_t_iterator(self)
-
     def __iter__(self):
         return self.iterator()
 
     def __nonzero__(self):
-        """__nonzero__(vector_string_t self) -> bool"""
+        r"""__nonzero__(vector_string_t self) -> bool"""
         return _libBornAgainFit.vector_string_t___nonzero__(self)
 
-
     def __bool__(self):
-        """__bool__(vector_string_t self) -> bool"""
+        r"""__bool__(vector_string_t self) -> bool"""
         return _libBornAgainFit.vector_string_t___bool__(self)
 
-
     def __len__(self):
-        """__len__(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""__len__(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainFit.vector_string_t___len__(self)
 
-
     def __getslice__(self, i, j):
-        """__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"""
+        r"""__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"""
         return _libBornAgainFit.vector_string_t___getslice__(self, i, j)
 
-
     def __setslice__(self, *args):
-        """
+        r"""
         __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)
         __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)
         """
         return _libBornAgainFit.vector_string_t___setslice__(self, *args)
 
-
     def __delslice__(self, i, j):
-        """__delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"""
+        r"""__delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"""
         return _libBornAgainFit.vector_string_t___delslice__(self, i, j)
 
-
     def __delitem__(self, *args):
-        """
+        r"""
         __delitem__(vector_string_t self, std::vector< std::string >::difference_type i)
         __delitem__(vector_string_t self, PySliceObject * slice)
         """
         return _libBornAgainFit.vector_string_t___delitem__(self, *args)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(vector_string_t self, PySliceObject * slice) -> vector_string_t
         __getitem__(vector_string_t self, std::vector< std::string >::difference_type i) -> std::vector< std::string >::value_type const &
         """
         return _libBornAgainFit.vector_string_t___getitem__(self, *args)
 
-
     def __setitem__(self, *args):
-        """
+        r"""
         __setitem__(vector_string_t self, PySliceObject * slice, vector_string_t v)
         __setitem__(vector_string_t self, PySliceObject * slice)
         __setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainFit.vector_string_t___setitem__(self, *args)
 
-
     def pop(self):
-        """pop(vector_string_t self) -> std::vector< std::string >::value_type"""
+        r"""pop(vector_string_t self) -> std::vector< std::string >::value_type"""
         return _libBornAgainFit.vector_string_t_pop(self)
 
-
     def append(self, x):
-        """append(vector_string_t self, std::vector< std::string >::value_type const & x)"""
+        r"""append(vector_string_t self, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainFit.vector_string_t_append(self, x)
 
-
     def empty(self):
-        """empty(vector_string_t self) -> bool"""
+        r"""empty(vector_string_t self) -> bool"""
         return _libBornAgainFit.vector_string_t_empty(self)
 
-
     def size(self):
-        """size(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""size(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainFit.vector_string_t_size(self)
 
-
     def swap(self, v):
-        """swap(vector_string_t self, vector_string_t v)"""
+        r"""swap(vector_string_t self, vector_string_t v)"""
         return _libBornAgainFit.vector_string_t_swap(self, v)
 
-
     def begin(self):
-        """begin(vector_string_t self) -> std::vector< std::string >::iterator"""
+        r"""begin(vector_string_t self) -> std::vector< std::string >::iterator"""
         return _libBornAgainFit.vector_string_t_begin(self)
 
-
     def end(self):
-        """end(vector_string_t self) -> std::vector< std::string >::iterator"""
+        r"""end(vector_string_t self) -> std::vector< std::string >::iterator"""
         return _libBornAgainFit.vector_string_t_end(self)
 
-
     def rbegin(self):
-        """rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
+        r"""rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
         return _libBornAgainFit.vector_string_t_rbegin(self)
 
-
     def rend(self):
-        """rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
+        r"""rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"""
         return _libBornAgainFit.vector_string_t_rend(self)
 
-
     def clear(self):
-        """clear(vector_string_t self)"""
+        r"""clear(vector_string_t self)"""
         return _libBornAgainFit.vector_string_t_clear(self)
 
-
     def get_allocator(self):
-        """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"""
+        r"""get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"""
         return _libBornAgainFit.vector_string_t_get_allocator(self)
 
-
     def pop_back(self):
-        """pop_back(vector_string_t self)"""
+        r"""pop_back(vector_string_t self)"""
         return _libBornAgainFit.vector_string_t_pop_back(self)
 
-
     def erase(self, *args):
-        """
+        r"""
         erase(vector_string_t self, std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator
         erase(vector_string_t self, std::vector< std::string >::iterator first, std::vector< std::string >::iterator last) -> std::vector< std::string >::iterator
         """
         return _libBornAgainFit.vector_string_t_erase(self, *args)
 
-
     def __init__(self, *args):
+        r"""
+        __init__(vector_string_t self) -> vector_string_t
+        __init__(vector_string_t self, vector_string_t other) -> vector_string_t
+        __init__(vector_string_t self, std::vector< std::string >::size_type size) -> vector_string_t
+        __init__(vector_string_t self, std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t
         """
-        __init__(std::vector<(std::string)> self) -> vector_string_t
-        __init__(std::vector<(std::string)> self, vector_string_t arg2) -> vector_string_t
-        __init__(std::vector<(std::string)> self, std::vector< std::string >::size_type size) -> vector_string_t
-        __init__(std::vector<(std::string)> self, std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t
-        """
-        this = _libBornAgainFit.new_vector_string_t(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.vector_string_t_swiginit(self, _libBornAgainFit.new_vector_string_t(*args))
 
     def push_back(self, x):
-        """push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"""
+        r"""push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainFit.vector_string_t_push_back(self, x)
 
-
     def front(self):
-        """front(vector_string_t self) -> std::vector< std::string >::value_type const &"""
+        r"""front(vector_string_t self) -> std::vector< std::string >::value_type const &"""
         return _libBornAgainFit.vector_string_t_front(self)
 
-
     def back(self):
-        """back(vector_string_t self) -> std::vector< std::string >::value_type const &"""
+        r"""back(vector_string_t self) -> std::vector< std::string >::value_type const &"""
         return _libBornAgainFit.vector_string_t_back(self)
 
-
     def assign(self, n, x):
-        """assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"""
+        r"""assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"""
         return _libBornAgainFit.vector_string_t_assign(self, n, x)
 
-
     def resize(self, *args):
-        """
+        r"""
         resize(vector_string_t self, std::vector< std::string >::size_type new_size)
         resize(vector_string_t self, std::vector< std::string >::size_type new_size, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainFit.vector_string_t_resize(self, *args)
 
-
     def insert(self, *args):
-        """
+        r"""
         insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator
         insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)
         """
         return _libBornAgainFit.vector_string_t_insert(self, *args)
 
-
     def reserve(self, n):
-        """reserve(vector_string_t self, std::vector< std::string >::size_type n)"""
+        r"""reserve(vector_string_t self, std::vector< std::string >::size_type n)"""
         return _libBornAgainFit.vector_string_t_reserve(self, n)
 
-
     def capacity(self):
-        """capacity(vector_string_t self) -> std::vector< std::string >::size_type"""
+        r"""capacity(vector_string_t self) -> std::vector< std::string >::size_type"""
         return _libBornAgainFit.vector_string_t_capacity(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_vector_string_t
-    __del__ = lambda self: None
-vector_string_t_swigregister = _libBornAgainFit.vector_string_t_swigregister
-vector_string_t_swigregister(vector_string_t)
 
-class RealLimits(_object):
-    """
+# Register vector_string_t in _libBornAgainFit:
+_libBornAgainFit.vector_string_t_swigregister(vector_string_t)
+
+class RealLimits(object):
+    r"""
 
 
     Limits for a real fit parameter.
@@ -1450,29 +1155,20 @@ class RealLimits(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, RealLimits, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, RealLimits, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(RealLimits self) -> RealLimits
-
         RealLimits::RealLimits()
 
         """
-        this = _libBornAgainFit.new_RealLimits()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.RealLimits_swiginit(self, _libBornAgainFit.new_RealLimits())
 
     def hasLowerLimit(self):
-        """
+        r"""
         hasLowerLimit(RealLimits self) -> bool
-
         bool RealLimits::hasLowerLimit() const
 
         if has lower limit 
@@ -1480,11 +1176,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_hasLowerLimit(self)
 
-
     def lowerLimit(self):
-        """
+        r"""
         lowerLimit(RealLimits self) -> double
-
         double RealLimits::lowerLimit() const
 
         Returns lower limit. 
@@ -1492,11 +1186,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_lowerLimit(self)
 
-
     def setLowerLimit(self, value):
-        """
+        r"""
         setLowerLimit(RealLimits self, double value)
-
         void RealLimits::setLowerLimit(double value)
 
         Sets lower limit. 
@@ -1504,11 +1196,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_setLowerLimit(self, value)
 
-
     def removeLowerLimit(self):
-        """
+        r"""
         removeLowerLimit(RealLimits self)
-
         void RealLimits::removeLowerLimit()
 
         remove lower limit 
@@ -1516,11 +1206,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_removeLowerLimit(self)
 
-
     def hasUpperLimit(self):
-        """
+        r"""
         hasUpperLimit(RealLimits self) -> bool
-
         bool RealLimits::hasUpperLimit() const
 
         if has upper limit 
@@ -1528,11 +1216,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_hasUpperLimit(self)
 
-
     def upperLimit(self):
-        """
+        r"""
         upperLimit(RealLimits self) -> double
-
         double RealLimits::upperLimit() const
 
         Returns upper limit. 
@@ -1540,11 +1226,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_upperLimit(self)
 
-
     def setUpperLimit(self, value):
-        """
+        r"""
         setUpperLimit(RealLimits self, double value)
-
         void RealLimits::setUpperLimit(double value)
 
         Sets upper limit. 
@@ -1552,11 +1236,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_setUpperLimit(self, value)
 
-
     def removeUpperLimit(self):
-        """
+        r"""
         removeUpperLimit(RealLimits self)
-
         void RealLimits::removeUpperLimit()
 
         remove upper limit 
@@ -1564,11 +1246,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_removeUpperLimit(self)
 
-
     def hasLowerAndUpperLimits(self):
-        """
+        r"""
         hasLowerAndUpperLimits(RealLimits self) -> bool
-
         bool RealLimits::hasLowerAndUpperLimits() const
 
         if has lower and upper limit 
@@ -1576,11 +1256,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_hasLowerAndUpperLimits(self)
 
-
     def setLimits(self, xmin, xmax):
-        """
+        r"""
         setLimits(RealLimits self, double xmin, double xmax)
-
         void RealLimits::setLimits(double xmin, double xmax)
 
         Sets lower and upper limits. 
@@ -1588,11 +1266,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_setLimits(self, xmin, xmax)
 
-
     def removeLimits(self):
-        """
+        r"""
         removeLimits(RealLimits self)
-
         void RealLimits::removeLimits()
 
         remove limits 
@@ -1600,11 +1276,9 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_removeLimits(self)
 
-
     def isInRange(self, value):
-        """
+        r"""
         isInRange(RealLimits self, double value) -> bool
-
         bool RealLimits::isInRange(double value) const
 
         returns true if proposed value is in limits range 
@@ -1612,153 +1286,130 @@ class RealLimits(_object):
         """
         return _libBornAgainFit.RealLimits_isInRange(self, value)
 
-
+    @staticmethod
     def lowerLimited(bound_value):
-        """lowerLimited(double bound_value) -> RealLimits"""
+        r"""lowerLimited(double bound_value) -> RealLimits"""
         return _libBornAgainFit.RealLimits_lowerLimited(bound_value)
 
-    lowerLimited = staticmethod(lowerLimited)
-
+    @staticmethod
     def positive():
-        """positive() -> RealLimits"""
+        r"""positive() -> RealLimits"""
         return _libBornAgainFit.RealLimits_positive()
 
-    positive = staticmethod(positive)
-
+    @staticmethod
     def nonnegative():
-        """nonnegative() -> RealLimits"""
+        r"""nonnegative() -> RealLimits"""
         return _libBornAgainFit.RealLimits_nonnegative()
 
-    nonnegative = staticmethod(nonnegative)
-
+    @staticmethod
     def upperLimited(bound_value):
-        """upperLimited(double bound_value) -> RealLimits"""
+        r"""upperLimited(double bound_value) -> RealLimits"""
         return _libBornAgainFit.RealLimits_upperLimited(bound_value)
 
-    upperLimited = staticmethod(upperLimited)
-
+    @staticmethod
     def limited(left_bound_value, right_bound_value):
-        """limited(double left_bound_value, double right_bound_value) -> RealLimits"""
+        r"""limited(double left_bound_value, double right_bound_value) -> RealLimits"""
         return _libBornAgainFit.RealLimits_limited(left_bound_value, right_bound_value)
 
-    limited = staticmethod(limited)
-
+    @staticmethod
     def limitless():
-        """limitless() -> RealLimits"""
+        r"""limitless() -> RealLimits"""
         return _libBornAgainFit.RealLimits_limitless()
 
-    limitless = staticmethod(limitless)
-
     def toString(self):
-        """
+        r"""
         toString(RealLimits self) -> std::string
-
         std::string RealLimits::toString() const
 
         """
         return _libBornAgainFit.RealLimits_toString(self)
 
-
     def __eq__(self, other):
-        """__eq__(RealLimits self, RealLimits other) -> bool"""
+        r"""__eq__(RealLimits self, RealLimits other) -> bool"""
         return _libBornAgainFit.RealLimits___eq__(self, other)
 
-
     def __ne__(self, other):
-        """__ne__(RealLimits self, RealLimits other) -> bool"""
+        r"""__ne__(RealLimits self, RealLimits other) -> bool"""
         return _libBornAgainFit.RealLimits___ne__(self, other)
 
-
     def isLimitless(self):
-        """
+        r"""
         isLimitless(RealLimits self) -> bool
-
         bool RealLimits::isLimitless() const
 
         """
         return _libBornAgainFit.RealLimits_isLimitless(self)
 
-
     def isPositive(self):
-        """
+        r"""
         isPositive(RealLimits self) -> bool
-
         bool RealLimits::isPositive() const
 
         """
         return _libBornAgainFit.RealLimits_isPositive(self)
 
-
     def isNonnegative(self):
-        """
+        r"""
         isNonnegative(RealLimits self) -> bool
-
         bool RealLimits::isNonnegative() const
 
         """
         return _libBornAgainFit.RealLimits_isNonnegative(self)
 
-
     def isLowerLimited(self):
-        """
+        r"""
         isLowerLimited(RealLimits self) -> bool
-
         bool RealLimits::isLowerLimited() const
 
         """
         return _libBornAgainFit.RealLimits_isLowerLimited(self)
 
-
     def isUpperLimited(self):
-        """
+        r"""
         isUpperLimited(RealLimits self) -> bool
-
         bool RealLimits::isUpperLimited() const
 
         """
         return _libBornAgainFit.RealLimits_isUpperLimited(self)
 
-
     def isLimited(self):
-        """
+        r"""
         isLimited(RealLimits self) -> bool
-
         bool RealLimits::isLimited() const
 
         """
         return _libBornAgainFit.RealLimits_isLimited(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_RealLimits
-    __del__ = lambda self: None
-RealLimits_swigregister = _libBornAgainFit.RealLimits_swigregister
-RealLimits_swigregister(RealLimits)
+
+# Register RealLimits in _libBornAgainFit:
+_libBornAgainFit.RealLimits_swigregister(RealLimits)
 
 def RealLimits_lowerLimited(bound_value):
-    """RealLimits_lowerLimited(double bound_value) -> RealLimits"""
+    r"""RealLimits_lowerLimited(double bound_value) -> RealLimits"""
     return _libBornAgainFit.RealLimits_lowerLimited(bound_value)
 
 def RealLimits_positive():
-    """RealLimits_positive() -> RealLimits"""
+    r"""RealLimits_positive() -> RealLimits"""
     return _libBornAgainFit.RealLimits_positive()
 
 def RealLimits_nonnegative():
-    """RealLimits_nonnegative() -> RealLimits"""
+    r"""RealLimits_nonnegative() -> RealLimits"""
     return _libBornAgainFit.RealLimits_nonnegative()
 
 def RealLimits_upperLimited(bound_value):
-    """RealLimits_upperLimited(double bound_value) -> RealLimits"""
+    r"""RealLimits_upperLimited(double bound_value) -> RealLimits"""
     return _libBornAgainFit.RealLimits_upperLimited(bound_value)
 
 def RealLimits_limited(left_bound_value, right_bound_value):
-    """RealLimits_limited(double left_bound_value, double right_bound_value) -> RealLimits"""
+    r"""RealLimits_limited(double left_bound_value, double right_bound_value) -> RealLimits"""
     return _libBornAgainFit.RealLimits_limited(left_bound_value, right_bound_value)
 
 def RealLimits_limitless():
-    """RealLimits_limitless() -> RealLimits"""
+    r"""RealLimits_limitless() -> RealLimits"""
     return _libBornAgainFit.RealLimits_limitless()
 
-class AttLimits(_object):
-    """
+class AttLimits(object):
+    r"""
 
 
     Attributes and limits of a fit parameter, and coupling between these properties.
@@ -1767,201 +1418,166 @@ class AttLimits(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, AttLimits, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, AttLimits, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(AttLimits self) -> AttLimits
-
         AttLimits::AttLimits()
 
         """
-        this = _libBornAgainFit.new_AttLimits()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.AttLimits_swiginit(self, _libBornAgainFit.new_AttLimits())
 
+    @staticmethod
     def limitless():
-        """limitless() -> AttLimits"""
+        r"""limitless() -> AttLimits"""
         return _libBornAgainFit.AttLimits_limitless()
 
-    limitless = staticmethod(limitless)
-
+    @staticmethod
     def lowerLimited(bound_value):
-        """lowerLimited(double bound_value) -> AttLimits"""
+        r"""lowerLimited(double bound_value) -> AttLimits"""
         return _libBornAgainFit.AttLimits_lowerLimited(bound_value)
 
-    lowerLimited = staticmethod(lowerLimited)
-
+    @staticmethod
     def positive():
-        """positive() -> AttLimits"""
+        r"""positive() -> AttLimits"""
         return _libBornAgainFit.AttLimits_positive()
 
-    positive = staticmethod(positive)
-
+    @staticmethod
     def nonnegative():
-        """nonnegative() -> AttLimits"""
+        r"""nonnegative() -> AttLimits"""
         return _libBornAgainFit.AttLimits_nonnegative()
 
-    nonnegative = staticmethod(nonnegative)
-
+    @staticmethod
     def upperLimited(bound_value):
-        """upperLimited(double bound_value) -> AttLimits"""
+        r"""upperLimited(double bound_value) -> AttLimits"""
         return _libBornAgainFit.AttLimits_upperLimited(bound_value)
 
-    upperLimited = staticmethod(upperLimited)
-
+    @staticmethod
     def limited(left_bound_value, right_bound_value):
-        """limited(double left_bound_value, double right_bound_value) -> AttLimits"""
+        r"""limited(double left_bound_value, double right_bound_value) -> AttLimits"""
         return _libBornAgainFit.AttLimits_limited(left_bound_value, right_bound_value)
 
-    limited = staticmethod(limited)
-
+    @staticmethod
     def fixed():
-        """fixed() -> AttLimits"""
+        r"""fixed() -> AttLimits"""
         return _libBornAgainFit.AttLimits_fixed()
 
-    fixed = staticmethod(fixed)
-
     def isFixed(self):
-        """
+        r"""
         isFixed(AttLimits self) -> bool
-
         bool AttLimits::isFixed() const
 
         """
         return _libBornAgainFit.AttLimits_isFixed(self)
 
-
     def isLimited(self):
-        """
+        r"""
         isLimited(AttLimits self) -> bool
-
         bool AttLimits::isLimited() const
 
         """
         return _libBornAgainFit.AttLimits_isLimited(self)
 
-
     def isUpperLimited(self):
-        """
+        r"""
         isUpperLimited(AttLimits self) -> bool
-
         bool AttLimits::isUpperLimited() const
 
         """
         return _libBornAgainFit.AttLimits_isUpperLimited(self)
 
-
     def isLowerLimited(self):
-        """
+        r"""
         isLowerLimited(AttLimits self) -> bool
-
         bool AttLimits::isLowerLimited() const
 
         """
         return _libBornAgainFit.AttLimits_isLowerLimited(self)
 
-
     def isLimitless(self):
-        """
+        r"""
         isLimitless(AttLimits self) -> bool
-
         bool AttLimits::isLimitless() const
 
         """
         return _libBornAgainFit.AttLimits_isLimitless(self)
 
-
     def lowerLimit(self):
-        """
+        r"""
         lowerLimit(AttLimits self) -> double
-
         double AttLimits::lowerLimit() const
 
         """
         return _libBornAgainFit.AttLimits_lowerLimit(self)
 
-
     def upperLimit(self):
-        """
+        r"""
         upperLimit(AttLimits self) -> double
-
         double AttLimits::upperLimit() const
 
         """
         return _libBornAgainFit.AttLimits_upperLimit(self)
 
-
     def setFixed(self, isFixed):
-        """
+        r"""
         setFixed(AttLimits self, bool isFixed)
-
         void AttLimits::setFixed(bool isFixed)
 
         """
         return _libBornAgainFit.AttLimits_setFixed(self, isFixed)
 
-
     def __eq__(self, other):
-        """__eq__(AttLimits self, AttLimits other) -> bool"""
+        r"""__eq__(AttLimits self, AttLimits other) -> bool"""
         return _libBornAgainFit.AttLimits___eq__(self, other)
 
-
     def __ne__(self, other):
-        """__ne__(AttLimits self, AttLimits other) -> bool"""
+        r"""__ne__(AttLimits self, AttLimits other) -> bool"""
         return _libBornAgainFit.AttLimits___ne__(self, other)
 
-
     def toString(self):
-        """
+        r"""
         toString(AttLimits self) -> std::string
-
         std::string AttLimits::toString() const
 
         """
         return _libBornAgainFit.AttLimits_toString(self)
-
     __swig_destroy__ = _libBornAgainFit.delete_AttLimits
-    __del__ = lambda self: None
-AttLimits_swigregister = _libBornAgainFit.AttLimits_swigregister
-AttLimits_swigregister(AttLimits)
+
+# Register AttLimits in _libBornAgainFit:
+_libBornAgainFit.AttLimits_swigregister(AttLimits)
 
 def AttLimits_limitless():
-    """AttLimits_limitless() -> AttLimits"""
+    r"""AttLimits_limitless() -> AttLimits"""
     return _libBornAgainFit.AttLimits_limitless()
 
 def AttLimits_lowerLimited(bound_value):
-    """AttLimits_lowerLimited(double bound_value) -> AttLimits"""
+    r"""AttLimits_lowerLimited(double bound_value) -> AttLimits"""
     return _libBornAgainFit.AttLimits_lowerLimited(bound_value)
 
 def AttLimits_positive():
-    """AttLimits_positive() -> AttLimits"""
+    r"""AttLimits_positive() -> AttLimits"""
     return _libBornAgainFit.AttLimits_positive()
 
 def AttLimits_nonnegative():
-    """AttLimits_nonnegative() -> AttLimits"""
+    r"""AttLimits_nonnegative() -> AttLimits"""
     return _libBornAgainFit.AttLimits_nonnegative()
 
 def AttLimits_upperLimited(bound_value):
-    """AttLimits_upperLimited(double bound_value) -> AttLimits"""
+    r"""AttLimits_upperLimited(double bound_value) -> AttLimits"""
     return _libBornAgainFit.AttLimits_upperLimited(bound_value)
 
 def AttLimits_limited(left_bound_value, right_bound_value):
-    """AttLimits_limited(double left_bound_value, double right_bound_value) -> AttLimits"""
+    r"""AttLimits_limited(double left_bound_value, double right_bound_value) -> AttLimits"""
     return _libBornAgainFit.AttLimits_limited(left_bound_value, right_bound_value)
 
 def AttLimits_fixed():
-    """AttLimits_fixed() -> AttLimits"""
+    r"""AttLimits_fixed() -> AttLimits"""
     return _libBornAgainFit.AttLimits_fixed()
 
-class Parameter(_object):
-    """
+class Parameter(object):
+    r"""
 
 
     A fittable parameter with value, error, step, and limits.
@@ -1970,19 +1586,13 @@ class Parameter(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Parameter, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Parameter, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self, *args):
-        """
-        __init__(Fit::Parameter self) -> Parameter
-        __init__(Fit::Parameter self, std::string const & name, double value, AttLimits limits, double step=0.0) -> Parameter
-        __init__(Fit::Parameter self, std::string const & name, double value, AttLimits limits) -> Parameter
-        __init__(Fit::Parameter self, std::string const & name, double value) -> Parameter
-
+        r"""
+        __init__(Parameter self) -> Parameter
+        __init__(Parameter self, std::string const & name, double value, AttLimits limits=AttLimits::limitless(), double step=0.0) -> Parameter
         Parameter::Parameter(const std::string &name, double value, const AttLimits &limits=AttLimits::limitless(), double step=0.0)
 
         Fit parameter constructor.
@@ -2003,109 +1613,84 @@ class Parameter(_object):
         initial step of fit parameter during the minimization, will be calculated automatically, if zero. 
 
         """
-        this = _libBornAgainFit.new_Parameter(*args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.Parameter_swiginit(self, _libBornAgainFit.new_Parameter(*args))
 
     def name(self):
-        """
+        r"""
         name(Parameter self) -> std::string
-
         std::string Parameter::name() const
 
         """
         return _libBornAgainFit.Parameter_name(self)
 
-
     def startValue(self):
-        """
+        r"""
         startValue(Parameter self) -> double
-
         double Parameter::startValue() const
 
         """
         return _libBornAgainFit.Parameter_startValue(self)
 
-
     def limits(self):
-        """
+        r"""
         limits(Parameter self) -> AttLimits
-
         AttLimits Parameter::limits() const
 
         """
         return _libBornAgainFit.Parameter_limits(self)
 
-
     def value(self):
-        """
+        r"""
         value(Parameter self) -> double
-
         double Parameter::value() const
 
         """
         return _libBornAgainFit.Parameter_value(self)
 
-
     def setValue(self, value):
-        """
+        r"""
         setValue(Parameter self, double value)
-
         void Parameter::setValue(double value)
 
         """
         return _libBornAgainFit.Parameter_setValue(self, value)
 
-
     def step(self):
-        """
+        r"""
         step(Parameter self) -> double
-
         double Parameter::step() const
 
         """
         return _libBornAgainFit.Parameter_step(self)
 
-
     def error(self):
-        """
+        r"""
         error(Parameter self) -> double
-
         double Parameter::error() const
 
         """
         return _libBornAgainFit.Parameter_error(self)
 
-
     def setError(self, value):
-        """
+        r"""
         setError(Parameter self, double value)
-
         void Parameter::setError(double value)
 
         """
         return _libBornAgainFit.Parameter_setError(self, value)
 
-
-    __swig_getmethods__["value"] = value
-    __swig_setmethods__["value"] = setValue
-    __swig_getmethods__["error"] = error
-    __swig_setmethods__["error"] = setError
-    if _newclass:
-        value = property(value, setValue)
-        error = property(error, setError)
+    value = property(value, setValue)
+    error = property(error, setError)
 
 
 
     __swig_destroy__ = _libBornAgainFit.delete_Parameter
-    __del__ = lambda self: None
-Parameter_swigregister = _libBornAgainFit.Parameter_swigregister
-Parameter_swigregister(Parameter)
 
-class Parameters(_object):
-    """
+# Register Parameter in _libBornAgainFit:
+_libBornAgainFit.Parameter_swigregister(Parameter)
+
+class Parameters(object):
+    r"""
 
 
     A collection of fit parameters.
@@ -2114,131 +1699,102 @@ class Parameters(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Parameters, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Parameters, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(Fit::Parameters self) -> Parameters
-
+        r"""
+        __init__(Parameters self) -> Parameters
         Fit::Parameters::Parameters()=default
 
         """
-        this = _libBornAgainFit.new_Parameters()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.Parameters_swiginit(self, _libBornAgainFit.new_Parameters())
 
     def add_cpp(self, par):
-        """
+        r"""
         add_cpp(Parameters self, Parameter par)
-
         void Parameters::add(const Parameter &par)
 
         """
         return _libBornAgainFit.Parameters_add_cpp(self, par)
 
-
     def begin(self, *args):
-        """
+        r"""
         begin(Parameters self) -> Fit::Parameters::const_iterator
         begin(Parameters self) -> Fit::Parameters::iterator
-
         iterator Fit::Parameters::begin()
 
         """
         return _libBornAgainFit.Parameters_begin(self, *args)
 
-
     def end(self, *args):
-        """
+        r"""
         end(Parameters self) -> Fit::Parameters::const_iterator
         end(Parameters self) -> Fit::Parameters::iterator
-
         iterator Fit::Parameters::end()
 
         """
         return _libBornAgainFit.Parameters_end(self, *args)
 
-
     def size(self):
-        """
+        r"""
         size(Parameters self) -> size_t
-
         size_t Parameters::size() const
 
         """
         return _libBornAgainFit.Parameters_size(self)
 
-
     def values(self):
-        """
+        r"""
         values(Parameters self) -> vdouble1d_t
-
         std::vector< double > Parameters::values() const
 
         """
         return _libBornAgainFit.Parameters_values(self)
 
-
     def setValues(self, values):
-        """
+        r"""
         setValues(Parameters self, vdouble1d_t values)
-
         void Parameters::setValues(const std::vector< double > &values)
 
         """
         return _libBornAgainFit.Parameters_setValues(self, values)
 
-
     def errors(self):
-        """
+        r"""
         errors(Parameters self) -> vdouble1d_t
-
         std::vector< double > Parameters::errors() const
 
         """
         return _libBornAgainFit.Parameters_errors(self)
 
-
     def setErrors(self, errors):
-        """
+        r"""
         setErrors(Parameters self, vdouble1d_t errors)
-
         void Parameters::setErrors(const std::vector< double > &errors)
 
         """
         return _libBornAgainFit.Parameters_setErrors(self, errors)
 
-
     def correlationMatrix(self):
-        """
+        r"""
         correlationMatrix(Parameters self) -> vdouble2d_t
-
         Parameters::corr_matrix_t Parameters::correlationMatrix() const
 
         """
         return _libBornAgainFit.Parameters_correlationMatrix(self)
 
-
     def setCorrelationMatrix(self, matrix):
-        """
+        r"""
         setCorrelationMatrix(Parameters self, vdouble2d_t matrix)
-
         void Parameters::setCorrelationMatrix(const corr_matrix_t &matrix)
 
         """
         return _libBornAgainFit.Parameters_setCorrelationMatrix(self, matrix)
 
-
     def freeParameterCount(self):
-        """
+        r"""
         freeParameterCount(Parameters self) -> size_t
-
         size_t Parameters::freeParameterCount() const
 
         Returns number of free parameters. 
@@ -2246,15 +1802,13 @@ class Parameters(_object):
         """
         return _libBornAgainFit.Parameters_freeParameterCount(self)
 
-
     def __getitem__(self, *args):
-        """
+        r"""
         __getitem__(Parameters self, std::string name) -> Parameter
         __getitem__(Parameters self, size_t index) -> Parameter
         """
         return _libBornAgainFit.Parameters___getitem__(self, *args)
 
-
     def __iter__(self):
         return ParametersIterator(self)
 
@@ -2279,12 +1833,12 @@ class Parameters(_object):
 
 
     __swig_destroy__ = _libBornAgainFit.delete_Parameters
-    __del__ = lambda self: None
-Parameters_swigregister = _libBornAgainFit.Parameters_swigregister
-Parameters_swigregister(Parameters)
 
-class IMinimizer(_object):
-    """
+# Register Parameters in _libBornAgainFit:
+_libBornAgainFit.Parameters_swigregister(Parameters)
+
+class IMinimizer(object):
+    r"""
 
 
     Pure virtual interface for all kind minimizers.
@@ -2293,21 +1847,16 @@ class IMinimizer(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IMinimizer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, IMinimizer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
 
     def __init__(self, *args, **kwargs):
         raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _libBornAgainFit.delete_IMinimizer
-    __del__ = lambda self: None
 
     def minimizerName(self):
-        """
+        r"""
         minimizerName(IMinimizer self) -> std::string
-
         virtual std::string IMinimizer::minimizerName() const =0
 
         return name of the minimizer 
@@ -2315,11 +1864,9 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_minimizerName(self)
 
-
     def algorithmName(self):
-        """
+        r"""
         algorithmName(IMinimizer self) -> std::string
-
         virtual std::string IMinimizer::algorithmName() const =0
 
         return name of the minimization algorithm 
@@ -2327,11 +1874,9 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_algorithmName(self)
 
-
     def minimize_scalar(self, arg2, arg3):
-        """
+        r"""
         minimize_scalar(IMinimizer self, fcn_scalar_t arg2, Parameters arg3) -> MinimizerResult
-
         Fit::MinimizerResult IMinimizer::minimize_scalar(fcn_scalar_t, Fit::Parameters)
 
         run minimization 
@@ -2339,21 +1884,17 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_minimize_scalar(self, arg2, arg3)
 
-
     def minimize_residual(self, arg2, arg3):
-        """
+        r"""
         minimize_residual(IMinimizer self, fcn_residual_t arg2, Parameters arg3) -> MinimizerResult
-
         Fit::MinimizerResult IMinimizer::minimize_residual(fcn_residual_t, Fit::Parameters)
 
         """
         return _libBornAgainFit.IMinimizer_minimize_residual(self, arg2, arg3)
 
-
     def clear(self):
-        """
+        r"""
         clear(IMinimizer self)
-
         virtual void IMinimizer::clear()
 
         clear resources (parameters) for consecutives minimizations 
@@ -2361,11 +1902,9 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_clear(self)
 
-
     def minValue(self):
-        """
+        r"""
         minValue(IMinimizer self) -> double
-
         double IMinimizer::minValue() const
 
         Returns minimum function value. 
@@ -2373,11 +1912,9 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_minValue(self)
 
-
     def setOptions(self, options):
-        """
+        r"""
         setOptions(IMinimizer self, std::string const & options)
-
         void IMinimizer::setOptions(const std::string &options)
 
         Sets option string to the minimizer. 
@@ -2385,11 +1922,11 @@ class IMinimizer(_object):
         """
         return _libBornAgainFit.IMinimizer_setOptions(self, options)
 
-IMinimizer_swigregister = _libBornAgainFit.IMinimizer_swigregister
-IMinimizer_swigregister(IMinimizer)
+# Register IMinimizer in _libBornAgainFit:
+_libBornAgainFit.IMinimizer_swigregister(IMinimizer)
 
-class MinimizerCatalogue(_object):
-    """
+class MinimizerCatalogue(object):
+    r"""
 
 
     Hard-coded information about all minimizers available.
@@ -2398,29 +1935,20 @@ class MinimizerCatalogue(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MinimizerCatalogue, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, MinimizerCatalogue, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
+        r"""
         __init__(MinimizerCatalogue self) -> MinimizerCatalogue
-
         MinimizerCatalogue::MinimizerCatalogue()
 
         """
-        this = _libBornAgainFit.new_MinimizerCatalogue()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.MinimizerCatalogue_swiginit(self, _libBornAgainFit.new_MinimizerCatalogue())
 
     def toString(self):
-        """
+        r"""
         toString(MinimizerCatalogue self) -> std::string
-
         std::string MinimizerCatalogue::toString() const
 
         Returns multiline string representing catalogue content. 
@@ -2428,21 +1956,17 @@ class MinimizerCatalogue(_object):
         """
         return _libBornAgainFit.MinimizerCatalogue_toString(self)
 
-
     def minimizerNames(self):
-        """
+        r"""
         minimizerNames(MinimizerCatalogue self) -> vector_string_t
-
         std::vector< std::string > MinimizerCatalogue::minimizerNames() const
 
         """
         return _libBornAgainFit.MinimizerCatalogue_minimizerNames(self)
 
-
     def algorithmNames(self, minimizerName):
-        """
+        r"""
         algorithmNames(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t
-
         std::vector< std::string > MinimizerCatalogue::algorithmNames(const std::string &minimizerName) const
 
         Returns list of algorithms defined for the minimizer with a given name. 
@@ -2450,11 +1974,9 @@ class MinimizerCatalogue(_object):
         """
         return _libBornAgainFit.MinimizerCatalogue_algorithmNames(self, minimizerName)
 
-
     def algorithmDescriptions(self, minimizerName):
-        """
+        r"""
         algorithmDescriptions(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t
-
         std::vector< std::string > MinimizerCatalogue::algorithmDescriptions(const std::string &minimizerName) const
 
         Returns list of algorithm's descriptions for the minimizer with a given name . 
@@ -2462,25 +1984,22 @@ class MinimizerCatalogue(_object):
         """
         return _libBornAgainFit.MinimizerCatalogue_algorithmDescriptions(self, minimizerName)
 
-
     def minimizerInfo(self, minimizerName):
-        """
+        r"""
         minimizerInfo(MinimizerCatalogue self, std::string const & minimizerName) -> MinimizerInfo const &
-
         const MinimizerInfo & MinimizerCatalogue::minimizerInfo(const std::string &minimizerName) const
 
         Returns info for minimizer with given name. 
 
         """
         return _libBornAgainFit.MinimizerCatalogue_minimizerInfo(self, minimizerName)
-
     __swig_destroy__ = _libBornAgainFit.delete_MinimizerCatalogue
-    __del__ = lambda self: None
-MinimizerCatalogue_swigregister = _libBornAgainFit.MinimizerCatalogue_swigregister
-MinimizerCatalogue_swigregister(MinimizerCatalogue)
 
-class MinimizerFactory(_object):
-    """
+# Register MinimizerCatalogue in _libBornAgainFit:
+_libBornAgainFit.MinimizerCatalogue_swigregister(MinimizerCatalogue)
+
+class MinimizerFactory(object):
+    r"""
 
 
     Factory to create minimizers.
@@ -2489,93 +2008,72 @@ class MinimizerFactory(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MinimizerFactory, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, MinimizerFactory, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
+    @staticmethod
     def createMinimizer(*args):
-        """
-        createMinimizer(std::string const & minimizerName, std::string const & algorithmType, std::string const & optionString) -> IMinimizer
-        createMinimizer(std::string const & minimizerName, std::string const & algorithmType) -> IMinimizer
-        createMinimizer(std::string const & minimizerName) -> IMinimizer
-        """
+        r"""createMinimizer(std::string const & minimizerName, std::string const & algorithmType="", std::string const & optionString="") -> IMinimizer"""
         return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
 
-    createMinimizer = staticmethod(createMinimizer)
-
+    @staticmethod
     def printCatalogue():
-        """printCatalogue()"""
+        r"""printCatalogue()"""
         return _libBornAgainFit.MinimizerFactory_printCatalogue()
 
-    printCatalogue = staticmethod(printCatalogue)
-
+    @staticmethod
     def catalogueToString():
-        """catalogueToString() -> std::string"""
+        r"""catalogueToString() -> std::string"""
         return _libBornAgainFit.MinimizerFactory_catalogueToString()
 
-    catalogueToString = staticmethod(catalogueToString)
-
+    @staticmethod
     def catalogueDetailsToString():
-        """catalogueDetailsToString() -> std::string"""
+        r"""catalogueDetailsToString() -> std::string"""
         return _libBornAgainFit.MinimizerFactory_catalogueDetailsToString()
 
-    catalogueDetailsToString = staticmethod(catalogueDetailsToString)
-
+    @staticmethod
     def catalogue():
-        """catalogue() -> MinimizerCatalogue"""
+        r"""catalogue() -> MinimizerCatalogue"""
         return _libBornAgainFit.MinimizerFactory_catalogue()
 
-    catalogue = staticmethod(catalogue)
-
     def __init__(self):
-        """
+        r"""
         __init__(MinimizerFactory self) -> MinimizerFactory
 
 
-
         Factory to create minimizers.
 
         C++ includes: MinimizerFactory.h
 
         """
-        this = _libBornAgainFit.new_MinimizerFactory()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.MinimizerFactory_swiginit(self, _libBornAgainFit.new_MinimizerFactory())
     __swig_destroy__ = _libBornAgainFit.delete_MinimizerFactory
-    __del__ = lambda self: None
-MinimizerFactory_swigregister = _libBornAgainFit.MinimizerFactory_swigregister
-MinimizerFactory_swigregister(MinimizerFactory)
+
+# Register MinimizerFactory in _libBornAgainFit:
+_libBornAgainFit.MinimizerFactory_swigregister(MinimizerFactory)
 
 def MinimizerFactory_createMinimizer(*args):
-    """
-    createMinimizer(std::string const & minimizerName, std::string const & algorithmType, std::string const & optionString) -> IMinimizer
-    createMinimizer(std::string const & minimizerName, std::string const & algorithmType) -> IMinimizer
-    MinimizerFactory_createMinimizer(std::string const & minimizerName) -> IMinimizer
-    """
+    r"""MinimizerFactory_createMinimizer(std::string const & minimizerName, std::string const & algorithmType="", std::string const & optionString="") -> IMinimizer"""
     return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
 
 def MinimizerFactory_printCatalogue():
-    """MinimizerFactory_printCatalogue()"""
+    r"""MinimizerFactory_printCatalogue()"""
     return _libBornAgainFit.MinimizerFactory_printCatalogue()
 
 def MinimizerFactory_catalogueToString():
-    """MinimizerFactory_catalogueToString() -> std::string"""
+    r"""MinimizerFactory_catalogueToString() -> std::string"""
     return _libBornAgainFit.MinimizerFactory_catalogueToString()
 
 def MinimizerFactory_catalogueDetailsToString():
-    """MinimizerFactory_catalogueDetailsToString() -> std::string"""
+    r"""MinimizerFactory_catalogueDetailsToString() -> std::string"""
     return _libBornAgainFit.MinimizerFactory_catalogueDetailsToString()
 
 def MinimizerFactory_catalogue():
-    """MinimizerFactory_catalogue() -> MinimizerCatalogue"""
+    r"""MinimizerFactory_catalogue() -> MinimizerCatalogue"""
     return _libBornAgainFit.MinimizerFactory_catalogue()
 
-class PyCallback(_object):
-    """
+class PyCallback(object):
+    r"""
 
 
     Base class to wrap Python callable and pass it to C++. Used in swig interface file, intended to be overloaded from Python.
@@ -2584,19 +2082,16 @@ class PyCallback(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PyCallback, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PyCallback, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
     SCALAR = _libBornAgainFit.PyCallback_SCALAR
+    
     RESIDUAL = _libBornAgainFit.PyCallback_RESIDUAL
+    
 
     def __init__(self, *args):
-        """
-        __init__(PyCallback self, PyCallback::CallbackType callback_type) -> PyCallback
-        __init__(PyCallback self) -> PyCallback
-
+        r"""
+        __init__(PyCallback self, PyCallback::CallbackType callback_type=SCALAR) -> PyCallback
         PyCallback::PyCallback(CallbackType callback_type=SCALAR)
 
         """
@@ -2604,28 +2099,20 @@ class PyCallback(_object):
             _self = None
         else:
             _self = self
-        this = _libBornAgainFit.new_PyCallback(_self, *args)
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.PyCallback_swiginit(self, _libBornAgainFit.new_PyCallback(_self, *args))
     __swig_destroy__ = _libBornAgainFit.delete_PyCallback
-    __del__ = lambda self: None
 
     def callback_type(self):
-        """
+        r"""
         callback_type(PyCallback self) -> PyCallback::CallbackType
-
         PyCallback::CallbackType PyCallback::callback_type() const
 
         """
         return _libBornAgainFit.PyCallback_callback_type(self)
 
-
     def call_scalar(self, pars):
-        """
+        r"""
         call_scalar(PyCallback self, Parameters pars) -> double
-
         double PyCallback::call_scalar(Fit::Parameters pars)
 
         Call Python callable and returns its result. Intended to be overloaded in Python.
@@ -2641,11 +2128,9 @@ class PyCallback(_object):
         """
         return _libBornAgainFit.PyCallback_call_scalar(self, pars)
 
-
     def call_residuals(self, arg0):
-        """
+        r"""
         call_residuals(PyCallback self, Parameters arg0) -> vdouble1d_t
-
         std::vector< double > PyCallback::call_residuals(Fit::Parameters)
 
         Call Python callable and returns its result. Intended to be overloaded in Python.
@@ -2660,16 +2145,16 @@ class PyCallback(_object):
 
         """
         return _libBornAgainFit.PyCallback_call_residuals(self, arg0)
-
     def __disown__(self):
         self.this.disown()
         _libBornAgainFit.disown_PyCallback(self)
-        return weakref_proxy(self)
-PyCallback_swigregister = _libBornAgainFit.PyCallback_swigregister
-PyCallback_swigregister(PyCallback)
+        return weakref.proxy(self)
 
-class MinimizerResult(_object):
-    """
+# Register PyCallback in _libBornAgainFit:
+_libBornAgainFit.PyCallback_swigregister(PyCallback)
+
+class MinimizerResult(object):
+    r"""
 
 
     Result of minimization round.
@@ -2678,59 +2163,44 @@ class MinimizerResult(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MinimizerResult, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, MinimizerResult, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(Fit::MinimizerResult self) -> MinimizerResult
-
+        r"""
+        __init__(MinimizerResult self) -> MinimizerResult
         MinimizerResult::MinimizerResult()
 
         """
-        this = _libBornAgainFit.new_MinimizerResult()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.MinimizerResult_swiginit(self, _libBornAgainFit.new_MinimizerResult())
 
     def setParameters(self, parameters):
-        """
+        r"""
         setParameters(MinimizerResult self, Parameters parameters)
-
         void MinimizerResult::setParameters(const Parameters &parameters)
 
         """
         return _libBornAgainFit.MinimizerResult_setParameters(self, parameters)
 
-
     def parameters(self):
-        """
+        r"""
         parameters(MinimizerResult self) -> Parameters
-
         Parameters MinimizerResult::parameters() const
 
         """
         return _libBornAgainFit.MinimizerResult_parameters(self)
 
-
     def setMinValue(self, value):
-        """
+        r"""
         setMinValue(MinimizerResult self, double value)
-
         void MinimizerResult::setMinValue(double value)
 
         """
         return _libBornAgainFit.MinimizerResult_setMinValue(self, value)
 
-
     def minValue(self):
-        """
+        r"""
         minValue(MinimizerResult self) -> double
-
         double MinimizerResult::minValue() const
 
         Minimum value of objective function found by minimizer. 
@@ -2738,11 +2208,9 @@ class MinimizerResult(_object):
         """
         return _libBornAgainFit.MinimizerResult_minValue(self)
 
-
     def toString(self):
-        """
+        r"""
         toString(MinimizerResult self) -> std::string
-
         std::string MinimizerResult::toString() const
 
         Returns multi-line string representing minimization results. 
@@ -2750,53 +2218,44 @@ class MinimizerResult(_object):
         """
         return _libBornAgainFit.MinimizerResult_toString(self)
 
-
     def setReport(self, value):
-        """
+        r"""
         setReport(MinimizerResult self, std::string const & value)
-
         void MinimizerResult::setReport(const std::string &value)
 
         """
         return _libBornAgainFit.MinimizerResult_setReport(self, value)
 
-
     def setDuration(self, value):
-        """
+        r"""
         setDuration(MinimizerResult self, double value)
-
         void MinimizerResult::setDuration(double value)
 
         """
         return _libBornAgainFit.MinimizerResult_setDuration(self, value)
 
-
     def setNumberOfCalls(self, value):
-        """
+        r"""
         setNumberOfCalls(MinimizerResult self, int value)
-
         void MinimizerResult::setNumberOfCalls(int value)
 
         """
         return _libBornAgainFit.MinimizerResult_setNumberOfCalls(self, value)
 
-
     def setNumberOfGradientCalls(self, value):
-        """
+        r"""
         setNumberOfGradientCalls(MinimizerResult self, int value)
-
         void MinimizerResult::setNumberOfGradientCalls(int value)
 
         """
         return _libBornAgainFit.MinimizerResult_setNumberOfGradientCalls(self, value)
-
     __swig_destroy__ = _libBornAgainFit.delete_MinimizerResult
-    __del__ = lambda self: None
-MinimizerResult_swigregister = _libBornAgainFit.MinimizerResult_swigregister
-MinimizerResult_swigregister(MinimizerResult)
 
-class Minimizer(_object):
-    """
+# Register MinimizerResult in _libBornAgainFit:
+_libBornAgainFit.MinimizerResult_swigregister(MinimizerResult)
+
+class Minimizer(object):
+    r"""
 
 
     A main class to run fitting.
@@ -2805,44 +2264,30 @@ class Minimizer(_object):
 
     """
 
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Minimizer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Minimizer, name)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
 
     def __init__(self):
-        """
-        __init__(Fit::Minimizer self) -> Minimizer
-
+        r"""
+        __init__(Minimizer self) -> Minimizer
         Minimizer::Minimizer()
 
         """
-        this = _libBornAgainFit.new_Minimizer()
-        try:
-            self.this.append(this)
-        except __builtin__.Exception:
-            self.this = this
+        _libBornAgainFit.Minimizer_swiginit(self, _libBornAgainFit.new_Minimizer())
     __swig_destroy__ = _libBornAgainFit.delete_Minimizer
-    __del__ = lambda self: None
 
     def setMinimizer(self, *args):
-        """
-        setMinimizer(Minimizer self, std::string const & minimizerName, std::string const & algorithmName, std::string const & options)
-        setMinimizer(Minimizer self, std::string const & minimizerName, std::string const & algorithmName)
-        setMinimizer(Minimizer self, std::string const & minimizerName)
+        r"""
+        setMinimizer(Minimizer self, std::string const & minimizerName, std::string const & algorithmName="", std::string const & options="")
         setMinimizer(Minimizer self, IMinimizer minimizer)
-
         void Minimizer::setMinimizer(IMinimizer *minimizer)
 
         """
         return _libBornAgainFit.Minimizer_setMinimizer(self, *args)
 
-
     def minimize_cpp(self, callback, parameters):
-        """
+        r"""
         minimize_cpp(Minimizer self, PyCallback callback, Parameters parameters) -> MinimizerResult
-
         MinimizerResult Minimizer::minimize(PyCallback &callback, const Parameters &parameters)
 
         Finds minimum of user objective function (to be called from Python). 
@@ -2850,7 +2295,6 @@ class Minimizer(_object):
         """
         return _libBornAgainFit.Minimizer_minimize_cpp(self, callback, parameters)
 
-
     def minimize(self, callback, pars):
         if not callable(callback):
             raise Exception("Not a Python callable")
@@ -2868,8 +2312,9 @@ class Minimizer(_object):
             raise Exception("Wrong callable type")
 
 
-Minimizer_swigregister = _libBornAgainFit.Minimizer_swigregister
-Minimizer_swigregister(Minimizer)
+
+# Register Minimizer in _libBornAgainFit:
+_libBornAgainFit.Minimizer_swigregister(Minimizer)
 
 
 class ParametersIterator(object):
@@ -2902,5 +2347,4 @@ class CallableWrapper(PyCallback):
         return self.f_(obj)
 
 
-# This file is compatible with both classic and new-style classes.
 
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 4382fb66d0df1ba24f6c4541c483476a39cbb8a9..893e3aaada81bd2bd28625f07749c3d15ad28056 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -165,11 +165,16 @@ template <typename T> T SwigValueInit() {
 #endif
 
 
+#if defined(__GNUC__) && defined(_WIN32) && !defined(SWIG_PYTHON_NO_HYPOT_WORKAROUND)
+/* Workaround for '::hypot' has not been declared', see https://bugs.python.org/issue11566 */
+# include <math.h>
+#endif
+
 #if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
 /* Use debug wrappers with the Python release dll */
 # undef _DEBUG
 # include <Python.h>
-# define _DEBUG
+# define _DEBUG 1
 #else
 # include <Python.h>
 #endif
@@ -219,6 +224,7 @@ template <typename T> T SwigValueInit() {
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
+#define SWIG_POINTER_NO_NULL       0x4
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -804,14 +810,16 @@ SWIGINTERN char*
 SWIG_Python_str_AsChar(PyObject *str)
 {
 #if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
+  char *newstr = 0;
   str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
+  if (str) {
+    char *cstr;
+    Py_ssize_t len;
+    PyBytes_AsStringAndSize(str, &cstr, &len);
+    newstr = (char *) malloc(len+1);
+    memcpy(newstr, cstr, len+1);
+    Py_XDECREF(str);
+  }
   return newstr;
 #else
   return PyString_AsString(str);
@@ -835,144 +843,14 @@ SWIG_Python_str_FromChar(const char *c)
 #endif
 }
 
-/* Add PyOS_snprintf for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-#  define PyOS_snprintf _snprintf
-# else
-#  define PyOS_snprintf snprintf
-# endif
-#endif
-
-/* A crude PyString_FromFormat implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-
-#ifndef SWIG_PYBUFFER_SIZE
-# define SWIG_PYBUFFER_SIZE 1024
-#endif
-
-static PyObject *
-PyString_FromFormat(const char *fmt, ...) {
-  va_list ap;
-  char buf[SWIG_PYBUFFER_SIZE * 2];
-  int res;
-  va_start(ap, fmt);
-  res = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
-}
-#endif
-
 #ifndef PyObject_DEL
 # define PyObject_DEL PyObject_Del
 #endif
 
-/* A crude PyExc_StopIteration exception for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# ifndef PyExc_StopIteration
-#  define PyExc_StopIteration PyExc_RuntimeError
-# endif
-# ifndef PyObject_GenericGetAttr
-#  define PyObject_GenericGetAttr 0
-# endif
-#endif
-
-/* Py_NotImplemented is defined in 2.1 and up. */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef Py_NotImplemented
-#  define Py_NotImplemented PyExc_RuntimeError
-# endif
-#endif
-
-/* A crude PyString_AsStringAndSize implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef PyString_AsStringAndSize
-#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
-# endif
-#endif
-
-/* PySequence_Size for old Pythons */
-#if PY_VERSION_HEX < 0x02000000
-# ifndef PySequence_Size
-#  define PySequence_Size PySequence_Length
-# endif
-#endif
-
-/* PyBool_FromLong for old Pythons */
-#if PY_VERSION_HEX < 0x02030000
-static
-PyObject *PyBool_FromLong(long ok)
-{
-  PyObject *result = ok ? Py_True : Py_False;
-  Py_INCREF(result);
-  return result;
-}
-#endif
-
-/* Py_ssize_t for old Pythons */
-/* This code is as recommended by: */
-/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-# define PY_SSIZE_T_MAX INT_MAX
-# define PY_SSIZE_T_MIN INT_MIN
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intintargfunc ssizessizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-typedef intintobjargproc ssizessizeobjargproc;
-typedef getreadbufferproc readbufferproc;
-typedef getwritebufferproc writebufferproc;
-typedef getsegcountproc segcountproc;
-typedef getcharbufferproc charbufferproc;
-static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
-{
-  long result = 0;
-  PyObject *i = PyNumber_Int(x);
-  if (i) {
-    result = PyInt_AsLong(i);
-    Py_DECREF(i);
-  }
-  return result;
-}
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
-#endif
-
-#if PY_VERSION_HEX < 0x02040000
-#define Py_VISIT(op)				\
-  do { 						\
-    if (op) {					\
-      int vret = visit((op), arg);		\
-      if (vret)					\
-        return vret;				\
-    }						\
-  } while (0)
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef struct {
-  PyTypeObject type;
-  PyNumberMethods as_number;
-  PyMappingMethods as_mapping;
-  PySequenceMethods as_sequence;
-  PyBufferProcs as_buffer;
-  PyObject *name, *slots;
-} PyHeapTypeObject;
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef destructor freefunc;
-#endif
-
-#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
-     (PY_MAJOR_VERSION > 3))
+// SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user
+// interface files check for it.
 # define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-#endif
+# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
 
 #if PY_VERSION_HEX < 0x03020000
 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
@@ -1035,14 +913,17 @@ SWIG_Python_AddErrorMsg(const char* mesg)
   PyObject *value = 0;
   PyObject *traceback = 0;
 
-  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (PyErr_Occurred())
+    PyErr_Fetch(&type, &value, &traceback);
   if (value) {
-    char *tmp;
     PyObject *old_str = PyObject_Str(value);
+    const char *tmp = SWIG_Python_str_AsChar(old_str);
     PyErr_Clear();
     Py_XINCREF(type);
-
-    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    if (tmp)
+      PyErr_Format(type, "%s %s", tmp, mesg);
+    else
+      PyErr_Format(type, "%s", mesg);
     SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
@@ -1051,6 +932,37 @@ SWIG_Python_AddErrorMsg(const char* mesg)
   }
 }
 
+SWIGRUNTIME int
+SWIG_Python_TypeErrorOccurred(PyObject *obj)
+{
+  PyObject *error;
+  if (obj)
+    return 0;
+  error = PyErr_Occurred();
+  return error && PyErr_GivenExceptionMatches(error, PyExc_TypeError);
+}
+
+SWIGRUNTIME void
+SWIG_Python_RaiseOrModifyTypeError(const char *message)
+{
+  if (SWIG_Python_TypeErrorOccurred(NULL)) {
+    /* Use existing TypeError to preserve stacktrace and enhance with given message */
+    PyObject *newvalue;
+    PyObject *type = NULL, *value = NULL, *traceback = NULL;
+    PyErr_Fetch(&type, &value, &traceback);
+#if PY_VERSION_HEX >= 0x03000000
+    newvalue = PyUnicode_FromFormat("%S\nAdditional information:\n%s", value, message);
+#else
+    newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message);
+#endif
+    Py_XDECREF(value);
+    PyErr_Restore(type, newvalue, traceback);
+  } else {
+    /* Raise TypeError using given message */
+    PyErr_SetString(PyExc_TypeError, message);
+  }
+}
+
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -1058,9 +970,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 #endif
 #if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
 #  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
-#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
-#      define SWIG_PYTHON_USE_GIL
-#    endif
+#    define SWIG_PYTHON_USE_GIL
 #  endif
 #  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
 #    ifndef SWIG_PYTHON_INITIALIZE_THREADS
@@ -1137,30 +1047,13 @@ extern "C" {
 /* Constant information structure */
 typedef struct swig_const_info {
   int type;
-  char *name;
+  const char *name;
   long lvalue;
   double dvalue;
   void   *pvalue;
   swig_type_info **ptype;
 } swig_const_info;
 
-
-/* -----------------------------------------------------------------------------
- * Wrapper of PyInstanceMethod_New() used in Python 3
- * It is exported to the generated module, used for -fastproxy
- * ----------------------------------------------------------------------------- */
-#if PY_VERSION_HEX >= 0x03000000
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
-{
-  return PyInstanceMethod_New(func);
-}
-#else
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
-{
-  return NULL;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif
@@ -1175,6 +1068,14 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
  *
  * ----------------------------------------------------------------------------- */
 
+#if PY_VERSION_HEX < 0x02070000 /* 2.7.0 */
+# error "This version of SWIG only supports Python >= 2.7"
+#endif
+
+#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03020000
+# error "This version of SWIG only supports Python 3 >= 3.2"
+#endif
+
 /* Common SWIG API */
 
 /* for raw pointers */
@@ -1258,11 +1159,7 @@ SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);
   if (public_interface)
     SwigPyBuiltin_AddPublicSymbol(public_interface, name);
@@ -1272,11 +1169,7 @@ SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *nam
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);                            
 }
 
@@ -1286,7 +1179,6 @@ SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {
 
 SWIGINTERN PyObject*
 SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
-#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
   if (!result) {
     result = obj;
   } else if (result == Py_None) {
@@ -1302,29 +1194,6 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
     Py_DECREF(obj);
   }
   return result;
-#else
-  PyObject*   o2;
-  PyObject*   o3;
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyTuple_Check(result)) {
-      o2 = result;
-      result = PyTuple_New(1);
-      PyTuple_SET_ITEM(result, 0, o2);
-    }
-    o3 = PyTuple_New(1);
-    PyTuple_SET_ITEM(o3, 0, obj);
-    o2 = result;
-    result = PySequence_Concat(o2, o3);
-    Py_DECREF(o2);
-    Py_DECREF(o3);
-  }
-  return result;
-#endif
 }
 
 /* Unpack the argument tuple */
@@ -1376,11 +1245,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 }
 
 /* A functor is a function object with one single object argument */
-#if PY_VERSION_HEX >= 0x02020000
 #define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
-#else
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
-#endif
 
 /*
   Helper for static pointer initialization for both C and C++ code, for example
@@ -1409,35 +1274,6 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 extern "C" {
 #endif
 
-/*  How to access Py_None */
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  ifndef SWIG_PYTHON_NO_BUILD_NONE
-#    ifndef SWIG_PYTHON_BUILD_NONE
-#      define SWIG_PYTHON_BUILD_NONE
-#    endif
-#  endif
-#endif
-
-#ifdef SWIG_PYTHON_BUILD_NONE
-#  ifdef Py_None
-#   undef Py_None
-#   define Py_None SWIG_Py_None()
-#  endif
-SWIGRUNTIMEINLINE PyObject * 
-_SWIG_Py_None(void)
-{
-  PyObject *none = Py_BuildValue((char*)"");
-  Py_DECREF(none);
-  return none;
-}
-SWIGRUNTIME PyObject * 
-SWIG_Py_None(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
-  return none;
-}
-#endif
-
 /* The python void return value */
 
 SWIGRUNTIMEINLINE PyObject * 
@@ -1464,7 +1300,10 @@ SWIGRUNTIMEINLINE int
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
   SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
-  return data ? data->implicitconv : 0;
+  int fail = data ? data->implicitconv : 0;
+  if (fail)
+    PyErr_SetString(PyExc_TypeError, "Implicit conversion is prohibited for explicit constructors.");
+  return fail;
 }
 
 SWIGRUNTIMEINLINE PyObject *
@@ -1491,11 +1330,7 @@ SwigPyClientData_New(PyObject* obj)
       data->newargs = obj;
       Py_INCREF(obj);
     } else {
-#if (PY_VERSION_HEX < 0x02020000)
-      data->newraw = 0;
-#else
-      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
-#endif
+      data->newraw = PyObject_GetAttrString(data->klass, "__new__");
       if (data->newraw) {
 	Py_INCREF(data->newraw);
 	data->newargs = PyTuple_New(1);
@@ -1506,7 +1341,7 @@ SwigPyClientData_New(PyObject* obj)
       Py_INCREF(data->newargs);
     }
     /* the destroy method, aka as the C++ delete method */
-    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    data->destroy = PyObject_GetAttrString(data->klass, "__swig_destroy__");
     if (PyErr_Occurred()) {
       PyErr_Clear();
       data->destroy = 0;
@@ -1515,11 +1350,7 @@ SwigPyClientData_New(PyObject* obj)
       int flags;
       Py_INCREF(data->destroy);
       flags = PyCFunction_GET_FLAGS(data->destroy);
-#ifdef METH_O
       data->delargs = !(flags & (METH_O));
-#else
-      data->delargs = 0;
-#endif
     } else {
       data->delargs = 0;
     }
@@ -1607,20 +1438,12 @@ SwigPyObject_hex(SwigPyObject *v)
 }
 
 SWIGRUNTIME PyObject *
-#ifdef METH_NOARGS
 SwigPyObject_repr(SwigPyObject *v)
-#else
-SwigPyObject_repr(SwigPyObject *v, PyObject *args)
-#endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
   PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
   if (v->next) {
-# ifdef METH_NOARGS
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-# else
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-# endif
 # if PY_VERSION_HEX >= 0x03000000
     PyObject *joined = PyUnicode_Concat(repr, nrep);
     Py_DecRef(repr);
@@ -1633,6 +1456,14 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
   return repr;  
 }
 
+/* We need a version taking two PyObject* parameters so it's a valid
+ * PyCFunction to use in swigobject_methods[]. */
+SWIGRUNTIME PyObject *
+SwigPyObject_repr2(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
+{
+  return SwigPyObject_repr((SwigPyObject*)v);
+}
+
 SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
@@ -1706,14 +1537,14 @@ SwigPyObject_dealloc(PyObject *v)
       PyObject *res;
 
       /* PyObject_CallFunction() has the potential to silently drop
-         the active active exception.  In cases of unnamed temporary
+         the active exception.  In cases of unnamed temporary
          variable or where we just finished iterating over a generator
          StopIteration will be active right now, and this needs to
          remain true upon return from SwigPyObject_dealloc.  So save
          and restore. */
       
-      PyObject *val = NULL, *type = NULL, *tb = NULL;
-      PyErr_Fetch(&val, &type, &tb);
+      PyObject *type = NULL, *value = NULL, *traceback = NULL;
+      PyErr_Fetch(&type, &value, &traceback);
 
       if (data->delargs) {
         /* we need to create a temporary object to carry the destroy operation */
@@ -1728,7 +1559,7 @@ SwigPyObject_dealloc(PyObject *v)
       if (!res)
         PyErr_WriteUnraisable(destroy);
 
-      PyErr_Restore(val, type, tb);
+      PyErr_Restore(type, value, traceback);
 
       Py_XDECREF(res);
     } 
@@ -1747,11 +1578,6 @@ SWIGRUNTIME PyObject*
 SwigPyObject_append(PyObject* v, PyObject* next)
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
-#ifndef METH_O
-  PyObject *tmp = 0;
-  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
-  next = tmp;
-#endif
   if (!SwigPyObject_Check(next)) {
     PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
     return NULL;
@@ -1762,11 +1588,7 @@ SwigPyObject_append(PyObject* v, PyObject* next)
 }
 
 SWIGRUNTIME PyObject* 
-#ifdef METH_NOARGS
-SwigPyObject_next(PyObject* v)
-#else
 SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
@@ -1778,11 +1600,7 @@ SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_disown(PyObject *v)
-#else
 SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
@@ -1790,11 +1608,7 @@ SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_acquire(PyObject *v)
-#else
 SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
@@ -1805,70 +1619,32 @@ SWIGINTERN PyObject*
 SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
-#if (PY_VERSION_HEX < 0x02020000)
-  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#elif (PY_VERSION_HEX < 0x02050000)
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
-#else
-  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
-#endif
-    {
-      return NULL;
+  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) {
+    return NULL;
+  } else {
+    SwigPyObject *sobj = (SwigPyObject *)v;
+    PyObject *obj = PyBool_FromLong(sobj->own);
+    if (val) {
+      if (PyObject_IsTrue(val)) {
+        SwigPyObject_acquire(v,args);
+      } else {
+        SwigPyObject_disown(v,args);
+      }
     } 
-  else
-    {
-      SwigPyObject *sobj = (SwigPyObject *)v;
-      PyObject *obj = PyBool_FromLong(sobj->own);
-      if (val) {
-#ifdef METH_NOARGS
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v);
-	} else {
-	  SwigPyObject_disown(v);
-	}
-#else
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v,args);
-	} else {
-	  SwigPyObject_disown(v,args);
-	}
-#endif
-      } 
-      return obj;
-    }
+    return obj;
+  }
 }
 
-#ifdef METH_O
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#else
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {"disown",  SwigPyObject_disown,  METH_NOARGS,  "releases ownership of the pointer"},
+  {"acquire", SwigPyObject_acquire, METH_NOARGS,  "acquires ownership of the pointer"},
+  {"own",     SwigPyObject_own,     METH_VARARGS, "returns/sets ownership of the pointer"},
+  {"append",  SwigPyObject_append,  METH_O,       "appends another 'this' object"},
+  {"next",    SwigPyObject_next,    METH_NOARGS,  "returns the next 'this' object"},
+  {"__repr__",SwigPyObject_repr2,   METH_NOARGS,  "returns object representation"},
   {0, 0, 0, 0}  
 };
-#endif
-
-#if PY_VERSION_HEX < 0x02020000
-SWIGINTERN PyObject *
-SwigPyObject_getattr(SwigPyObject *sobj,char *name)
-{
-  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
-}
-#endif
 
 SWIGRUNTIME PyTypeObject*
 SwigPyObject_TypeOnce(void) {
@@ -1913,12 +1689,8 @@ SwigPyObject_TypeOnce(void) {
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */
 #elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
-#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+#else
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
-    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
@@ -1932,16 +1704,12 @@ SwigPyObject_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyObject",               /* tp_name */
+      "SwigPyObject",                       /* tp_name */
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
       0,                                    /* tp_print */
-#if PY_VERSION_HEX < 0x02020000
-      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
-#else
       (getattrfunc)0,                       /* tp_getattr */
-#endif
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX >= 0x03000000
       0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
@@ -1964,7 +1732,6 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_clear */
       (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       swigobject_methods,                   /* tp_methods */
@@ -1985,13 +1752,8 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -1999,20 +1761,14 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpyobject_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpyobject_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpyobject_type) < 0)
       return NULL;
-#endif
   }
   return &swigpyobject_type;
 }
@@ -2041,20 +1797,6 @@ typedef struct {
   size_t size;
 } SwigPyPacked;
 
-SWIGRUNTIME int
-SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char result[SWIG_BUFFER_SIZE];
-  fputs("<Swig Packed ", fp); 
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    fputs("at ", fp); 
-    fputs(result, fp); 
-  }
-  fputs(v->ty->name,fp); 
-  fputs(">", fp);
-  return 0; 
-}
-  
 SWIGRUNTIME PyObject *
 SwigPyPacked_repr(SwigPyPacked *v)
 {
@@ -2083,7 +1825,7 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
   size_t i = v->size;
   size_t j = w->size;
   int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
-  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+  return s ? s : strncmp((const char *)v->pack, (const char *)w->pack, 2*v->size);
 }
 
 SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
@@ -2123,11 +1865,11 @@ SwigPyPacked_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyPacked",               /* tp_name */
+      "SwigPyPacked",                       /* tp_name */
       sizeof(SwigPyPacked),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
+      0,                                    /* tp_print */
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000
@@ -2151,7 +1893,6 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_clear */
       0,                                    /* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       0,                                    /* tp_methods */
@@ -2172,13 +1913,8 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -2186,20 +1922,14 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpypacked_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpypacked_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpypacked_type) < 0)
       return NULL;
-#endif
   }
   return &swigpypacked_type;
 }
@@ -2240,20 +1970,14 @@ SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
  * pointers/data manipulation
  * ----------------------------------------------------------------------------- */
 
-SWIGRUNTIMEINLINE PyObject *
-_SWIG_This(void)
-{
-    return SWIG_Python_str_FromChar("this");
-}
-
-static PyObject *swig_this = NULL;
+static PyObject *Swig_This_global = NULL;
 
 SWIGRUNTIME PyObject *
 SWIG_This(void)
 {
-  if (swig_this == NULL)
-    swig_this = _SWIG_This();
-  return swig_this;
+  if (Swig_This_global == NULL)
+    Swig_This_global = SWIG_Python_str_FromChar("this");
+  return Swig_This_global;
 }
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
@@ -2285,7 +2009,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
   obj = 0;
 
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
   if (PyInstance_Check(pyobj)) {
     obj = _PyInstance_Lookup(pyobj, SWIG_This());      
   } else {
@@ -2355,7 +2079,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
   if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
-    return SWIG_OK;
+    return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
   }
 
   res = SWIG_ERROR;
@@ -2435,13 +2159,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
           }
         }
       }
-    }
-    if (!SWIG_IsOK(res) && obj == Py_None) {
-      if (ptr)
-        *ptr = 0;
-      if (PyErr_Occurred())
-        PyErr_Clear();
-      res = SWIG_OK;
+      if (!SWIG_IsOK(res) && obj == Py_None) {
+        if (ptr)
+          *ptr = 0;
+        if (PyErr_Occurred())
+          PyErr_Clear();
+        res = SWIG_OK;
+      }
     }
   }
   return res;
@@ -2455,31 +2179,28 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     return SWIG_ConvertPtr(obj, ptr, ty, 0);
   } else {
     void *vptr = 0;
-    
+    swig_cast_info *tc;
+
     /* here we get the method pointer for callbacks */
     const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
     if (desc)
       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
+    if (!desc)
       return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
+    tc = SWIG_TypeCheck(desc,ty);
+    if (tc) {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     } else {
-      *ptr = vptr;
+      return SWIG_ERROR;
     }
     return SWIG_OK;
   }
 }
 
-/* Convert a packed value value */
+/* Convert a packed pointer value */
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
@@ -2507,7 +2228,6 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 SWIGRUNTIME PyObject* 
 SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
-#if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
   PyObject *newraw = data->newraw;
   if (newraw) {
@@ -2530,10 +2250,18 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
     }
   } else {
 #if PY_VERSION_HEX >= 0x03000000
-    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    if (inst) {
-      PyObject_SetAttr(inst, SWIG_This(), swig_this);
-      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    PyObject *empty_args = PyTuple_New(0);
+    if (empty_args) {
+      PyObject *empty_kwargs = PyDict_New();
+      if (empty_kwargs) {
+        inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, empty_kwargs);
+        Py_DECREF(empty_kwargs);
+        if (inst) {
+          PyObject_SetAttr(inst, SWIG_This(), swig_this);
+          Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+        }
+      }
+      Py_DECREF(empty_args);
     }
 #else
     PyObject *dict = PyDict_New();
@@ -2545,45 +2273,13 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 #endif
   }
   return inst;
-#else
-#if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst = 0;
-  PyObject *dict = PyDict_New();
-  if (dict) {
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-  }
-  return (PyObject *) inst;
-#else
-  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
-  if (inst == NULL) {
-    return NULL;
-  }
-  inst->in_class = (PyClassObject *)data->newargs;
-  Py_INCREF(inst->in_class);
-  inst->in_dict = PyDict_New();
-  if (inst->in_dict == NULL) {
-    Py_DECREF(inst);
-    return NULL;
-  }
-#ifdef Py_TPFLAGS_HAVE_WEAKREFS
-  inst->in_weakreflist = NULL;
-#endif
-#ifdef Py_TPFLAGS_GC
-  PyObject_GC_Init(inst);
-#endif
-  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
-  return (PyObject *) inst;
-#endif
-#endif
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
 {
  PyObject *dict;
-#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
  PyObject **dictptr = _PyObject_GetDictPtr(inst);
  if (dictptr != NULL) {
    dict = *dictptr;
@@ -2595,7 +2291,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
    return;
  }
 #endif
- dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ dict = PyObject_GetAttrString(inst, "__dict__");
  PyDict_SetItem(dict, SWIG_This(), swig_this);
  Py_DECREF(dict);
 } 
@@ -2694,12 +2390,7 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
 #ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
 #else
-# ifdef SWIGPY_USE_CAPSULE
     type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-# else
-    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-# endif
     if (PyErr_Occurred()) {
       PyErr_Clear();
       type_pointer = (void *)0;
@@ -2709,48 +2400,10 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return (swig_module_info *) type_pointer;
 }
 
-#if PY_MAJOR_VERSION < 2
-/* PyModule_AddObject function was introduced in Python 2.0.  The following function
-   is copied out of Python/modsupport.c in python version 2.3.4 */
-SWIGINTERN int
-PyModule_AddObject(PyObject *m, char *name, PyObject *o)
-{
-  PyObject *dict;
-  if (!PyModule_Check(m)) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg");
-    return SWIG_ERROR;
-  }
-  if (!o) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value");
-    return SWIG_ERROR;
-  }
-  
-  dict = PyModule_GetDict(m);
-  if (dict == NULL) {
-    /* Internal error -- modules must have a dict! */
-    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
-		 PyModule_GetName(m));
-    return SWIG_ERROR;
-  }
-  if (PyDict_SetItemString(dict, name, o))
-    return SWIG_ERROR;
-  Py_DECREF(o);
-  return SWIG_OK;
-}
-#endif
-
 SWIGRUNTIME void
-#ifdef SWIGPY_USE_CAPSULE
 SWIG_Python_DestroyModule(PyObject *obj)
-#else
-SWIG_Python_DestroyModule(void *vptr)
-#endif
 {
-#ifdef SWIGPY_USE_CAPSULE
   swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
-#else
-  swig_module_info *swig_module = (swig_module_info *) vptr;
-#endif
   swig_type_info **types = swig_module->types;
   size_t i;
   for (i =0; i < swig_module->size; ++i) {
@@ -2761,33 +2414,24 @@ SWIG_Python_DestroyModule(void *vptr)
     }
   }
   Py_DECREF(SWIG_This());
-  swig_this = NULL;
+  Swig_This_global = NULL;
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
 #if PY_VERSION_HEX >= 0x03000000
  /* Add a dummy module object into sys.modules */
-  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+  PyObject *module = PyImport_AddModule("swig_runtime_data" SWIG_RUNTIME_VERSION);
 #else
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
+  PyObject *module = Py_InitModule("swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
 #endif
-#ifdef SWIGPY_USE_CAPSULE
   PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
   if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#else
-  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+    PyModule_AddObject(module, "type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
   } else {
     Py_XDECREF(pointer);
   }
-#endif
 }
 
 /* The python cached type query */
@@ -2805,20 +2449,12 @@ SWIG_Python_TypeQuery(const char *type)
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
-#ifdef SWIGPY_USE_CAPSULE
     descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
-#else
-    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-#endif
   } else {
     swig_module_info *swig_module = SWIG_GetModule(0);
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
-#ifdef SWIGPY_USE_CAPSULE
       obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-#else
-      obj = PyCObject_FromVoidPtr(descriptor, NULL);
-#endif
       PyDict_SetItem(cache, key, obj);
       Py_DECREF(obj);
     }
@@ -2843,14 +2479,15 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront)
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
-      char *tmp;
       PyObject *old_str = PyObject_Str(value);
+      const char *tmp = SWIG_Python_str_AsChar(old_str);
+      const char *errmesg = tmp ? tmp : "Invalid error message";
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
+	PyErr_Format(type, "%s %s", mesg, errmesg);
       } else {
-	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+	PyErr_Format(type, "%s %s", errmesg, mesg);
       }
       SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
@@ -2976,6 +2613,8 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       Py_INCREF(name);
     } else {
       encoded_name = PyUnicode_AsUTF8String(name);
+      if (!encoded_name)
+        return -1;
     }
     PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
     Py_DECREF(encoded_name);
@@ -3002,6 +2641,21 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Method creation and docstring support functions */
+
+SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name);
+SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
+SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
+
+#ifdef __cplusplus
+}
+#endif
+
+
   #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) 
 
 /* -----------------------------------------------------------------------------
@@ -3220,46 +2874,6 @@ namespace Swig {
     }
   };
 
-  /* unknown exception handler  */
-  class UnknownExceptionHandler {
-#ifdef SWIG_DIRECTOR_UEH
-    static void handler() {
-      try {
-        throw;
-      } catch (DirectorException& e) {
-        std::cerr << "SWIG Director exception caught:" << std::endl
-                  << e.what() << std::endl;
-      } catch (std::exception& e) {
-        std::cerr << "std::exception caught: "<< e.what() << std::endl;
-      } catch (...) {
-        std::cerr << "Unknown exception caught." << std::endl;
-      }
-
-      std::cerr << std::endl
-                << "Python interpreter traceback:" << std::endl;
-      PyErr_Print();
-      std::cerr << std::endl;
-
-      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
-                << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
-                << std::endl
-                << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
-      throw;
-    }
-
-  public:
-
-    std::unexpected_handler old;
-    UnknownExceptionHandler(std::unexpected_handler nh = handler) {
-      old = std::set_unexpected(nh);
-    }
-
-    ~UnknownExceptionHandler() {
-      std::set_unexpected(old);
-    }
-#endif
-  };
-
   /* type mismatch in the return value from a python method call */
   class DirectorTypeMismatchException : public DirectorException {
   public:
@@ -3506,11 +3120,10 @@ static swig_module_info swig_module = {swig_types, 48, 0, 0, 0, 0};
 
 /* -------- TYPES TABLE (END) -------- */
 
-#if (PY_VERSION_HEX <= 0x02000000)
-# if !defined(SWIG_PYTHON_CLASSIC)
-#  error "This python version requires swig to be run with the '-classic' option"
-# endif
+#ifdef SWIG_TypeQuery
+# undef SWIG_TypeQuery
 #endif
+#define SWIG_TypeQuery SWIG_Python_TypeQuery
 
 /*-----------------------------------------------
               @(target):= _libBornAgainFit.so
@@ -3524,7 +3137,7 @@ static swig_module_info swig_module = {swig_types, 48, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_libBornAgainFit"
 
-#define SWIGVERSION 0x030012 
+#define SWIGVERSION 0x040001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -4253,7 +3866,7 @@ namespace swig {
   template <class Type>
   struct traits_asptr {   
     static int asptr(PyObject *obj, Type **val) {
-      Type *p;
+      Type *p = 0;
       swig_type_info *descriptor = type_info<Type>();
       int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
       if (SWIG_IsOK(res)) {
@@ -4315,14 +3928,14 @@ namespace swig {
 
   template <class Type> 
   struct traits_as<Type, value_category> {
-    static Type as(PyObject *obj, bool throw_error) {
+    static Type as(PyObject *obj) {
       Type v;
       int res = asval(obj, &v);
       if (!obj || !SWIG_IsOK(res)) {
 	if (!PyErr_Occurred()) {
 	  ::SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
+	throw std::invalid_argument("bad type");
       }
       return v;
     }
@@ -4330,7 +3943,7 @@ namespace swig {
 
   template <class Type> 
   struct traits_as<Type, pointer_category> {
-    static Type as(PyObject *obj, bool throw_error) {
+    static Type as(PyObject *obj) {
       Type *v = 0;      
       int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
       if (SWIG_IsOK(res) && v) {
@@ -4342,21 +3955,17 @@ namespace swig {
 	  return *v;
 	}
       } else {
-	// Uninitialized return value, no Type() constructor required.
-	static Type *v_def = (Type*) malloc(sizeof(Type));
 	if (!PyErr_Occurred()) {
 	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	memset(v_def,0,sizeof(Type));
-	return *v_def;
+	throw std::invalid_argument("bad type");
       }
     }
   };
 
   template <class Type> 
   struct traits_as<Type*, pointer_category> {
-    static Type* as(PyObject *obj, bool throw_error) {
+    static Type* as(PyObject *obj) {
       Type *v = 0;      
       int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
       if (SWIG_IsOK(res)) {
@@ -4365,15 +3974,14 @@ namespace swig {
 	if (!PyErr_Occurred()) {
 	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
 	}
-	if (throw_error) throw std::invalid_argument("bad type");
-	return 0;
+	throw std::invalid_argument("bad type");
       }
     }
   };
     
   template <class Type>
-  inline Type as(PyObject *obj, bool te = false) {
-    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
+  inline Type as(PyObject *obj) {
+    return traits_as<Type, typename traits<Type>::category>::as(obj);
   }
 
   template <class Type> 
@@ -4646,7 +4254,7 @@ namespace swig {
         typename Sequence::const_iterator isit = is.begin();
         typename Sequence::iterator it = self->begin();
         std::advance(it,ii);
-        for (size_t rc=0; rc<replacecount; ++rc) {
+        for (size_t rc=0; rc<replacecount && it != self->end(); ++rc) {
           *it++ = *isit++;
           for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
             it++;
@@ -4662,7 +4270,7 @@ namespace swig {
       typename Sequence::const_iterator isit = is.begin();
       typename Sequence::reverse_iterator it = self->rbegin();
       std::advance(it,size-ii-1);
-      for (size_t rc=0; rc<replacecount; ++rc) {
+      for (size_t rc=0; rc<replacecount && it != self->rend(); ++rc) {
         *it++ = *isit++;
         for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
           it++;
@@ -4810,16 +4418,16 @@ namespace swig {
   template<typename OutIterator, 
 	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
 	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
+  class SwigPyForwardIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
     typedef SwigPyIterator_T<out_iterator>  base;
-    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyForwardIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
     
-    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+    SwigPyForwardIteratorOpen_T(out_iterator curr, PyObject *seq)
       : SwigPyIterator_T<OutIterator>(curr, seq)
     {
     }
@@ -4841,6 +4449,25 @@ namespace swig {
       return this;
     }
 
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class SwigPyIteratorOpen_T :  public SwigPyForwardIteratorOpen_T<OutIterator, ValueType, FromOper>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    
+    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+      : SwigPyForwardIteratorOpen_T<OutIterator>(curr, seq)
+    {
+    }
+
     SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
@@ -4853,16 +4480,16 @@ namespace swig {
   template<typename OutIterator, 
 	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
 	   typename FromOper = from_oper<ValueType> >
-  class SwigPyIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
+  class SwigPyForwardIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
     typedef SwigPyIterator_T<out_iterator>  base;    
-    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyForwardIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
     
-    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+    SwigPyForwardIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
       : SwigPyIterator_T<OutIterator>(curr, seq), begin(first), end(last)
     {
     }
@@ -4892,10 +4519,33 @@ namespace swig {
       return this;
     }
 
+  protected:
+    out_iterator begin;
+    out_iterator end;
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class SwigPyIteratorClosed_T :  public SwigPyForwardIteratorClosed_T<OutIterator,ValueType,FromOper>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyForwardIteratorClosed_T<OutIterator, ValueType, FromOper> base0;
+    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    
+    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+      : SwigPyForwardIteratorClosed_T<OutIterator,ValueType,FromOper>(curr, first, last, seq)
+    {
+    }
+
     SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
-	if (base::current == begin) {
+	if (base::current == base0::begin) {
 	  throw stop_iteration();
 	} else {
 	  --base::current;
@@ -4903,12 +4553,16 @@ namespace swig {
       }
       return this;
     }
-
-  private:
-    out_iterator begin;
-    out_iterator end;
   };
 
+
+  template<typename OutIter>
+  inline SwigPyIterator*
+  make_output_forward_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
+  {
+    return new SwigPyForwardIteratorClosed_T<OutIter>(current, begin, end, seq);
+  }
+
   template<typename OutIter>
   inline SwigPyIterator*
   make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
@@ -4916,6 +4570,13 @@ namespace swig {
     return new SwigPyIteratorClosed_T<OutIter>(current, begin, end, seq);
   }
 
+  template<typename OutIter>
+  inline SwigPyIterator*
+  make_output_forward_iterator(const OutIter& current, PyObject *seq = 0)
+  {
+    return new SwigPyForwardIteratorOpen_T<OutIter>(current, seq);
+  }
+
   template<typename OutIter>
   inline SwigPyIterator*
   make_output_iterator(const OutIter& current, PyObject *seq = 0)
@@ -4940,8 +4601,8 @@ namespace swig
     {
       swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index);
       try {
-	return swig::as<T>(item, true);
-      } catch (std::exception& e) {
+	return swig::as<T>(item);
+      } catch (const std::invalid_argument& e) {
 	char msg[1024];
 	sprintf(msg, "in sequence element %d ", (int)_index);
 	if (!PyErr_Occurred()) {
@@ -5136,19 +4797,13 @@ namespace swig
       return const_reference(_seq, n);
     }
 
-    bool check(bool set_err = true) const
+    bool check() const
     {
       Py_ssize_t s = size();
       for (Py_ssize_t i = 0; i < s; ++i) {
 	swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
-	if (!swig::check<value_type>(item)) {
-	  if (set_err) {
-	    char msg[1024];
-	    sprintf(msg, "in sequence element %d", (int)i);
-	    SWIG_Error(SWIG_RuntimeError, msg);
-	  }
+	if (!swig::check<value_type>(item))
 	  return false;
-	}
       }
       return true;
     }
@@ -5404,6 +5059,42 @@ SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double
 SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____getitem____SWIG_1(std::vector< double > const *self,std::vector< double >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
+
+namespace swig {
+  static PyObject* container_owner_attribute() {
+    static PyObject* attr = SWIG_Python_str_FromChar("__swig_container");
+    return attr;
+  }
+
+  template <typename T>
+  struct container_owner {
+    // By default, do not add the back-reference (for value types)
+    // Specialization below will check the reference for pointer types.
+    static bool back_reference(PyObject* child, PyObject* owner) {
+      return false;
+    }
+  };
+
+  template <>
+  struct container_owner<swig::pointer_category> {  
+    /*
+     * Call to add a back-reference to the owning object when returning a 
+     * reference from a container.  Will only set the reference if child
+     * is a SWIG wrapper object that does not own the pointer.
+     *
+     * returns whether the reference was set or not
+     */
+    static bool back_reference(PyObject* child, PyObject* owner) {
+      SwigPyObject* swigThis = SWIG_Python_GetSwigThis(child);
+      if (swigThis && (swigThis->own & SWIG_POINTER_OWN) != SWIG_POINTER_OWN) {
+        PyObject_SetAttr(child, container_owner_attribute(), owner);
+        return true;
+      }
+      return false;
+    }
+  };
+}
+
 SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_2(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
@@ -5800,7 +5491,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_  (PyObject *o, std::complex<double>* val)
 
 
 SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/4.0.1/typemaps/swigmacros.swg,104,%ifcplusplus@*/
 
 const std::complex<double>&
 
@@ -5960,6 +5651,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
   {
     char *cstr; Py_ssize_t len;
+    int ret = SWIG_OK;
 #if PY_VERSION_HEX>=0x03000000
 #if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
     if (!alloc && cptr) {
@@ -5970,7 +5662,10 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
         return SWIG_RuntimeError;
     }
     obj = PyUnicode_AsUTF8String(obj);
-    if(alloc) *alloc = SWIG_NEWOBJ;
+    if (!obj)
+      return SWIG_TypeError;
+    if (alloc)
+      *alloc = SWIG_NEWOBJ;
 #endif
     PyBytes_AsStringAndSize(obj, &cstr, &len);
 #else
@@ -5978,21 +5673,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
     if (cptr) {
       if (alloc) {
-	/* 
-	   In python the user should not be able to modify the inner
-	   string representation. To warranty that, if you define
-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
-	   buffer is always returned.
-
-	   The default behavior is just to return the pointer value,
-	   so, be careful.
-	*/ 
-#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
-	if (*alloc != SWIG_OLDOBJ) 
-#else
-	if (*alloc == SWIG_NEWOBJ) 
-#endif
-	{
+	if (*alloc == SWIG_NEWOBJ) {
 	  *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
 	  *alloc = SWIG_NEWOBJ;
 	} else {
@@ -6008,6 +5689,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #endif
 #else
 	*cptr = SWIG_Python_str_AsChar(obj);
+        if (!*cptr)
+          ret = SWIG_TypeError;
 #endif
       }
     }
@@ -6015,7 +5698,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 #if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
     Py_XDECREF(obj);
 #endif
-    return SWIG_OK;
+    return ret;
   } else {
 #if defined(SWIG_PYTHON_2_UNICODE)
 #if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
@@ -6028,6 +5711,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
         return SWIG_RuntimeError;
       }
       obj = PyUnicode_AsUTF8String(obj);
+      if (!obj)
+        return SWIG_TypeError;
       if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
         if (cptr) {
           if (alloc) *alloc = SWIG_NEWOBJ;
@@ -6121,11 +5806,7 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 #if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
       return PyBytes_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
 #else
-#if PY_VERSION_HEX >= 0x03010000
       return PyUnicode_DecodeUTF8(carray, static_cast< Py_ssize_t >(size), "surrogateescape");
-#else
-      return PyUnicode_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
-#endif
 #endif
 #else
       return PyString_FromStringAndSize(carray, static_cast< Py_ssize_t >(size));
@@ -6328,7 +6009,8 @@ SwigDirector_PyCallback::~SwigDirector_PyCallback() {
 }
 
 double SwigDirector_PyCallback::call_scalar(Fit::Parameters pars) {
-  double c_result;
+  double c_result = SwigValueInit< double >() ;
+  
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new Fit::Parameters((const Fit::Parameters &)pars)), SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_OWN |  0 );
   if (!swig_get_self()) {
@@ -6338,9 +6020,10 @@ double SwigDirector_PyCallback::call_scalar(Fit::Parameters pars) {
   const size_t swig_method_index = 0;
   const char *const swig_method_name = "call_scalar";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"call_scalar", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("call_scalar");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -6364,7 +6047,7 @@ double SwigDirector_PyCallback::call_scalar(Fit::Parameters pars) {
 }
 
 
-std::vector< double,std::allocator< double > > SwigDirector_PyCallback::call_residuals(Fit::Parameters arg0) {
+std::vector< double, std::allocator< double > > SwigDirector_PyCallback::call_residuals(Fit::Parameters arg0) {
   std::vector< double,std::allocator< double > > c_result;
   swig::SwigVar_PyObject obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new Fit::Parameters((const Fit::Parameters &)arg0)), SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_OWN |  0 );
@@ -6375,9 +6058,10 @@ std::vector< double,std::allocator< double > > SwigDirector_PyCallback::call_res
   const size_t swig_method_index = 1;
   const char *const swig_method_name = "call_residuals";
   PyObject *method = swig_get_method(swig_method_index, swig_method_name);
-  swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0, NULL);
 #else
-  swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"call_residuals", (char *)"(O)" ,(PyObject *)obj0);
+  swig::SwigVar_PyObject swig_method_name = SWIG_Python_str_FromChar("call_residuals");
+  swig::SwigVar_PyObject result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0, NULL);
 #endif
   if (!result) {
     PyObject *error = PyErr_Occurred();
@@ -6410,10 +6094,11 @@ SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *SWIGUNUSEDPARM(self),
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_SwigPyIterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SwigPyIterator" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
@@ -6431,26 +6116,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *SWIGUNUSEDPARM(self),
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_value",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_value" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)((swig::SwigPyIterator const *)arg1)->value();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -6458,7 +6142,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -6466,32 +6150,28 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_incr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_incr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->incr(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -6499,31 +6179,28 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_incr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (swig::SwigPyIterator *)(arg1)->incr();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -6536,20 +6213,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_incr", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SwigPyIterator_incr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_incr__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -6563,13 +6236,13 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator_incr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_incr__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SwigPyIterator_incr'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SwigPyIterator_incr'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    swig::SwigPyIterator::incr(size_t)\n"
     "    swig::SwigPyIterator::incr()\n");
@@ -6577,7 +6250,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -6585,32 +6258,28 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_decr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_decr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->decr(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -6618,31 +6287,28 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_decr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (swig::SwigPyIterator *)(arg1)->decr();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -6655,20 +6321,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_decr", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_SwigPyIterator_decr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_decr__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -6682,13 +6344,13 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator_decr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_decr__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SwigPyIterator_decr'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SwigPyIterator_decr'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    swig::SwigPyIterator::decr(size_t)\n"
     "    swig::SwigPyIterator::decr()\n");
@@ -6704,17 +6366,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_distance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_distance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_distance" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -6724,11 +6385,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self
   arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
     result = ((swig::SwigPyIterator const *)arg1)->distance((swig::SwigPyIterator const &)*arg2);
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
   }
-  
   resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
   return resultobj;
 fail:
@@ -6744,17 +6403,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_equal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_equal", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_equal" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -6764,11 +6422,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self),
   arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
     result = (bool)((swig::SwigPyIterator const *)arg1)->equal((swig::SwigPyIterator const &)*arg2);
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
   }
-  
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -6781,11 +6437,12 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *SWIGUNUSEDPARM(self), P
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_copy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_copy" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
@@ -6803,26 +6460,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *SWIGUNUSEDPARM(self), P
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_next",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_next" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->next();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -6835,26 +6491,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *SWIGUNUSEDPARM(self
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator___next__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___next__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->__next__();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -6867,26 +6522,25 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *SWIGUNUSEDPARM(self
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_previous",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_previous" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->previous();
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = result;
   return resultobj;
 fail:
@@ -6902,32 +6556,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_advance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator_advance", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_advance" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_advance" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)(arg1)->advance(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
@@ -6943,17 +6594,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___eq__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___eq__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -6965,7 +6615,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self),
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -6977,17 +6629,16 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___ne__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___ne__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -6999,7 +6650,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self),
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -7011,32 +6664,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___iadd__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___iadd__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___iadd__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *) &(arg1)->operator +=(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -7052,32 +6702,29 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___isub__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___isub__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___isub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *) &(arg1)->operator -=(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -7093,40 +6740,39 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "SwigPyIterator___add__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___add__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -7134,40 +6780,38 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
     result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(arg2);
-  }
-  catch(swig::stop_iteration &_e) {
+  } catch(swig::stop_iteration &_e) {
     {
       (void)_e;
       SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
       SWIG_fail;
     }
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -7175,17 +6819,15 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
@@ -7197,7 +6839,9 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPA
   resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -7206,23 +6850,19 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator___sub__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__SwigPyIterator, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_SwigPyIterator___sub____SWIG_1(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -7237,7 +6877,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_SwigPyIterator___sub____SWIG_0(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -7250,7 +6890,7 @@ fail:
 
 SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7261,12 +6901,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_iterator(PyObject *SWIGUNUSEDPARM(self),
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_iterator" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -7284,11 +6925,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___nonzero__(PyObject *SWIGUNUSEDPARM(self
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___nonzero__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -7306,11 +6948,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___bool__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___bool__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -7328,11 +6971,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___len__(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___len__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -7356,37 +7000,32 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< double,std::allocator< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___getslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___getslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -7394,7 +7033,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -7405,36 +7044,30 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7442,7 +7075,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -7455,30 +7088,26 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -7489,14 +7118,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_double_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -7511,13 +7137,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -7533,7 +7155,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t___setslice____SWIG_0(self, args);
+          return _wrap_vdouble1d_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -7556,7 +7178,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble1d_t___setslice____SWIG_1(self, args);
+            return _wrap_vdouble1d_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -7564,7 +7186,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n"
     "    std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n");
@@ -7583,36 +7205,31 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___delslice__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___delslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< double >::difference_type >(val3);
   try {
     std_vector_Sl_double_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7620,7 +7237,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -7628,30 +7245,25 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___delitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
   try {
     std_vector_Sl_double_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7659,38 +7271,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double,std::allocator< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -7698,7 +7305,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -7706,25 +7313,22 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -7735,14 +7339,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< double,std::allocator< double > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -7752,37 +7353,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7790,37 +7386,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___delitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_double_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7833,13 +7424,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -7849,7 +7436,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___delitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -7863,13 +7450,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___delitem____SWIG_0(self, args);
+        return _wrap_vdouble1d_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__delitem__(std::vector< double >::difference_type)\n"
     "    std::vector< double >::__delitem__(PySliceObject *)\n");
@@ -7877,7 +7464,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -7885,29 +7472,26 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___getitem__" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___getitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
   try {
     result = (std::vector< double >::value_type *) &std_vector_Sl_double_Sg____getitem____SWIG_1((std::vector< double > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -7919,13 +7503,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -7935,7 +7515,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___getitem____SWIG_0(self, args);
+        return _wrap_vdouble1d_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -7949,13 +7529,13 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___getitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__getitem__(PySliceObject *)\n"
     "    std::vector< double >::__getitem__(std::vector< double >::difference_type) const\n");
@@ -7963,7 +7543,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::difference_type arg2 ;
@@ -7975,22 +7555,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setitem__" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t___setitem__" "', argument " "2"" of type '" "std::vector< double >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< double >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -7998,11 +7575,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   arg3 = &temp3;
   try {
     std_vector_Sl_double_Sg____setitem____SWIG_2(arg1,arg2,(double const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8015,13 +7590,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -8031,7 +7602,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble1d_t___setitem____SWIG_1(self, args);
+        return _wrap_vdouble1d_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -8047,7 +7618,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble1d_t___setitem____SWIG_0(self, args);
+          return _wrap_vdouble1d_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -8067,14 +7638,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t___setitem____SWIG_2(self, args);
+          return _wrap_vdouble1d_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::__setitem__(PySliceObject *,std::vector< double,std::allocator< double > > const &)\n"
     "    std::vector< double >::__setitem__(PySliceObject *)\n"
@@ -8088,22 +7659,21 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   try {
     result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -8120,16 +7690,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_append(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_append" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_append" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8143,11 +7712,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vdouble1d_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< double > *)new std::vector< double >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -8156,17 +7725,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > const &""'"); 
     }
@@ -8190,11 +7758,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_empty(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_empty" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -8212,11 +7781,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_size(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_size" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -8237,16 +7807,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_swap" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble1d_t_swap" "', argument " "2"" of type '" "std::vector< double > &""'"); 
   }
@@ -8267,11 +7836,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_begin" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8290,11 +7860,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_end(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_end" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8313,11 +7884,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_rbegin(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_rbegin" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8336,11 +7908,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_rend(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_rend" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8359,10 +7932,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8380,11 +7954,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(se
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -8397,16 +7972,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -8424,10 +7998,11 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_pop_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop_back" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -8440,7 +8015,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::size_type arg2 ;
@@ -8448,16 +8023,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_resize" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_resize" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -8470,7 +8043,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -8478,17 +8051,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_erase" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -8508,7 +8079,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -8519,18 +8090,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_erase" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -8541,7 +8109,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_erase" "', argument " "3"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -8566,13 +8134,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -8582,7 +8146,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< double >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vdouble1d_t_erase__SWIG_0(self, args);
+        return _wrap_vdouble1d_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -8599,14 +8163,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< double >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vdouble1d_t_erase__SWIG_1(self, args);
+          return _wrap_vdouble1d_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::erase(std::vector< double >::iterator)\n"
     "    std::vector< double >::erase(std::vector< double >::iterator,std::vector< double >::iterator)\n");
@@ -8614,7 +8178,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double >::size_type arg1 ;
   std::vector< double >::value_type *arg2 = 0 ;
@@ -8623,17 +8187,15 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< double > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vdouble1d_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double >::size_type""'");
   } 
   arg1 = static_cast< std::vector< double >::size_type >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vdouble1d_t" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8652,15 +8214,11 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vdouble1d_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vdouble1d_t__SWIG_0(self, args);
+    return _wrap_new_vdouble1d_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -8669,7 +8227,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vdouble1d_t__SWIG_2(self, args);
+      return _wrap_new_vdouble1d_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -8677,7 +8235,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vdouble1d_t__SWIG_1(self, args);
+      return _wrap_new_vdouble1d_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -8692,13 +8250,13 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vdouble1d_t__SWIG_3(self, args);
+        return _wrap_new_vdouble1d_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vdouble1d_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vdouble1d_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::vector()\n"
     "    std::vector< double >::vector(std::vector< double > const &)\n"
@@ -8717,16 +8275,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_push_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double >::value_type temp2 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_push_back" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_push_back" "', argument " "2"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8745,17 +8302,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_front" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   result = (std::vector< double >::value_type *) &((std::vector< double > const *)arg1)->front();
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -8767,17 +8326,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_back" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
   result = (std::vector< double >::value_type *) &((std::vector< double > const *)arg1)->back();
   resultobj = SWIG_From_double(static_cast< double >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< double >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -8796,22 +8357,20 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_assign" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_assign" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
   arg2 = static_cast< std::vector< double >::size_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_assign" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8825,7 +8384,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::size_type arg2 ;
@@ -8837,22 +8396,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_resize" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_resize" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
   arg2 = static_cast< std::vector< double >::size_type >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_resize" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8871,13 +8427,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -8888,7 +8440,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble1d_t_resize__SWIG_0(self, args);
+        return _wrap_vdouble1d_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -8907,14 +8459,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t_resize__SWIG_1(self, args);
+          return _wrap_vdouble1d_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::resize(std::vector< double >::size_type)\n"
     "    std::vector< double >::resize(std::vector< double >::size_type,std::vector< double >::value_type const &)\n");
@@ -8922,7 +8474,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -8934,18 +8486,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp3 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< double >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_insert" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -8956,7 +8505,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_insert" "', argument " "3"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -8971,7 +8520,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   std::vector< double >::iterator arg2 ;
@@ -8986,18 +8535,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   std::vector< double >::value_type temp4 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_insert" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
   } else {
@@ -9008,12 +8553,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble1d_t_insert" "', argument " "2"" of type '" "std::vector< double >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t_insert" "', argument " "3"" of type '" "std::vector< double >::size_type""'");
   } 
   arg3 = static_cast< std::vector< double >::size_type >(val3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vdouble1d_t_insert" "', argument " "4"" of type '" "std::vector< double >::value_type""'");
   } 
@@ -9032,13 +8577,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble1d_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
@@ -9053,7 +8594,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble1d_t_insert__SWIG_0(self, args);
+          return _wrap_vdouble1d_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -9077,7 +8618,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vdouble1d_t_insert__SWIG_1(self, args);
+            return _wrap_vdouble1d_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -9085,7 +8626,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble1d_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< double >::insert(std::vector< double >::iterator,std::vector< double >::value_type const &)\n"
     "    std::vector< double >::insert(std::vector< double >::iterator,std::vector< double >::size_type,std::vector< double >::value_type const &)\n");
@@ -9101,16 +8642,15 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_reserve(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble1d_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_reserve" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< double > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble1d_t_reserve" "', argument " "2"" of type '" "std::vector< double >::size_type""'");
   } 
@@ -9128,11 +8668,12 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_capacity(PyObject *SWIGUNUSEDPARM(self),
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_capacity" "', argument " "1"" of type '" "std::vector< double > const *""'"); 
   }
@@ -9150,10 +8691,11 @@ SWIGINTERN PyObject *_wrap_delete_vdouble1d_t(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< double > *arg1 = (std::vector< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vdouble1d_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > *""'"); 
   }
@@ -9168,23 +8710,28 @@ fail:
 
 SWIGINTERN PyObject *vdouble1d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vdouble1d_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vdouble2d_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_iterator" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -9202,11 +8749,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___nonzero__(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -9224,11 +8772,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___bool__(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___bool__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -9246,11 +8795,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___len__(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___len__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -9274,37 +8824,32 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___getslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___getslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     result = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)std_vector_Sl_std_vector_Sl_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -9312,7 +8857,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -9323,36 +8868,30 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9360,7 +8899,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -9373,30 +8912,26 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -9407,14 +8942,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -9429,13 +8961,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -9451,7 +8979,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vdouble2d_t___setslice____SWIG_0(self, args);
+          return _wrap_vdouble2d_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -9474,7 +9002,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
           int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble2d_t___setslice____SWIG_1(self, args);
+            return _wrap_vdouble2d_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -9482,7 +9010,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n"
     "    std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n");
@@ -9501,36 +9029,31 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delslice__(PyObject *SWIGUNUSEDPARM(sel
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___delslice__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___delslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9538,7 +9061,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -9546,30 +9069,25 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___delitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9577,38 +9095,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -9616,7 +9129,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -9624,25 +9137,22 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); 
     }
@@ -9653,14 +9163,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -9670,37 +9177,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9708,37 +9210,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___delitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9751,13 +9248,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -9767,7 +9260,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___delitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -9781,13 +9274,13 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___delitem____SWIG_0(self, args);
+        return _wrap_vdouble2d_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__delitem__(std::vector< std::vector< double > >::difference_type)\n"
     "    std::vector< std::vector< double > >::__delitem__(PySliceObject *)\n");
@@ -9795,7 +9288,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -9803,29 +9296,26 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___getitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___getitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   try {
     result = (std::vector< std::vector< double > >::value_type *) &std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_1((std::vector< std::vector< double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -9837,13 +9327,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -9853,7 +9339,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___getitem____SWIG_0(self, args);
+        return _wrap_vdouble2d_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -9867,13 +9353,13 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___getitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::vector< double > >::__getitem__(std::vector< std::vector< double > >::difference_type) const\n");
@@ -9881,7 +9367,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::difference_type arg2 ;
@@ -9891,24 +9377,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setitem__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t___setitem__" "', argument " "2"" of type '" "std::vector< std::vector< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -9919,11 +9402,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP
   }
   try {
     std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::vector< double,std::allocator< double > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -9938,13 +9419,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -9954,7 +9431,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vdouble2d_t___setitem____SWIG_1(self, args);
+        return _wrap_vdouble2d_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -9970,7 +9447,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t___setitem____SWIG_0(self, args);
+          return _wrap_vdouble2d_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -9988,14 +9465,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t___setitem____SWIG_2(self, args);
+          return _wrap_vdouble2d_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::__setitem__(PySliceObject *,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"
     "    std::vector< std::vector< double > >::__setitem__(PySliceObject *)\n"
@@ -10009,22 +9486,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   try {
     result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
   return resultobj;
 fail:
@@ -10039,18 +9515,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), Py
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_append" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_append" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10069,11 +9544,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vdouble2d_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::vector< double > > *)new std::vector< std::vector< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -10082,17 +9557,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double,std::allocator< double > > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > > > const &""'"); 
     }
@@ -10116,11 +9590,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_empty(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_empty" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -10138,11 +9613,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_size(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_size" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -10163,16 +9639,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_swap" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_swap" "', argument " "2"" of type '" "std::vector< std::vector< double,std::allocator< double > > > &""'"); 
   }
@@ -10193,11 +9668,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_begin" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10216,11 +9692,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_end(PyObject *SWIGUNUSEDPARM(self), PyObj
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_end" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10239,11 +9716,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_rbegin(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_rbegin" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10262,11 +9740,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_rend(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_rend" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10285,10 +9764,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10306,11 +9786,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -10323,16 +9804,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -10350,10 +9830,11 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_pop_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -10366,7 +9847,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::size_type arg2 ;
@@ -10374,16 +9855,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -10396,7 +9875,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -10404,17 +9883,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -10434,7 +9911,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -10445,18 +9922,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_erase" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -10467,7 +9941,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_erase" "', argument " "3"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -10492,13 +9966,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -10508,7 +9978,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vdouble2d_t_erase__SWIG_0(self, args);
+        return _wrap_vdouble2d_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -10525,14 +9995,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vdouble2d_t_erase__SWIG_1(self, args);
+          return _wrap_vdouble2d_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::erase(std::vector< std::vector< double > >::iterator)\n"
     "    std::vector< std::vector< double > >::erase(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::iterator)\n");
@@ -10540,26 +10010,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > >::size_type arg1 ;
   std::vector< std::vector< double > >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::vector< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vdouble2d_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::vector< double > >::size_type >(val1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vdouble2d_t" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10583,15 +10051,11 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vdouble2d_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vdouble2d_t__SWIG_0(self, args);
+    return _wrap_new_vdouble2d_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -10600,7 +10064,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vdouble2d_t__SWIG_2(self, args);
+      return _wrap_new_vdouble2d_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -10608,7 +10072,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vdouble2d_t__SWIG_1(self, args);
+      return _wrap_new_vdouble2d_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -10621,13 +10085,13 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) {
       int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vdouble2d_t__SWIG_3(self, args);
+        return _wrap_new_vdouble2d_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vdouble2d_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vdouble2d_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::vector()\n"
     "    std::vector< std::vector< double > >::vector(std::vector< std::vector< double,std::allocator< double > > > const &)\n"
@@ -10644,18 +10108,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_push_back(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_push_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_push_back" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10679,17 +10142,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_front" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->front();
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -10701,17 +10166,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_back" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
   result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->back();
   resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::vector< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -10728,24 +10195,22 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_assign" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_assign" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_assign" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10764,7 +10229,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::size_type arg2 ;
@@ -10774,24 +10239,21 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_resize" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_resize" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_resize" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10815,13 +10277,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -10832,7 +10290,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vdouble2d_t_resize__SWIG_0(self, args);
+        return _wrap_vdouble2d_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -10849,14 +10307,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t_resize__SWIG_1(self, args);
+          return _wrap_vdouble2d_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::resize(std::vector< std::vector< double > >::size_type)\n"
     "    std::vector< std::vector< double > >::resize(std::vector< std::vector< double > >::size_type,std::vector< std::vector< double > >::value_type const &)\n");
@@ -10864,7 +10322,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -10874,18 +10332,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::vector< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -10898,7 +10353,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   }
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10918,7 +10373,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   std::vector< std::vector< double > >::iterator arg2 ;
@@ -10931,18 +10386,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_insert" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
   } else {
@@ -10953,14 +10404,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vdouble2d_t_insert" "', argument " "2"" of type '" "std::vector< std::vector< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::vector< double > >::size_type >(val3);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t_insert" "', argument " "4"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); 
     }
@@ -10984,13 +10435,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vdouble2d_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
@@ -11003,7 +10450,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
         int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vdouble2d_t_insert__SWIG_0(self, args);
+          return _wrap_vdouble2d_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -11025,7 +10472,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
           int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vdouble2d_t_insert__SWIG_1(self, args);
+            return _wrap_vdouble2d_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -11033,7 +10480,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vdouble2d_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::vector< double > >::insert(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::value_type const &)\n"
     "    std::vector< std::vector< double > >::insert(std::vector< std::vector< double > >::iterator,std::vector< std::vector< double > >::size_type,std::vector< std::vector< double > >::value_type const &)\n");
@@ -11049,16 +10496,15 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_reserve(PyObject *SWIGUNUSEDPARM(self), P
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vdouble2d_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vdouble2d_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_reserve" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vdouble2d_t_reserve" "', argument " "2"" of type '" "std::vector< std::vector< double > >::size_type""'");
   } 
@@ -11076,11 +10522,12 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_capacity(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::vector< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_capacity" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); 
   }
@@ -11098,10 +10545,11 @@ SWIGINTERN PyObject *_wrap_delete_vdouble2d_t(PyObject *SWIGUNUSEDPARM(self), Py
   std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vdouble2d_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); 
   }
@@ -11116,23 +10564,28 @@ fail:
 
 SWIGINTERN PyObject *vdouble2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vdouble2d_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_integer_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_iterator" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -11150,11 +10603,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___nonzero__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -11172,11 +10626,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___bool__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -11194,11 +10649,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -11222,37 +10678,32 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< int,std::allocator< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___getslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___getslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -11260,7 +10711,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -11271,36 +10722,30 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11308,7 +10753,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -11321,30 +10766,26 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
@@ -11355,14 +10796,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_int_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -11377,13 +10815,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -11399,7 +10833,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_integer_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -11422,7 +10856,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< int,std::allocator< int > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_integer_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_integer_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -11430,7 +10864,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n"
     "    std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n");
@@ -11449,36 +10883,31 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___delslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___delslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11486,7 +10915,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -11494,30 +10923,25 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___delitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     std_vector_Sl_int_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11525,38 +10949,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int,std::allocator< int > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -11564,7 +10983,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -11572,25 +10991,22 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
@@ -11601,14 +11017,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< int,std::allocator< int > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -11618,37 +11031,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11656,37 +11064,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_int_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11699,13 +11102,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -11715,7 +11114,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -11729,13 +11128,13 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_integer_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__delitem__(std::vector< int >::difference_type)\n"
     "    std::vector< int >::__delitem__(PySliceObject *)\n");
@@ -11743,7 +11142,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -11751,29 +11150,26 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___getitem__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___getitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     result = (std::vector< int >::value_type *) &std_vector_Sl_int_Sg____getitem____SWIG_1((std::vector< int > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -11785,13 +11181,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -11801,7 +11193,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_integer_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -11815,13 +11207,13 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__getitem__(PySliceObject *)\n"
     "    std::vector< int >::__getitem__(std::vector< int >::difference_type) const\n");
@@ -11829,7 +11221,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::difference_type arg2 ;
@@ -11841,22 +11233,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUN
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t___setitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< int >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -11864,11 +11253,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = &temp3;
   try {
     std_vector_Sl_int_Sg____setitem____SWIG_2(arg1,arg2,(int const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11881,13 +11268,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -11897,7 +11280,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_integer_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_integer_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -11913,7 +11296,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_integer_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_integer_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -11933,14 +11316,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_integer_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::__setitem__(PySliceObject *,std::vector< int,std::allocator< int > > const &)\n"
     "    std::vector< int >::__setitem__(PySliceObject *)\n"
@@ -11954,22 +11337,21 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   try {
     result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_int(static_cast< int >(result));
   return resultobj;
 fail:
@@ -11986,16 +11368,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_append(PyObject *SWIGUNUSEDPARM(self
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_append" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_append" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12009,11 +11390,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_integer_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< int > *)new std::vector< int >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -12022,17 +11403,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
@@ -12056,11 +11436,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_empty" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -12078,11 +11459,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_size" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -12103,16 +11485,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_swap" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_integer_t_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
@@ -12133,11 +11514,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_begin" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12156,11 +11538,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_end" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12179,11 +11562,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_rbegin" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12202,11 +11586,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_rend" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12225,10 +11610,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12246,11 +11632,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< int > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -12263,16 +11650,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -12290,10 +11676,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -12306,7 +11693,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::size_type arg2 ;
@@ -12314,16 +11701,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -12336,7 +11721,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -12344,17 +11729,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -12374,7 +11757,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -12385,18 +11768,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -12407,7 +11787,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -12432,13 +11812,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -12448,7 +11824,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_integer_t_erase__SWIG_0(self, args);
+        return _wrap_vector_integer_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -12465,14 +11841,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< int >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_integer_t_erase__SWIG_1(self, args);
+          return _wrap_vector_integer_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::erase(std::vector< int >::iterator)\n"
     "    std::vector< int >::erase(std::vector< int >::iterator,std::vector< int >::iterator)\n");
@@ -12480,7 +11856,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int >::size_type arg1 ;
   std::vector< int >::value_type *arg2 = 0 ;
@@ -12489,17 +11865,15 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< int > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_integer_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
   arg1 = static_cast< std::vector< int >::size_type >(val1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_integer_t" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12518,15 +11892,11 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_integer_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_integer_t__SWIG_0(self, args);
+    return _wrap_new_vector_integer_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -12535,7 +11905,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_integer_t__SWIG_2(self, args);
+      return _wrap_new_vector_integer_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -12543,7 +11913,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_integer_t__SWIG_1(self, args);
+      return _wrap_new_vector_integer_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -12558,13 +11928,13 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_integer_t__SWIG_3(self, args);
+        return _wrap_new_vector_integer_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_integer_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_integer_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::vector()\n"
     "    std::vector< int >::vector(std::vector< int > const &)\n"
@@ -12583,16 +11953,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_push_back(PyObject *SWIGUNUSEDPARM(s
   std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_push_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_push_back" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12611,17 +11980,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_front" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (std::vector< int >::value_type *) &((std::vector< int > const *)arg1)->front();
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -12633,17 +12004,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_back" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (std::vector< int >::value_type *) &((std::vector< int > const *)arg1)->back();
   resultobj = SWIG_From_int(static_cast< int >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< int >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -12662,22 +12035,20 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_assign(PyObject *SWIGUNUSEDPARM(self
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_assign" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_assign" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
   arg2 = static_cast< std::vector< int >::size_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_assign" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12691,7 +12062,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::size_type arg2 ;
@@ -12703,22 +12074,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
   arg2 = static_cast< std::vector< int >::size_type >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_resize" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12737,13 +12105,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -12754,7 +12118,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_integer_t_resize__SWIG_0(self, args);
+        return _wrap_vector_integer_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -12773,14 +12137,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t_resize__SWIG_1(self, args);
+          return _wrap_vector_integer_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::resize(std::vector< int >::size_type)\n"
     "    std::vector< int >::resize(std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
@@ -12788,7 +12152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -12800,18 +12164,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< int >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -12822,7 +12183,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_insert" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12837,7 +12198,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   std::vector< int >::iterator arg2 ;
@@ -12852,18 +12213,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< int >::value_type temp4 ;
   int val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
@@ -12874,12 +12231,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_integer_t_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t_insert" "', argument " "3"" of type '" "std::vector< int >::size_type""'");
   } 
   arg3 = static_cast< std::vector< int >::size_type >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  ecode4 = SWIG_AsVal_int(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_integer_t_insert" "', argument " "4"" of type '" "std::vector< int >::value_type""'");
   } 
@@ -12898,13 +12255,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_integer_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0));
@@ -12919,7 +12272,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_integer_t_insert__SWIG_0(self, args);
+          return _wrap_vector_integer_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -12943,7 +12296,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_integer_t_insert__SWIG_1(self, args);
+            return _wrap_vector_integer_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -12951,7 +12304,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_integer_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< int >::insert(std::vector< int >::iterator,std::vector< int >::value_type const &)\n"
     "    std::vector< int >::insert(std::vector< int >::iterator,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
@@ -12967,16 +12320,15 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_integer_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_integer_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_reserve" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_integer_t_reserve" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
@@ -12994,11 +12346,12 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< int >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_capacity" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
@@ -13016,10 +12369,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_integer_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_integer_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
@@ -13034,23 +12388,28 @@ fail:
 
 SWIGINTERN PyObject *vector_integer_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_integer_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_longinteger_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_iterator" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -13068,11 +12427,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___nonzero__(PyObject *SWIGUNUSED
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___nonzero__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -13090,11 +12450,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___bool__(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___bool__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -13112,11 +12473,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___len__(PyObject *SWIGUNUSEDPARM
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___len__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -13140,37 +12502,32 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< unsigned long,std::allocator< unsigned long > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___getslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___getslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     result = (std::vector< unsigned long,std::allocator< unsigned long > > *)std_vector_Sl_unsigned_SS_long_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -13178,7 +12535,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -13189,36 +12546,30 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13226,7 +12577,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -13239,30 +12590,26 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); 
     }
@@ -13273,14 +12620,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -13295,13 +12639,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -13317,7 +12657,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_longinteger_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -13340,7 +12680,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
           int res = swig::asptr(argv[3], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_longinteger_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -13348,7 +12688,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n"
     "    std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n");
@@ -13367,36 +12707,31 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delslice__(PyObject *SWIGUNUSE
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___delslice__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___delslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13404,7 +12739,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -13412,30 +12747,25 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___delitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13443,38 +12773,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long,std::allocator< unsigned long > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< unsigned long,std::allocator< unsigned long > > *)std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -13482,7 +12807,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -13490,25 +12815,22 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); 
     }
@@ -13519,14 +12841,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -13536,37 +12855,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13574,37 +12888,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___delitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13617,13 +12926,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -13633,7 +12938,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -13647,13 +12952,13 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_longinteger_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__delitem__(std::vector< unsigned long >::difference_type)\n"
     "    std::vector< unsigned long >::__delitem__(PySliceObject *)\n");
@@ -13661,7 +12966,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -13669,29 +12974,26 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem____SWIG_1(PyObject *SW
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___getitem__" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___getitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
   try {
     result = (std::vector< unsigned long >::value_type *) &std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_1((std::vector< unsigned long > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -13703,13 +13005,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -13719,7 +13017,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_longinteger_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -13733,13 +13031,13 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__getitem__(PySliceObject *)\n"
     "    std::vector< unsigned long >::__getitem__(std::vector< unsigned long >::difference_type) const\n");
@@ -13747,7 +13045,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::difference_type arg2 ;
@@ -13759,22 +13057,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SW
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setitem__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t___setitem__" "', argument " "2"" of type '" "std::vector< unsigned long >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -13782,11 +13077,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_2(PyObject *SW
   arg3 = &temp3;
   try {
     std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_2(arg1,arg2,(unsigned long const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13799,13 +13092,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -13815,7 +13104,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_longinteger_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -13831,7 +13120,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
         int res = swig::asptr(argv[2], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_longinteger_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_longinteger_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -13851,14 +13140,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_longinteger_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::__setitem__(PySliceObject *,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n"
     "    std::vector< unsigned long >::__setitem__(PySliceObject *)\n"
@@ -13872,22 +13161,21 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(sel
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   try {
     result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
   return resultobj;
 fail:
@@ -13904,16 +13192,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_append(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_append" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_append" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -13927,11 +13214,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_longinteger_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< unsigned long > *)new std::vector< unsigned long >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -13940,17 +13227,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > const &""'"); 
     }
@@ -13974,11 +13260,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_empty(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_empty" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -13996,11 +13283,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_size(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_size" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -14021,16 +13309,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_swap(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_swap" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_longinteger_t_swap" "', argument " "2"" of type '" "std::vector< unsigned long > &""'"); 
   }
@@ -14051,11 +13338,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_begin(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_begin" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14074,11 +13362,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_end(PyObject *SWIGUNUSEDPARM(sel
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_end" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14097,11 +13386,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_rbegin(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_rbegin" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14120,11 +13410,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_rend(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_rend" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14143,10 +13434,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14164,11 +13456,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUS
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< unsigned long > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -14181,16 +13474,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -14208,10 +13500,11 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop_back(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop_back" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14224,7 +13517,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::size_type arg2 ;
@@ -14232,16 +13525,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_resize" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_resize" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -14254,7 +13545,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -14262,17 +13553,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_0(PyObject *SWIGUNUS
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_erase" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -14292,7 +13581,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -14303,18 +13592,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUS
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_erase" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -14325,7 +13611,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase__SWIG_1(PyObject *SWIGUNUS
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_erase" "', argument " "3"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -14350,13 +13636,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -14366,7 +13648,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< unsigned long >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_longinteger_t_erase__SWIG_0(self, args);
+        return _wrap_vector_longinteger_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -14383,14 +13665,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< unsigned long >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_longinteger_t_erase__SWIG_1(self, args);
+          return _wrap_vector_longinteger_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::erase(std::vector< unsigned long >::iterator)\n"
     "    std::vector< unsigned long >::erase(std::vector< unsigned long >::iterator,std::vector< unsigned long >::iterator)\n");
@@ -14398,7 +13680,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long >::size_type arg1 ;
   std::vector< unsigned long >::value_type *arg2 = 0 ;
@@ -14407,17 +13689,15 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_3(PyObject *SWIGUNUSED
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< unsigned long > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_longinteger_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg1 = static_cast< std::vector< unsigned long >::size_type >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_longinteger_t" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14436,15 +13716,11 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_longinteger_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_longinteger_t__SWIG_0(self, args);
+    return _wrap_new_vector_longinteger_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -14453,7 +13729,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_longinteger_t__SWIG_2(self, args);
+      return _wrap_new_vector_longinteger_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -14461,7 +13737,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_longinteger_t__SWIG_1(self, args);
+      return _wrap_new_vector_longinteger_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -14476,13 +13752,13 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_longinteger_t__SWIG_3(self, args);
+        return _wrap_new_vector_longinteger_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_longinteger_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_longinteger_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::vector()\n"
     "    std::vector< unsigned long >::vector(std::vector< unsigned long > const &)\n"
@@ -14501,16 +13777,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_push_back(PyObject *SWIGUNUSEDPA
   std::vector< unsigned long >::value_type temp2 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_push_back" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_push_back" "', argument " "2"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14529,17 +13804,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_front(PyObject *SWIGUNUSEDPARM(s
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_front" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   result = (std::vector< unsigned long >::value_type *) &((std::vector< unsigned long > const *)arg1)->front();
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -14551,17 +13828,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_back" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
   result = (std::vector< unsigned long >::value_type *) &((std::vector< unsigned long > const *)arg1)->back();
   resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< unsigned long >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -14580,22 +13859,20 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_assign(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_assign" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_assign" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::size_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_assign" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14609,7 +13886,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::size_type arg2 ;
@@ -14621,22 +13898,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize__SWIG_1(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_resize" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_resize" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg2 = static_cast< std::vector< unsigned long >::size_type >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_resize" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14655,13 +13929,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -14672,7 +13942,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_longinteger_t_resize__SWIG_0(self, args);
+        return _wrap_vector_longinteger_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -14691,14 +13961,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t_resize__SWIG_1(self, args);
+          return _wrap_vector_longinteger_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::resize(std::vector< unsigned long >::size_type)\n"
     "    std::vector< unsigned long >::resize(std::vector< unsigned long >::size_type,std::vector< unsigned long >::value_type const &)\n");
@@ -14706,7 +13976,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -14718,18 +13988,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp3 ;
   unsigned long val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< unsigned long >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_insert" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -14740,7 +14007,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_0(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_unsigned_SS_long(obj2, &val3);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_insert" "', argument " "3"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14755,7 +14022,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   std::vector< unsigned long >::iterator arg2 ;
@@ -14770,18 +14037,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNU
   std::vector< unsigned long >::value_type temp4 ;
   unsigned long val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_insert" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
   } else {
@@ -14792,12 +14055,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert__SWIG_1(PyObject *SWIGUNU
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_longinteger_t_insert" "', argument " "2"" of type '" "std::vector< unsigned long >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t_insert" "', argument " "3"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
   arg3 = static_cast< std::vector< unsigned long >::size_type >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_long(obj3, &val4);
+  ecode4 = SWIG_AsVal_unsigned_SS_long(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_longinteger_t_insert" "', argument " "4"" of type '" "std::vector< unsigned long >::value_type""'");
   } 
@@ -14816,13 +14079,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_longinteger_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0));
@@ -14837,7 +14096,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_longinteger_t_insert__SWIG_0(self, args);
+          return _wrap_vector_longinteger_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -14861,7 +14120,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_longinteger_t_insert__SWIG_1(self, args);
+            return _wrap_vector_longinteger_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -14869,7 +14128,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_longinteger_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< unsigned long >::insert(std::vector< unsigned long >::iterator,std::vector< unsigned long >::value_type const &)\n"
     "    std::vector< unsigned long >::insert(std::vector< unsigned long >::iterator,std::vector< unsigned long >::size_type,std::vector< unsigned long >::value_type const &)\n");
@@ -14885,16 +14144,15 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_reserve(PyObject *SWIGUNUSEDPARM
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_longinteger_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_longinteger_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_reserve" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_longinteger_t_reserve" "', argument " "2"" of type '" "std::vector< unsigned long >::size_type""'");
   } 
@@ -14912,11 +14170,12 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_capacity(PyObject *SWIGUNUSEDPAR
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< unsigned long >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_capacity" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); 
   }
@@ -14934,10 +14193,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_longinteger_t(PyObject *SWIGUNUSEDPARM(
   std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_longinteger_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); 
   }
@@ -14952,23 +14212,28 @@ fail:
 
 SWIGINTERN PyObject *vector_longinteger_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_longinteger_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_complex_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_iterator" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -14986,11 +14251,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___nonzero__(PyObject *SWIGUNUSEDPARM
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -15008,11 +14274,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___bool__(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___bool__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -15030,11 +14297,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___len__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___len__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -15058,37 +14326,32 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::complex< double >,std::allocator< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___getslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___getslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     result = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)std_vector_Sl_std_complex_Sl_double_Sg__Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -15096,7 +14359,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -15107,36 +14370,30 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15144,7 +14401,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -15157,30 +14414,26 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); 
     }
@@ -15191,14 +14444,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -15213,13 +14463,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -15235,7 +14481,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_complex_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -15258,7 +14504,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
           int res = swig::asptr(argv[3], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_complex_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_complex_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -15266,7 +14512,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n"
     "    std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n");
@@ -15285,36 +14531,31 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delslice__(PyObject *SWIGUNUSEDPAR
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___delslice__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___delslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15322,7 +14563,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -15330,30 +14571,25 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___delitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15361,38 +14597,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double >,std::allocator< std::complex< double > > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -15400,7 +14631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -15408,25 +14639,22 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); 
     }
@@ -15437,14 +14665,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -15454,37 +14679,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15492,37 +14712,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___delitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15535,13 +14750,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -15551,7 +14762,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -15565,13 +14776,13 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_complex_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__delitem__(std::vector< std::complex< double > >::difference_type)\n"
     "    std::vector< std::complex< double > >::__delitem__(PySliceObject *)\n");
@@ -15579,7 +14790,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -15587,29 +14798,26 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem____SWIG_1(PyObject *SWIGUN
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___getitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___getitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
   try {
     result = (std::vector< std::complex< double > >::value_type *) &std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_1((std::vector< std::complex< double > > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -15621,13 +14829,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -15637,7 +14841,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_complex_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -15651,13 +14855,13 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::complex< double > >::__getitem__(std::vector< std::complex< double > >::difference_type) const\n");
@@ -15665,7 +14869,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::difference_type arg2 ;
@@ -15677,22 +14881,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUN
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setitem__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t___setitem__" "', argument " "2"" of type '" "std::vector< std::complex< double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -15700,11 +14901,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_2(PyObject *SWIGUN
   arg3 = &temp3;
   try {
     std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::complex< double > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15717,13 +14916,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -15733,7 +14928,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_complex_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_complex_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -15749,7 +14944,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_complex_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_complex_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -15769,14 +14964,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_complex_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::__setitem__(PySliceObject *,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n"
     "    std::vector< std::complex< double > >::__setitem__(PySliceObject *)\n"
@@ -15790,22 +14985,21 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   try {
     result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
   return resultobj;
 fail:
@@ -15822,16 +15016,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_append(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_append" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_append" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -15845,11 +15038,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_complex_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::complex< double > > *)new std::vector< std::complex< double > >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -15858,17 +15051,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > const &""'"); 
     }
@@ -15892,11 +15084,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_empty(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_empty" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -15914,11 +15107,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_size" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -15939,16 +15133,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_swap" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_complex_t_swap" "', argument " "2"" of type '" "std::vector< std::complex< double > > &""'"); 
   }
@@ -15969,11 +15162,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_begin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -15992,11 +15186,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_end(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_end" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16015,11 +15210,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_rbegin(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rbegin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16038,11 +15234,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rend" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16061,10 +15258,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16082,11 +15280,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPA
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::complex< double > > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -16099,16 +15298,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -16126,10 +15324,11 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_pop_back(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16142,7 +15341,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::size_type arg2 ;
@@ -16150,16 +15349,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_0(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_resize" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_resize" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -16172,7 +15369,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -16180,17 +15377,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_erase" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -16210,7 +15405,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -16221,18 +15416,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_erase" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -16243,7 +15435,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_erase" "', argument " "3"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -16268,13 +15460,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -16284,7 +15472,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::complex< double > >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_complex_t_erase__SWIG_0(self, args);
+        return _wrap_vector_complex_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -16301,14 +15489,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::complex< double > >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_complex_t_erase__SWIG_1(self, args);
+          return _wrap_vector_complex_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::erase(std::vector< std::complex< double > >::iterator)\n"
     "    std::vector< std::complex< double > >::erase(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::iterator)\n");
@@ -16316,7 +15504,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > >::size_type arg1 ;
   std::vector< std::complex< double > >::value_type *arg2 = 0 ;
@@ -16325,17 +15513,15 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_3(PyObject *SWIGUNUSEDPARM
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::complex< double > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_complex_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::complex< double > >::size_type >(val1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vector_complex_t" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16354,15 +15540,11 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_complex_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_complex_t__SWIG_0(self, args);
+    return _wrap_new_vector_complex_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -16371,7 +15553,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_complex_t__SWIG_2(self, args);
+      return _wrap_new_vector_complex_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -16379,7 +15561,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_complex_t__SWIG_1(self, args);
+      return _wrap_new_vector_complex_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -16394,13 +15576,13 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_vector_complex_t__SWIG_3(self, args);
+        return _wrap_new_vector_complex_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_complex_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_complex_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::vector()\n"
     "    std::vector< std::complex< double > >::vector(std::vector< std::complex< double > > const &)\n"
@@ -16419,16 +15601,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_push_back(PyObject *SWIGUNUSEDPARM(s
   std::vector< std::complex< double > >::value_type temp2 ;
   std::complex< double > val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_push_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+  ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_push_back" "', argument " "2"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16447,17 +15628,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_front(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_front" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   result = (std::vector< std::complex< double > >::value_type *) &((std::vector< std::complex< double > > const *)arg1)->front();
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -16469,17 +15652,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_back" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
   result = (std::vector< std::complex< double > >::value_type *) &((std::vector< std::complex< double > > const *)arg1)->back();
   resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::complex< double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -16498,22 +15683,20 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_assign(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_assign" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_assign" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::size_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_assign" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16527,7 +15710,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::size_type arg2 ;
@@ -16539,22 +15722,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_resize" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_resize" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::complex< double > >::size_type >(val2);
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_resize" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16573,13 +15753,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -16590,7 +15766,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_complex_t_resize__SWIG_0(self, args);
+        return _wrap_vector_complex_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -16609,14 +15785,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t_resize__SWIG_1(self, args);
+          return _wrap_vector_complex_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::resize(std::vector< std::complex< double > >::size_type)\n"
     "    std::vector< std::complex< double > >::resize(std::vector< std::complex< double > >::size_type,std::vector< std::complex< double > >::value_type const &)\n");
@@ -16624,7 +15800,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -16636,18 +15812,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp3 ;
   std::complex< double > val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::complex< double > >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_insert" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -16658,7 +15831,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_0(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj2, &val3);
+  ecode3 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_insert" "', argument " "3"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16673,7 +15846,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   std::vector< std::complex< double > >::iterator arg2 ;
@@ -16688,18 +15861,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
   std::vector< std::complex< double > >::value_type temp4 ;
   std::complex< double > val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_insert" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
   } else {
@@ -16710,12 +15879,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert__SWIG_1(PyObject *SWIGUNUSEDP
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_complex_t_insert" "', argument " "2"" of type '" "std::vector< std::complex< double > >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t_insert" "', argument " "3"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::complex< double > >::size_type >(val3);
-  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj3, &val4);
+  ecode4 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vector_complex_t_insert" "', argument " "4"" of type '" "std::vector< std::complex< double > >::value_type""'");
   } 
@@ -16734,13 +15903,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_complex_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0));
@@ -16755,7 +15920,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_complex_t_insert__SWIG_0(self, args);
+          return _wrap_vector_complex_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -16779,7 +15944,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_vector_complex_t_insert__SWIG_1(self, args);
+            return _wrap_vector_complex_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -16787,7 +15952,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_complex_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::complex< double > >::insert(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::value_type const &)\n"
     "    std::vector< std::complex< double > >::insert(std::vector< std::complex< double > >::iterator,std::vector< std::complex< double > >::size_type,std::vector< std::complex< double > >::value_type const &)\n");
@@ -16803,16 +15968,15 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_reserve(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_complex_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_complex_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_reserve" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_complex_t_reserve" "', argument " "2"" of type '" "std::vector< std::complex< double > >::size_type""'");
   } 
@@ -16830,11 +15994,12 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_capacity(PyObject *SWIGUNUSEDPARM(se
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::complex< double > >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_capacity" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); 
   }
@@ -16852,10 +16017,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_complex_t(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_complex_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); 
   }
@@ -16870,23 +16036,28 @@ fail:
 
 SWIGINTERN PyObject *vector_complex_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_complex_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_vector_string_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   swig::SwigPyIterator *result = 0 ;
   
-  arg2 = &obj0;
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  arg2 = &swig_obj[0];
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_iterator" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -16904,11 +16075,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___nonzero__(PyObject *SWIGUNUSEDPARM(
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___nonzero__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -16926,11 +16098,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___bool__(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___bool__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___bool__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -16948,11 +16121,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t___len__(PyObject *SWIGUNUSEDPARM(self
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___len__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -16976,37 +16150,32 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getslice__(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   std::vector< std::string,std::allocator< std::string > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t___getslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___getslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___getslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     result = (std::vector< std::string,std::allocator< std::string > > *)std_vector_Sl_std_string_Sg____getslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -17014,7 +16183,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -17025,36 +16194,30 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17062,7 +16225,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -17075,30 +16238,26 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res4 = swig::asptr(obj3, &ptr);
+    res4 = swig::asptr(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); 
     }
@@ -17109,14 +16268,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN
   }
   try {
     std_vector_Sl_std_string_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
@@ -17131,13 +16287,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___setslice__", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -17153,7 +16305,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_vector_string_t___setslice____SWIG_0(self, args);
+          return _wrap_vector_string_t___setslice____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -17176,7 +16328,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
           int res = swig::asptr(argv[3], (std::vector< std::string,std::allocator< std::string > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_string_t___setslice____SWIG_1(self, args);
+            return _wrap_vector_string_t___setslice____SWIG_1(self, argc, argv);
           }
         }
       }
@@ -17184,7 +16336,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n"
     "    std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n");
@@ -17203,36 +16355,31 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delslice__(PyObject *SWIGUNUSEDPARM
   int ecode2 = 0 ;
   ptrdiff_t val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t___delslice__", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___delslice__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
-  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_ptrdiff_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___delslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::difference_type >(val3);
   try {
     std_vector_Sl_std_string_Sg____delslice__(arg1,arg2,arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17240,7 +16387,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -17248,30 +16395,25 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNU
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___delitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   try {
     std_vector_Sl_std_string_Sg____delitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17279,38 +16421,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string,std::allocator< std::string > > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___getitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     result = (std::vector< std::string,std::allocator< std::string > > *)std_vector_Sl_std_string_Sg____getitem____SWIG_0(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
@@ -17318,7 +16455,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -17326,25 +16463,22 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res3 = swig::asptr(obj2, &ptr);
+    res3 = swig::asptr(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); 
     }
@@ -17355,14 +16489,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< std::string,std::allocator< std::string > > const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -17372,37 +16503,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___setitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17410,37 +16536,32 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___delitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
-    if (!PySlice_Check(obj1)) {
+    if (!PySlice_Check(swig_obj[1])) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t___delitem__" "', argument " "2"" of type '" "PySliceObject *""'");
     }
-    arg2 = (PySliceObject *) obj1;
+    arg2 = (PySliceObject *) swig_obj[1];
   }
   try {
     std_vector_Sl_std_string_Sg____delitem____SWIG_1(arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
-  }
-  catch(std::invalid_argument &_e) {
+  } catch(std::invalid_argument &_e) {
     SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17453,13 +16574,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___delitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -17469,7 +16586,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___delitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___delitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -17483,13 +16600,13 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t___delitem____SWIG_0(self, args);
+        return _wrap_vector_string_t___delitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___delitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___delitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__delitem__(std::vector< std::string >::difference_type)\n"
     "    std::vector< std::string >::__delitem__(PySliceObject *)\n");
@@ -17497,7 +16614,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -17505,29 +16622,26 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem____SWIG_1(PyObject *SWIGUNU
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___getitem__" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___getitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   try {
     result = (std::vector< std::string >::value_type *) &std_vector_Sl_std_string_Sg____getitem____SWIG_1((std::vector< std::string > const *)arg1,arg2);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -17539,13 +16653,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -17555,7 +16665,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___getitem____SWIG_0(self, args);
+        return _wrap_vector_string_t___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
@@ -17569,13 +16679,13 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t___getitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__getitem__(PySliceObject *)\n"
     "    std::vector< std::string >::__getitem__(std::vector< std::string >::difference_type) const\n");
@@ -17583,7 +16693,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::difference_type arg2 ;
@@ -17593,24 +16703,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNU
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setitem__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_ptrdiff_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t___setitem__" "', argument " "2"" of type '" "std::vector< std::string >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::difference_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -17621,11 +16728,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_2(PyObject *SWIGUNU
   }
   try {
     std_vector_Sl_std_string_Sg____setitem____SWIG_2(arg1,arg2,(std::string const &)*arg3);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_Py_Void();
   if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
@@ -17640,13 +16745,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t___setitem__", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -17656,7 +16757,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         _v = PySlice_Check(argv[1]);
       }
       if (_v) {
-        return _wrap_vector_string_t___setitem____SWIG_1(self, args);
+        return _wrap_vector_string_t___setitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -17672,7 +16773,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         int res = swig::asptr(argv[2], (std::vector< std::string,std::allocator< std::string > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t___setitem____SWIG_0(self, args);
+          return _wrap_vector_string_t___setitem____SWIG_0(self, argc, argv);
         }
       }
     }
@@ -17690,14 +16791,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t___setitem____SWIG_2(self, args);
+          return _wrap_vector_string_t___setitem____SWIG_2(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t___setitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::__setitem__(PySliceObject *,std::vector< std::string,std::allocator< std::string > > const &)\n"
     "    std::vector< std::string >::__setitem__(PySliceObject *)\n"
@@ -17711,22 +16812,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   try {
     result = std_vector_Sl_std_string_Sg__pop(arg1);
-  }
-  catch(std::out_of_range &_e) {
+  } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
 fail:
@@ -17741,18 +16841,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t_append(PyObject *SWIGUNUSEDPARM(self)
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_append", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_append" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_append" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -17771,11 +16870,11 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_vector_string_t")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (std::vector< std::string > *)new std::vector< std::string >();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -17784,17 +16883,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0;
-    res1 = swig::asptr(obj0, &ptr);
+    res1 = swig::asptr(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > const &""'"); 
     }
@@ -17818,11 +16916,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_empty(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_empty" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -17840,11 +16939,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_size(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_size" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -17865,16 +16965,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_swap(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_swap", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_swap" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_swap" "', argument " "2"" of type '" "std::vector< std::string > &""'"); 
   }
@@ -17895,11 +16994,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_begin(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_begin" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -17918,11 +17018,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_end(PyObject *SWIGUNUSEDPARM(self), P
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_end" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -17941,11 +17042,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_rbegin(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_rbegin" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -17964,11 +17066,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_rend(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::reverse_iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_rend" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -17987,10 +17090,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -18008,11 +17112,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPAR
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   SwigValueWrapper< std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -18025,16 +17130,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -18052,10 +17156,11 @@ SWIGINTERN PyObject *_wrap_vector_string_t_pop_back(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop_back" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -18068,7 +17173,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::size_type arg2 ;
@@ -18076,16 +17181,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_0(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_resize" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_resize" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -18098,7 +17201,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -18106,17 +17209,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_erase" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -18136,7 +17237,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -18147,18 +17248,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
   int res2 ;
   swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_erase" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -18169,7 +17267,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_erase" "', argument " "3"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -18194,13 +17292,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_erase", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -18210,7 +17304,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::string >::iterator > *>(iter) != 0));
       if (_v) {
-        return _wrap_vector_string_t_erase__SWIG_0(self, args);
+        return _wrap_vector_string_t_erase__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -18227,14 +17321,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args)
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
         _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::string >::iterator > *>(iter) != 0));
         if (_v) {
-          return _wrap_vector_string_t_erase__SWIG_1(self, args);
+          return _wrap_vector_string_t_erase__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_erase'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_erase'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::erase(std::vector< std::string >::iterator)\n"
     "    std::vector< std::string >::erase(std::vector< std::string >::iterator,std::vector< std::string >::iterator)\n");
@@ -18242,26 +17336,24 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string >::size_type arg1 ;
   std::vector< std::string >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   std::vector< std::string > *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_vector_string_t",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(swig_obj[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::string >::size_type >(val1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vector_string_t" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18285,15 +17377,11 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_vector_string_t", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_vector_string_t__SWIG_0(self, args);
+    return _wrap_new_vector_string_t__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
     int _v;
@@ -18302,7 +17390,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      return _wrap_new_vector_string_t__SWIG_2(self, args);
+      return _wrap_new_vector_string_t__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -18310,7 +17398,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_new_vector_string_t__SWIG_1(self, args);
+      return _wrap_new_vector_string_t__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -18323,13 +17411,13 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) {
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_new_vector_string_t__SWIG_3(self, args);
+        return _wrap_new_vector_string_t__SWIG_3(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_vector_string_t'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_vector_string_t'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::vector()\n"
     "    std::vector< std::string >::vector(std::vector< std::string > const &)\n"
@@ -18346,18 +17434,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t_push_back(PyObject *SWIGUNUSEDPARM(se
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_push_back", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_push_back" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vector_string_t_push_back" "', argument " "2"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18381,17 +17468,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t_front(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_front" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   result = (std::vector< std::string >::value_type *) &((std::vector< std::string > const *)arg1)->front();
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -18403,17 +17492,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t_back(PyObject *SWIGUNUSEDPARM(self),
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::value_type *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_back" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
   result = (std::vector< std::string >::value_type *) &((std::vector< std::string > const *)arg1)->back();
   resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
+  (void)swig::container_owner<swig::traits<std::vector< std::string >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
   return NULL;
@@ -18430,24 +17521,22 @@ SWIGINTERN PyObject *_wrap_vector_string_t_assign(PyObject *SWIGUNUSEDPARM(self)
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_assign", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_assign" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_assign" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::size_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_assign" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18466,7 +17555,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::size_type arg2 ;
@@ -18476,24 +17565,21 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize__SWIG_1(PyObject *SWIGUNUSEDPA
   size_t val2 ;
   int ecode2 = 0 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_resize" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_resize" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::string >::size_type >(val2);
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_resize" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18517,13 +17603,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_resize", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -18534,7 +17616,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_vector_string_t_resize__SWIG_0(self, args);
+        return _wrap_vector_string_t_resize__SWIG_0(self, argc, argv);
       }
     }
   }
@@ -18551,14 +17633,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t_resize__SWIG_1(self, args);
+          return _wrap_vector_string_t_resize__SWIG_1(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_resize'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_resize'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::resize(std::vector< std::string >::size_type)\n"
     "    std::vector< std::string >::resize(std::vector< std::string >::size_type,std::vector< std::string >::value_type const &)\n");
@@ -18566,7 +17648,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -18576,18 +17658,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   std::vector< std::string >::iterator result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_insert" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -18600,7 +17679,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t_insert" "', argument " "3"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18620,7 +17699,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   std::vector< std::string >::iterator arg2 ;
@@ -18633,18 +17712,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPA
   size_t val3 ;
   int ecode3 = 0 ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_insert" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
     SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
   } else {
@@ -18655,14 +17730,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert__SWIG_1(PyObject *SWIGUNUSEDPA
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vector_string_t_insert" "', argument " "2"" of type '" "std::vector< std::string >::iterator""'");
     }
   }
-  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t_insert" "', argument " "3"" of type '" "std::vector< std::string >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::string >::size_type >(val3);
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t_insert" "', argument " "4"" of type '" "std::vector< std::string >::value_type const &""'"); 
     }
@@ -18686,13 +17761,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "vector_string_t_insert", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 3) {
     int _v;
     int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0));
@@ -18705,7 +17776,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_vector_string_t_insert__SWIG_0(self, args);
+          return _wrap_vector_string_t_insert__SWIG_0(self, argc, argv);
         }
       }
     }
@@ -18727,7 +17798,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_vector_string_t_insert__SWIG_1(self, args);
+            return _wrap_vector_string_t_insert__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -18735,7 +17806,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t_insert'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'vector_string_t_insert'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    std::vector< std::string >::insert(std::vector< std::string >::iterator,std::vector< std::string >::value_type const &)\n"
     "    std::vector< std::string >::insert(std::vector< std::string >::iterator,std::vector< std::string >::size_type,std::vector< std::string >::value_type const &)\n");
@@ -18751,16 +17822,15 @@ SWIGINTERN PyObject *_wrap_vector_string_t_reserve(PyObject *SWIGUNUSEDPARM(self
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:vector_string_t_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "vector_string_t_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_reserve" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::string > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vector_string_t_reserve" "', argument " "2"" of type '" "std::vector< std::string >::size_type""'");
   } 
@@ -18778,11 +17848,12 @@ SWIGINTERN PyObject *_wrap_vector_string_t_capacity(PyObject *SWIGUNUSEDPARM(sel
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string >::size_type result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_capacity" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); 
   }
@@ -18800,10 +17871,11 @@ SWIGINTERN PyObject *_wrap_delete_vector_string_t(PyObject *SWIGUNUSEDPARM(self)
   std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_vector_string_t",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > *""'"); 
   }
@@ -18818,16 +17890,20 @@ fail:
 
 SWIGINTERN PyObject *vector_string_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *vector_string_t_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_RealLimits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   RealLimits *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_RealLimits")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_RealLimits", 0, 0, 0)) SWIG_fail;
   result = (RealLimits *)new RealLimits();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RealLimits, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -18841,11 +17917,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_hasLowerLimit(PyObject *SWIGUNUSEDPARM(sel
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_hasLowerLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_hasLowerLimit" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -18863,11 +17940,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_lowerLimit(PyObject *SWIGUNUSEDPARM(self),
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_lowerLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_lowerLimit" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -18888,16 +17966,15 @@ SWIGINTERN PyObject *_wrap_RealLimits_setLowerLimit(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits_setLowerLimit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_setLowerLimit", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_setLowerLimit" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_setLowerLimit" "', argument " "2"" of type '" "double""'");
   } 
@@ -18915,10 +17992,11 @@ SWIGINTERN PyObject *_wrap_RealLimits_removeLowerLimit(PyObject *SWIGUNUSEDPARM(
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_removeLowerLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_removeLowerLimit" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
@@ -18936,11 +18014,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_hasUpperLimit(PyObject *SWIGUNUSEDPARM(sel
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_hasUpperLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_hasUpperLimit" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -18958,11 +18037,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_upperLimit(PyObject *SWIGUNUSEDPARM(self),
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_upperLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_upperLimit" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -18983,16 +18063,15 @@ SWIGINTERN PyObject *_wrap_RealLimits_setUpperLimit(PyObject *SWIGUNUSEDPARM(sel
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits_setUpperLimit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_setUpperLimit", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_setUpperLimit" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_setUpperLimit" "', argument " "2"" of type '" "double""'");
   } 
@@ -19010,10 +18089,11 @@ SWIGINTERN PyObject *_wrap_RealLimits_removeUpperLimit(PyObject *SWIGUNUSEDPARM(
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_removeUpperLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_removeUpperLimit" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
@@ -19031,11 +18111,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_hasLowerAndUpperLimits(PyObject *SWIGUNUSE
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_hasLowerAndUpperLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_hasLowerAndUpperLimits" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19059,22 +18140,20 @@ SWIGINTERN PyObject *_wrap_RealLimits_setLimits(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   double val3 ;
   int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:RealLimits_setLimits",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_setLimits", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_setLimits" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_setLimits" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RealLimits_setLimits" "', argument " "3"" of type '" "double""'");
   } 
@@ -19092,10 +18171,11 @@ SWIGINTERN PyObject *_wrap_RealLimits_removeLimits(PyObject *SWIGUNUSEDPARM(self
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_removeLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_removeLimits" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
@@ -19116,17 +18196,16 @@ SWIGINTERN PyObject *_wrap_RealLimits_isInRange(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits_isInRange",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_isInRange", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isInRange" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_isInRange" "', argument " "2"" of type '" "double""'");
   } 
@@ -19144,11 +18223,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_lowerLimited(PyObject *SWIGUNUSEDPARM(self
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_lowerLimited",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "RealLimits_lowerLimited" "', argument " "1"" of type '" "double""'");
   } 
@@ -19165,7 +18245,7 @@ SWIGINTERN PyObject *_wrap_RealLimits_positive(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":RealLimits_positive")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_positive", 0, 0, 0)) SWIG_fail;
   result = RealLimits::positive();
   resultobj = SWIG_NewPointerObj((new RealLimits(static_cast< const RealLimits& >(result))), SWIGTYPE_p_RealLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19178,7 +18258,7 @@ SWIGINTERN PyObject *_wrap_RealLimits_nonnegative(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":RealLimits_nonnegative")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_nonnegative", 0, 0, 0)) SWIG_fail;
   result = RealLimits::nonnegative();
   resultobj = SWIG_NewPointerObj((new RealLimits(static_cast< const RealLimits& >(result))), SWIGTYPE_p_RealLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19192,11 +18272,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_upperLimited(PyObject *SWIGUNUSEDPARM(self
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_upperLimited",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "RealLimits_upperLimited" "', argument " "1"" of type '" "double""'");
   } 
@@ -19217,17 +18298,16 @@ SWIGINTERN PyObject *_wrap_RealLimits_limited(PyObject *SWIGUNUSEDPARM(self), Py
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits_limited",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_limited", 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 '" "RealLimits_limited" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_limited" "', argument " "2"" of type '" "double""'");
   } 
@@ -19244,7 +18324,7 @@ SWIGINTERN PyObject *_wrap_RealLimits_limitless(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   RealLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":RealLimits_limitless")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits_limitless", 0, 0, 0)) SWIG_fail;
   result = RealLimits::limitless();
   resultobj = SWIG_NewPointerObj((new RealLimits(static_cast< const RealLimits& >(result))), SWIGTYPE_p_RealLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19258,11 +18338,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_toString(PyObject *SWIGUNUSEDPARM(self), P
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_toString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_toString" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19283,17 +18364,16 @@ SWIGINTERN PyObject *_wrap_RealLimits___eq__(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits___eq__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits___eq__" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RealLimits___eq__" "', argument " "2"" of type '" "RealLimits const &""'"); 
   }
@@ -19305,7 +18385,9 @@ SWIGINTERN PyObject *_wrap_RealLimits___eq__(PyObject *SWIGUNUSEDPARM(self), PyO
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -19317,17 +18399,16 @@ SWIGINTERN PyObject *_wrap_RealLimits___ne__(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:RealLimits___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RealLimits___ne__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits___ne__" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
   arg1 = reinterpret_cast< RealLimits * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_RealLimits,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RealLimits___ne__" "', argument " "2"" of type '" "RealLimits const &""'"); 
   }
@@ -19339,7 +18420,9 @@ SWIGINTERN PyObject *_wrap_RealLimits___ne__(PyObject *SWIGUNUSEDPARM(self), PyO
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -19348,11 +18431,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isLimitless(PyObject *SWIGUNUSEDPARM(self)
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isLimitless",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isLimitless" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19370,11 +18454,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isPositive(PyObject *SWIGUNUSEDPARM(self),
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isPositive",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isPositive" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19392,11 +18477,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isNonnegative(PyObject *SWIGUNUSEDPARM(sel
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isNonnegative",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isNonnegative" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19414,11 +18500,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isLowerLimited(PyObject *SWIGUNUSEDPARM(se
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isLowerLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isLowerLimited" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19436,11 +18523,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isUpperLimited(PyObject *SWIGUNUSEDPARM(se
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isUpperLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isUpperLimited" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19458,11 +18546,12 @@ SWIGINTERN PyObject *_wrap_RealLimits_isLimited(PyObject *SWIGUNUSEDPARM(self),
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:RealLimits_isLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_isLimited" "', argument " "1"" of type '" "RealLimits const *""'"); 
   }
@@ -19480,10 +18569,11 @@ SWIGINTERN PyObject *_wrap_delete_RealLimits(PyObject *SWIGUNUSEDPARM(self), PyO
   RealLimits *arg1 = (RealLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_RealLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_RealLimits, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RealLimits" "', argument " "1"" of type '" "RealLimits *""'"); 
   }
@@ -19498,16 +18588,20 @@ fail:
 
 SWIGINTERN PyObject *RealLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_RealLimits, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *RealLimits_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_AttLimits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AttLimits *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_AttLimits")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_AttLimits", 0, 0, 0)) SWIG_fail;
   result = (AttLimits *)new AttLimits();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AttLimits, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -19520,7 +18614,7 @@ SWIGINTERN PyObject *_wrap_AttLimits_limitless(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":AttLimits_limitless")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_limitless", 0, 0, 0)) SWIG_fail;
   result = AttLimits::limitless();
   resultobj = SWIG_NewPointerObj((new AttLimits(static_cast< const AttLimits& >(result))), SWIGTYPE_p_AttLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19534,11 +18628,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_lowerLimited(PyObject *SWIGUNUSEDPARM(self)
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_lowerLimited",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "AttLimits_lowerLimited" "', argument " "1"" of type '" "double""'");
   } 
@@ -19555,7 +18650,7 @@ SWIGINTERN PyObject *_wrap_AttLimits_positive(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":AttLimits_positive")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_positive", 0, 0, 0)) SWIG_fail;
   result = AttLimits::positive();
   resultobj = SWIG_NewPointerObj((new AttLimits(static_cast< const AttLimits& >(result))), SWIGTYPE_p_AttLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19568,7 +18663,7 @@ SWIGINTERN PyObject *_wrap_AttLimits_nonnegative(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":AttLimits_nonnegative")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_nonnegative", 0, 0, 0)) SWIG_fail;
   result = AttLimits::nonnegative();
   resultobj = SWIG_NewPointerObj((new AttLimits(static_cast< const AttLimits& >(result))), SWIGTYPE_p_AttLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19582,11 +18677,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_upperLimited(PyObject *SWIGUNUSEDPARM(self)
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_upperLimited",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  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 '" "AttLimits_upperLimited" "', argument " "1"" of type '" "double""'");
   } 
@@ -19607,17 +18703,16 @@ SWIGINTERN PyObject *_wrap_AttLimits_limited(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AttLimits_limited",&obj0,&obj1)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_limited", 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 '" "AttLimits_limited" "', argument " "1"" of type '" "double""'");
   } 
   arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AttLimits_limited" "', argument " "2"" of type '" "double""'");
   } 
@@ -19634,7 +18729,7 @@ SWIGINTERN PyObject *_wrap_AttLimits_fixed(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)":AttLimits_fixed")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_fixed", 0, 0, 0)) SWIG_fail;
   result = AttLimits::fixed();
   resultobj = SWIG_NewPointerObj((new AttLimits(static_cast< const AttLimits& >(result))), SWIGTYPE_p_AttLimits, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -19648,11 +18743,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_isFixed(PyObject *SWIGUNUSEDPARM(self), PyO
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_isFixed",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_isFixed" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19670,11 +18766,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_isLimited(PyObject *SWIGUNUSEDPARM(self), P
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_isLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_isLimited" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19692,11 +18789,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_isUpperLimited(PyObject *SWIGUNUSEDPARM(sel
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_isUpperLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_isUpperLimited" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19714,11 +18812,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_isLowerLimited(PyObject *SWIGUNUSEDPARM(sel
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_isLowerLimited",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_isLowerLimited" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19736,11 +18835,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_isLimitless(PyObject *SWIGUNUSEDPARM(self),
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_isLimitless",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_isLimitless" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19758,11 +18858,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_lowerLimit(PyObject *SWIGUNUSEDPARM(self),
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_lowerLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_lowerLimit" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19780,11 +18881,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_upperLimit(PyObject *SWIGUNUSEDPARM(self),
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_upperLimit",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_upperLimit" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19805,16 +18907,15 @@ SWIGINTERN PyObject *_wrap_AttLimits_setFixed(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AttLimits_setFixed",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits_setFixed", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_setFixed" "', argument " "1"" of type '" "AttLimits *""'"); 
   }
   arg1 = reinterpret_cast< AttLimits * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AttLimits_setFixed" "', argument " "2"" of type '" "bool""'");
   } 
@@ -19835,17 +18936,16 @@ SWIGINTERN PyObject *_wrap_AttLimits___eq__(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AttLimits___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits___eq__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits___eq__" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
   arg1 = reinterpret_cast< AttLimits * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AttLimits,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_AttLimits,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AttLimits___eq__" "', argument " "2"" of type '" "AttLimits const &""'"); 
   }
@@ -19857,7 +18957,9 @@ SWIGINTERN PyObject *_wrap_AttLimits___eq__(PyObject *SWIGUNUSEDPARM(self), PyOb
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -19869,17 +18971,16 @@ SWIGINTERN PyObject *_wrap_AttLimits___ne__(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AttLimits___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "AttLimits___ne__", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits___ne__" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
   arg1 = reinterpret_cast< AttLimits * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AttLimits,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_AttLimits,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AttLimits___ne__" "', argument " "2"" of type '" "AttLimits const &""'"); 
   }
@@ -19891,7 +18992,9 @@ SWIGINTERN PyObject *_wrap_AttLimits___ne__(PyObject *SWIGUNUSEDPARM(self), PyOb
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
-  return NULL;
+  PyErr_Clear();
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
 }
 
 
@@ -19900,11 +19003,12 @@ SWIGINTERN PyObject *_wrap_AttLimits_toString(PyObject *SWIGUNUSEDPARM(self), Py
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AttLimits_toString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AttLimits_toString" "', argument " "1"" of type '" "AttLimits const *""'"); 
   }
@@ -19922,10 +19026,11 @@ SWIGINTERN PyObject *_wrap_delete_AttLimits(PyObject *SWIGUNUSEDPARM(self), PyOb
   AttLimits *arg1 = (AttLimits *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_AttLimits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AttLimits, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AttLimits, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AttLimits" "', argument " "1"" of type '" "AttLimits *""'"); 
   }
@@ -19940,16 +19045,20 @@ fail:
 
 SWIGINTERN PyObject *AttLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AttLimits, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *AttLimits_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Parameter")) SWIG_fail;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
   result = (Fit::Parameter *)new Fit::Parameter();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Fit__Parameter, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -19958,7 +19067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -19971,16 +19080,12 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int res3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_Parameter",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Parameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -19989,12 +19094,12 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Parameter" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AttLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AttLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Parameter" "', argument " "3"" of type '" "AttLimits const &""'"); 
   }
@@ -20002,7 +19107,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Parameter" "', argument " "3"" of type '" "AttLimits const &""'"); 
   }
   arg3 = reinterpret_cast< AttLimits * >(argp3);
-  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_Parameter" "', argument " "4"" of type '" "double""'");
   } 
@@ -20017,7 +19122,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
@@ -20027,15 +19132,12 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Parameter",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Parameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -20044,12 +19146,12 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Parameter" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_AttLimits,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_AttLimits,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Parameter" "', argument " "3"" of type '" "AttLimits const &""'"); 
   }
@@ -20067,21 +19169,19 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   double arg2 ;
   int res1 = SWIG_OLDOBJ ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_Parameter",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Parameter" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -20090,7 +19190,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
     }
     arg1 = ptr;
   }
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Parameter" "', argument " "2"" of type '" "double""'");
   } 
@@ -20110,15 +19210,11 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_Parameter", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 0) {
-    return _wrap_new_Parameter__SWIG_0(self, args);
+    return _wrap_new_Parameter__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
     int _v;
@@ -20130,7 +19226,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_Parameter__SWIG_3(self, args);
+        return _wrap_new_Parameter__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -20144,10 +19240,10 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AttLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AttLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_new_Parameter__SWIG_2(self, args);
+          return _wrap_new_Parameter__SWIG_2(self, argc, argv);
         }
       }
     }
@@ -20162,7 +19258,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AttLimits, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_AttLimits, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           {
@@ -20170,7 +19266,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
             _v = SWIG_CheckState(res);
           }
           if (_v) {
-            return _wrap_new_Parameter__SWIG_1(self, args);
+            return _wrap_new_Parameter__SWIG_1(self, argc, argv);
           }
         }
       }
@@ -20178,7 +19274,7 @@ SWIGINTERN PyObject *_wrap_new_Parameter(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_Parameter'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Parameter'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Fit::Parameter::Parameter()\n"
     "    Fit::Parameter::Parameter(std::string const &,double,AttLimits const &,double)\n"
@@ -20193,11 +19289,12 @@ SWIGINTERN PyObject *_wrap_Parameter_name(PyObject *SWIGUNUSEDPARM(self), PyObje
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_name",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_name" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20215,11 +19312,12 @@ SWIGINTERN PyObject *_wrap_Parameter_startValue(PyObject *SWIGUNUSEDPARM(self),
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_startValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_startValue" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20237,11 +19335,12 @@ SWIGINTERN PyObject *_wrap_Parameter_limits(PyObject *SWIGUNUSEDPARM(self), PyOb
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   AttLimits result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_limits",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_limits" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20259,11 +19358,12 @@ SWIGINTERN PyObject *_wrap_Parameter_value(PyObject *SWIGUNUSEDPARM(self), PyObj
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_value",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_value" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20284,16 +19384,15 @@ SWIGINTERN PyObject *_wrap_Parameter_setValue(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameter_setValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameter_setValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_setValue" "', argument " "1"" of type '" "Fit::Parameter *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameter * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Parameter_setValue" "', argument " "2"" of type '" "double""'");
   } 
@@ -20311,11 +19410,12 @@ SWIGINTERN PyObject *_wrap_Parameter_step(PyObject *SWIGUNUSEDPARM(self), PyObje
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_step",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_step" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20333,11 +19433,12 @@ SWIGINTERN PyObject *_wrap_Parameter_error(PyObject *SWIGUNUSEDPARM(self), PyObj
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameter_error",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_error" "', argument " "1"" of type '" "Fit::Parameter const *""'"); 
   }
@@ -20358,16 +19459,15 @@ SWIGINTERN PyObject *_wrap_Parameter_setError(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameter_setError",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameter_setError", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameter_setError" "', argument " "1"" of type '" "Fit::Parameter *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameter * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Parameter_setError" "', argument " "2"" of type '" "double""'");
   } 
@@ -20385,10 +19485,11 @@ SWIGINTERN PyObject *_wrap_delete_Parameter(PyObject *SWIGUNUSEDPARM(self), PyOb
   Fit::Parameter *arg1 = (Fit::Parameter *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Parameter",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameter, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameter, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Parameter" "', argument " "1"" of type '" "Fit::Parameter *""'"); 
   }
@@ -20403,16 +19504,20 @@ fail:
 
 SWIGINTERN PyObject *Parameter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Fit__Parameter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Parameter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_Parameters(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Fit::Parameters *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Parameters")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_Parameters", 0, 0, 0)) SWIG_fail;
   result = (Fit::Parameters *)new Fit::Parameters();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -20429,16 +19534,15 @@ SWIGINTERN PyObject *_wrap_Parameters_add_cpp(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters_add_cpp",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameters_add_cpp", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_add_cpp" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameter,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameter,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Parameters_add_cpp" "', argument " "2"" of type '" "Fit::Parameter const &""'"); 
   }
@@ -20454,16 +19558,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< std::vector< Fit::Parameter,std::allocator< Fit::Parameter > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_begin" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20476,16 +19579,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< std::vector< Fit::Parameter,std::allocator< Fit::Parameter > >::const_iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_end" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20498,16 +19600,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< std::vector< Fit::Parameter,std::allocator< Fit::Parameter > >::iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_begin" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
@@ -20525,20 +19626,16 @@ SWIGINTERN PyObject *_wrap_Parameters_begin(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Parameters_begin", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Fit__Parameters, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Parameters_begin__SWIG_1(self, args);
+      return _wrap_Parameters_begin__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -20547,12 +19644,12 @@ SWIGINTERN PyObject *_wrap_Parameters_begin(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Fit__Parameters, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Parameters_begin__SWIG_0(self, args);
+      return _wrap_Parameters_begin__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Parameters_begin'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Parameters_begin'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Fit::Parameters::begin() const\n"
     "    Fit::Parameters::begin()\n");
@@ -20560,16 +19657,15 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
   SwigValueWrapper< std::vector< Fit::Parameter,std::allocator< Fit::Parameter > >::iterator > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_end" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
@@ -20587,20 +19683,16 @@ SWIGINTERN PyObject *_wrap_Parameters_end(PyObject *self, PyObject *args) {
   PyObject *argv[2] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Parameters_end", 0, 1, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Fit__Parameters, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Parameters_end__SWIG_1(self, args);
+      return _wrap_Parameters_end__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 1) {
@@ -20609,12 +19701,12 @@ SWIGINTERN PyObject *_wrap_Parameters_end(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Fit__Parameters, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_Parameters_end__SWIG_0(self, args);
+      return _wrap_Parameters_end__SWIG_0(self, argc, argv);
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Parameters_end'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Parameters_end'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Fit::Parameters::end() const\n"
     "    Fit::Parameters::end()\n");
@@ -20627,11 +19719,12 @@ SWIGINTERN PyObject *_wrap_Parameters_size(PyObject *SWIGUNUSEDPARM(self), PyObj
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_size" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20649,11 +19742,12 @@ SWIGINTERN PyObject *_wrap_Parameters_values(PyObject *SWIGUNUSEDPARM(self), PyO
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_values",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_values" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20673,18 +19767,17 @@ SWIGINTERN PyObject *_wrap_Parameters_setValues(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters_setValues",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameters_setValues", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_setValues" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Parameters_setValues" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -20708,11 +19801,12 @@ SWIGINTERN PyObject *_wrap_Parameters_errors(PyObject *SWIGUNUSEDPARM(self), PyO
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_errors",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_errors" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20732,18 +19826,17 @@ SWIGINTERN PyObject *_wrap_Parameters_setErrors(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters_setErrors",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameters_setErrors", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_setErrors" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
   {
     std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Parameters_setErrors" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); 
     }
@@ -20767,11 +19860,12 @@ SWIGINTERN PyObject *_wrap_Parameters_correlationMatrix(PyObject *SWIGUNUSEDPARM
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Fit::Parameters::corr_matrix_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_correlationMatrix",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_correlationMatrix" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20791,18 +19885,17 @@ SWIGINTERN PyObject *_wrap_Parameters_setCorrelationMatrix(PyObject *SWIGUNUSEDP
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters_setCorrelationMatrix",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Parameters_setCorrelationMatrix", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_setCorrelationMatrix" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
   {
     std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
-    res2 = swig::asptr(obj1, &ptr);
+    res2 = swig::asptr(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Parameters_setCorrelationMatrix" "', argument " "2"" of type '" "Fit::Parameters::corr_matrix_t const &""'"); 
     }
@@ -20826,11 +19919,12 @@ SWIGINTERN PyObject *_wrap_Parameters_freeParameterCount(PyObject *SWIGUNUSEDPAR
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   size_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:Parameters_freeParameterCount",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters_freeParameterCount" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
@@ -20843,25 +19937,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   std::string arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters___getitem__" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    int res = SWIG_AsPtr_std_string(obj1, &ptr);
+    int res = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
       SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Parameters___getitem__" "', argument " "2"" of type '" "std::string""'"); 
     }
@@ -20876,7 +19968,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Parameters___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Parameters___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   size_t arg2 ;
@@ -20884,17 +19976,15 @@ SWIGINTERN PyObject *_wrap_Parameters___getitem____SWIG_1(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   Fit::Parameter *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Parameters___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Parameters___getitem__" "', argument " "1"" of type '" "Fit::Parameters const *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Parameters * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Parameters___getitem__" "', argument " "2"" of type '" "size_t""'");
   } 
@@ -20912,13 +20002,9 @@ SWIGINTERN PyObject *_wrap_Parameters___getitem__(PyObject *self, PyObject *args
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Parameters___getitem__", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -20930,7 +20016,7 @@ SWIGINTERN PyObject *_wrap_Parameters___getitem__(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_Parameters___getitem____SWIG_1(self, args);
+        return _wrap_Parameters___getitem____SWIG_1(self, argc, argv);
       }
     }
   }
@@ -20943,13 +20029,13 @@ SWIGINTERN PyObject *_wrap_Parameters___getitem__(PyObject *self, PyObject *args
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Parameters___getitem____SWIG_0(self, args);
+        return _wrap_Parameters___getitem____SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Parameters___getitem__'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Parameters___getitem__'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Fit::Parameters::__getitem__(std::string) const\n"
     "    Fit::Parameters::__getitem__(size_t) const\n");
@@ -20962,10 +20048,11 @@ SWIGINTERN PyObject *_wrap_delete_Parameters(PyObject *SWIGUNUSEDPARM(self), PyO
   Fit::Parameters *arg1 = (Fit::Parameters *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Parameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Parameters, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Parameters" "', argument " "1"" of type '" "Fit::Parameters *""'"); 
   }
@@ -20980,20 +20067,25 @@ fail:
 
 SWIGINTERN PyObject *Parameters_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Fit__Parameters, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Parameters_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_delete_IMinimizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IMinimizer *arg1 = (IMinimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_IMinimizer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IMinimizer" "', argument " "1"" of type '" "IMinimizer *""'"); 
   }
@@ -21011,11 +20103,12 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minimizerName(PyObject *SWIGUNUSEDPARM(sel
   IMinimizer *arg1 = (IMinimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMinimizer_minimizerName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_minimizerName" "', argument " "1"" of type '" "IMinimizer const *""'"); 
   }
@@ -21033,11 +20126,12 @@ SWIGINTERN PyObject *_wrap_IMinimizer_algorithmName(PyObject *SWIGUNUSEDPARM(sel
   IMinimizer *arg1 = (IMinimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMinimizer_algorithmName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_algorithmName" "', argument " "1"" of type '" "IMinimizer const *""'"); 
   }
@@ -21061,19 +20155,17 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minimize_scalar(PyObject *SWIGUNUSEDPARM(s
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   Fit::MinimizerResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IMinimizer_minimize_scalar",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IMinimizer_minimize_scalar", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_minimize_scalar" "', argument " "1"" of type '" "IMinimizer *""'"); 
   }
   arg1 = reinterpret_cast< IMinimizer * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_fcn_scalar_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fcn_scalar_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IMinimizer_minimize_scalar" "', argument " "2"" of type '" "fcn_scalar_t""'"); 
     }  
@@ -21086,7 +20178,7 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minimize_scalar(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IMinimizer_minimize_scalar" "', argument " "3"" of type '" "Fit::Parameters""'"); 
     }  
@@ -21117,19 +20209,17 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minimize_residual(PyObject *SWIGUNUSEDPARM
   int res2 = 0 ;
   void *argp3 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   Fit::MinimizerResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:IMinimizer_minimize_residual",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IMinimizer_minimize_residual", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_minimize_residual" "', argument " "1"" of type '" "IMinimizer *""'"); 
   }
   arg1 = reinterpret_cast< IMinimizer * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_fcn_residual_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fcn_residual_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IMinimizer_minimize_residual" "', argument " "2"" of type '" "fcn_residual_t""'"); 
     }  
@@ -21142,7 +20232,7 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minimize_residual(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "IMinimizer_minimize_residual" "', argument " "3"" of type '" "Fit::Parameters""'"); 
     }  
@@ -21167,10 +20257,11 @@ SWIGINTERN PyObject *_wrap_IMinimizer_clear(PyObject *SWIGUNUSEDPARM(self), PyOb
   IMinimizer *arg1 = (IMinimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMinimizer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_clear" "', argument " "1"" of type '" "IMinimizer *""'"); 
   }
@@ -21188,11 +20279,12 @@ SWIGINTERN PyObject *_wrap_IMinimizer_minValue(PyObject *SWIGUNUSEDPARM(self), P
   IMinimizer *arg1 = (IMinimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:IMinimizer_minValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_minValue" "', argument " "1"" of type '" "IMinimizer const *""'"); 
   }
@@ -21212,18 +20304,17 @@ SWIGINTERN PyObject *_wrap_IMinimizer_setOptions(PyObject *SWIGUNUSEDPARM(self),
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:IMinimizer_setOptions",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "IMinimizer_setOptions", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMinimizer_setOptions" "', argument " "1"" of type '" "IMinimizer *""'"); 
   }
   arg1 = reinterpret_cast< IMinimizer * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IMinimizer_setOptions" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21244,7 +20335,7 @@ fail:
 
 SWIGINTERN PyObject *IMinimizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_IMinimizer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -21253,7 +20344,7 @@ SWIGINTERN PyObject *_wrap_new_MinimizerCatalogue(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   MinimizerCatalogue *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_MinimizerCatalogue")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_MinimizerCatalogue", 0, 0, 0)) SWIG_fail;
   result = (MinimizerCatalogue *)new MinimizerCatalogue();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalogue, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -21267,11 +20358,12 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_toString(PyObject *SWIGUNUSEDPARM(
   MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerCatalogue_toString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_toString" "', argument " "1"" of type '" "MinimizerCatalogue const *""'"); 
   }
@@ -21289,11 +20381,12 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerNames(PyObject *SWIGUNUSE
   MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::vector< std::string,std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerCatalogue_minimizerNames",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_minimizerNames" "', argument " "1"" of type '" "MinimizerCatalogue const *""'"); 
   }
@@ -21313,19 +20406,18 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmNames(PyObject *SWIGUNUSE
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::vector< std::string,std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerCatalogue_algorithmNames",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_algorithmNames", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_algorithmNames" "', argument " "1"" of type '" "MinimizerCatalogue const *""'"); 
   }
   arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_algorithmNames" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21351,19 +20443,18 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmDescriptions(PyObject *SW
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   std::vector< std::string,std::allocator< std::string > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerCatalogue_algorithmDescriptions",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_algorithmDescriptions", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_algorithmDescriptions" "', argument " "1"" of type '" "MinimizerCatalogue const *""'"); 
   }
   arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_algorithmDescriptions" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21389,19 +20480,18 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerInfo(PyObject *SWIGUNUSED
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   MinimizerInfo *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerCatalogue_minimizerInfo",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_minimizerInfo", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_minimizerInfo" "', argument " "1"" of type '" "MinimizerCatalogue const *""'"); 
   }
   arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_minimizerInfo" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21425,10 +20515,11 @@ SWIGINTERN PyObject *_wrap_delete_MinimizerCatalogue(PyObject *SWIGUNUSEDPARM(se
   MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MinimizerCatalogue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerCatalogue, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MinimizerCatalogue" "', argument " "1"" of type '" "MinimizerCatalogue *""'"); 
   }
@@ -21443,12 +20534,16 @@ fail:
 
 SWIGINTERN PyObject *MinimizerCatalogue_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerCatalogue, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MinimizerCatalogue_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -21456,15 +20551,12 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_0(PyObject *SW
   int res1 = SWIG_OLDOBJ ;
   int res2 = SWIG_OLDOBJ ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   IMinimizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:MinimizerFactory_createMinimizer",&obj0,&obj1,&obj2)) SWIG_fail;
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerFactory_createMinimizer" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -21475,7 +20567,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_0(PyObject *SW
   }
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerFactory_createMinimizer" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21486,7 +20578,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_0(PyObject *SW
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "MinimizerFactory_createMinimizer" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -21509,20 +20601,18 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
   int res1 = SWIG_OLDOBJ ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   IMinimizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerFactory_createMinimizer",&obj0,&obj1)) SWIG_fail;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerFactory_createMinimizer" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -21533,7 +20623,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_1(PyObject *SW
   }
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerFactory_createMinimizer" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -21554,17 +20644,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
   IMinimizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerFactory_createMinimizer",&obj0)) SWIG_fail;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
+    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
     if (!SWIG_IsOK(res1)) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerFactory_createMinimizer" "', argument " "1"" of type '" "std::string const &""'"); 
     }
@@ -21588,19 +20677,15 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer(PyObject *self, PyOb
   PyObject *argv[4] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "MinimizerFactory_createMinimizer", 0, 3, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_MinimizerFactory_createMinimizer__SWIG_2(self, args);
+      return _wrap_MinimizerFactory_createMinimizer__SWIG_2(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -21611,7 +20696,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer(PyObject *self, PyOb
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_MinimizerFactory_createMinimizer__SWIG_1(self, args);
+        return _wrap_MinimizerFactory_createMinimizer__SWIG_1(self, argc, argv);
       }
     }
   }
@@ -21626,14 +20711,14 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer(PyObject *self, PyOb
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_MinimizerFactory_createMinimizer__SWIG_0(self, args);
+          return _wrap_MinimizerFactory_createMinimizer__SWIG_0(self, argc, argv);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MinimizerFactory_createMinimizer'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'MinimizerFactory_createMinimizer'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    MinimizerFactory::createMinimizer(std::string const &,std::string const &,std::string const &)\n"
     "    MinimizerFactory::createMinimizer(std::string const &,std::string const &)\n"
@@ -21645,7 +20730,7 @@ fail:
 SWIGINTERN PyObject *_wrap_MinimizerFactory_printCatalogue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   
-  if (!PyArg_ParseTuple(args,(char *)":MinimizerFactory_printCatalogue")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_printCatalogue", 0, 0, 0)) SWIG_fail;
   MinimizerFactory::printCatalogue();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -21658,7 +20743,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogueToString(PyObject *SWIGUNUS
   PyObject *resultobj = 0;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)":MinimizerFactory_catalogueToString")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogueToString", 0, 0, 0)) SWIG_fail;
   result = MinimizerFactory::catalogueToString();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
@@ -21671,7 +20756,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogueDetailsToString(PyObject *S
   PyObject *resultobj = 0;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)":MinimizerFactory_catalogueDetailsToString")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogueDetailsToString", 0, 0, 0)) SWIG_fail;
   result = MinimizerFactory::catalogueDetailsToString();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
@@ -21684,7 +20769,7 @@ SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogue(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   MinimizerCatalogue *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":MinimizerFactory_catalogue")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogue", 0, 0, 0)) SWIG_fail;
   result = (MinimizerCatalogue *) &MinimizerFactory::catalogue();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalogue, 0 |  0 );
   return resultobj;
@@ -21697,7 +20782,7 @@ SWIGINTERN PyObject *_wrap_new_MinimizerFactory(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   MinimizerFactory *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_MinimizerFactory")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_MinimizerFactory", 0, 0, 0)) SWIG_fail;
   result = (MinimizerFactory *)new MinimizerFactory();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerFactory, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -21711,10 +20796,11 @@ SWIGINTERN PyObject *_wrap_delete_MinimizerFactory(PyObject *SWIGUNUSEDPARM(self
   MinimizerFactory *arg1 = (MinimizerFactory *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MinimizerFactory",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MinimizerFactory, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerFactory, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MinimizerFactory" "', argument " "1"" of type '" "MinimizerFactory *""'"); 
   }
@@ -21729,24 +20815,26 @@ fail:
 
 SWIGINTERN PyObject *MinimizerFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerFactory, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_PyCallback__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MinimizerFactory_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyCallback__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyCallback::CallbackType arg2 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   PyCallback *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:new_PyCallback",&obj0,&obj1)) SWIG_fail;
-  arg1 = obj0;
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  arg1 = swig_obj[0];
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyCallback" "', argument " "2"" of type '" "PyCallback::CallbackType""'");
   } 
@@ -21765,14 +20853,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PyCallback__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PyCallback__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  PyObject * obj0 = 0 ;
   PyCallback *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:new_PyCallback",&obj0)) SWIG_fail;
-  arg1 = obj0;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  arg1 = swig_obj[0];
   if ( arg1 != Py_None ) {
     /* subclassed */
     result = (PyCallback *)new SwigDirector_PyCallback(arg1); 
@@ -21792,18 +20879,14 @@ SWIGINTERN PyObject *_wrap_new_PyCallback(PyObject *self, PyObject *args) {
   PyObject *argv[3] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_PyCallback", 0, 2, argv))) SWIG_fail;
+  --argc;
   if (argc == 1) {
     int _v;
     _v = (argv[0] != 0);
     if (_v) {
-      return _wrap_new_PyCallback__SWIG_1(self, args);
+      return _wrap_new_PyCallback__SWIG_1(self, argc, argv);
     }
   }
   if (argc == 2) {
@@ -21815,13 +20898,13 @@ SWIGINTERN PyObject *_wrap_new_PyCallback(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_PyCallback__SWIG_0(self, args);
+        return _wrap_new_PyCallback__SWIG_0(self, argc, argv);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_PyCallback'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_PyCallback'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    PyCallback::PyCallback(PyCallback::CallbackType)\n"
     "    PyCallback::PyCallback(PyObject *)\n");
@@ -21834,10 +20917,11 @@ SWIGINTERN PyObject *_wrap_delete_PyCallback(PyObject *SWIGUNUSEDPARM(self), PyO
   PyCallback *arg1 = (PyCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PyCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyCallback, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyCallback, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PyCallback" "', argument " "1"" of type '" "PyCallback *""'"); 
   }
@@ -21855,11 +20939,12 @@ SWIGINTERN PyObject *_wrap_PyCallback_callback_type(PyObject *SWIGUNUSEDPARM(sel
   PyCallback *arg1 = (PyCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   PyCallback::CallbackType result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PyCallback_callback_type",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyCallback_callback_type" "', argument " "1"" of type '" "PyCallback const *""'"); 
   }
@@ -21880,20 +20965,19 @@ SWIGINTERN PyObject *_wrap_PyCallback_call_scalar(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PyCallback_call_scalar",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PyCallback_call_scalar", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyCallback_call_scalar" "', argument " "1"" of type '" "PyCallback *""'"); 
   }
   arg1 = reinterpret_cast< PyCallback * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyCallback_call_scalar" "', argument " "2"" of type '" "Fit::Parameters""'"); 
     }  
@@ -21906,7 +20990,7 @@ SWIGINTERN PyObject *_wrap_PyCallback_call_scalar(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (double)(arg1)->PyCallback::call_scalar(arg2);
@@ -21931,20 +21015,19 @@ SWIGINTERN PyObject *_wrap_PyCallback_call_residuals(PyObject *SWIGUNUSEDPARM(se
   int res1 = 0 ;
   void *argp2 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   Swig::Director *director = 0;
   bool upcall = false;
   std::vector< double,std::allocator< double > > result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PyCallback_call_residuals",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "PyCallback_call_residuals", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyCallback_call_residuals" "', argument " "1"" of type '" "PyCallback *""'"); 
   }
   arg1 = reinterpret_cast< PyCallback * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyCallback_call_residuals" "', argument " "2"" of type '" "Fit::Parameters""'"); 
     }  
@@ -21957,7 +21040,7 @@ SWIGINTERN PyObject *_wrap_PyCallback_call_residuals(PyObject *SWIGUNUSEDPARM(se
     }
   }
   director = SWIG_DIRECTOR_CAST(arg1);
-  upcall = (director && (director->swig_get_self()==obj0));
+  upcall = (director && (director->swig_get_self()==swig_obj[0]));
   try {
     if (upcall) {
       result = (arg1)->PyCallback::call_residuals(arg2);
@@ -21979,10 +21062,11 @@ SWIGINTERN PyObject *_wrap_disown_PyCallback(PyObject *SWIGUNUSEDPARM(self), PyO
   PyCallback *arg1 = (PyCallback *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:disown_PyCallback",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PyCallback, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_PyCallback" "', argument " "1"" of type '" "PyCallback *""'"); 
   }
@@ -22001,16 +21085,20 @@ fail:
 
 SWIGINTERN PyObject *PyCallback_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_PyCallback, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyCallback_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_MinimizerResult(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Fit::MinimizerResult *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_MinimizerResult")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_MinimizerResult", 0, 0, 0)) SWIG_fail;
   result = (Fit::MinimizerResult *)new Fit::MinimizerResult();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Fit__MinimizerResult, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -22027,16 +21115,15 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setParameters(PyObject *SWIGUNUSEDPAR
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setParameters",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setParameters", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setParameters" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerResult_setParameters" "', argument " "2"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -22057,11 +21144,12 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_parameters(PyObject *SWIGUNUSEDPARM(s
   Fit::MinimizerResult *arg1 = (Fit::MinimizerResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   Fit::Parameters result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerResult_parameters",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_parameters" "', argument " "1"" of type '" "Fit::MinimizerResult const *""'"); 
   }
@@ -22082,16 +21170,15 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setMinValue(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setMinValue",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setMinValue", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setMinValue" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MinimizerResult_setMinValue" "', argument " "2"" of type '" "double""'");
   } 
@@ -22109,11 +21196,12 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_minValue(PyObject *SWIGUNUSEDPARM(sel
   Fit::MinimizerResult *arg1 = (Fit::MinimizerResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   double result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerResult_minValue",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_minValue" "', argument " "1"" of type '" "Fit::MinimizerResult const *""'"); 
   }
@@ -22131,11 +21219,12 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_toString(PyObject *SWIGUNUSEDPARM(sel
   Fit::MinimizerResult *arg1 = (Fit::MinimizerResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   std::string result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:MinimizerResult_toString",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_toString" "', argument " "1"" of type '" "Fit::MinimizerResult const *""'"); 
   }
@@ -22155,18 +21244,17 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setReport(PyObject *SWIGUNUSEDPARM(se
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setReport",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setReport", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setReport" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerResult_setReport" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -22193,16 +21281,15 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setDuration(PyObject *SWIGUNUSEDPARM(
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setDuration",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setDuration", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setDuration" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
-  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MinimizerResult_setDuration" "', argument " "2"" of type '" "double""'");
   } 
@@ -22223,16 +21310,15 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setNumberOfCalls(PyObject *SWIGUNUSED
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setNumberOfCalls",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setNumberOfCalls", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setNumberOfCalls" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MinimizerResult_setNumberOfCalls" "', argument " "2"" of type '" "int""'");
   } 
@@ -22253,16 +21339,15 @@ SWIGINTERN PyObject *_wrap_MinimizerResult_setNumberOfGradientCalls(PyObject *SW
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:MinimizerResult_setNumberOfGradientCalls",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "MinimizerResult_setNumberOfGradientCalls", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerResult_setNumberOfGradientCalls" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
   arg1 = reinterpret_cast< Fit::MinimizerResult * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MinimizerResult_setNumberOfGradientCalls" "', argument " "2"" of type '" "int""'");
   } 
@@ -22280,10 +21365,11 @@ SWIGINTERN PyObject *_wrap_delete_MinimizerResult(PyObject *SWIGUNUSEDPARM(self)
   Fit::MinimizerResult *arg1 = (Fit::MinimizerResult *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_MinimizerResult",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__MinimizerResult, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__MinimizerResult, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MinimizerResult" "', argument " "1"" of type '" "Fit::MinimizerResult *""'"); 
   }
@@ -22298,16 +21384,20 @@ fail:
 
 SWIGINTERN PyObject *MinimizerResult_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Fit__MinimizerResult, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *MinimizerResult_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_Minimizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Fit::Minimizer *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)":new_Minimizer")) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "new_Minimizer", 0, 0, 0)) SWIG_fail;
   result = (Fit::Minimizer *)new Fit::Minimizer();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Fit__Minimizer, SWIG_POINTER_NEW |  0 );
   return resultobj;
@@ -22321,10 +21411,11 @@ SWIGINTERN PyObject *_wrap_delete_Minimizer(PyObject *SWIGUNUSEDPARM(self), PyOb
   Fit::Minimizer *arg1 = (Fit::Minimizer *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject * obj0 = 0 ;
+  PyObject *swig_obj[1] ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Minimizer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, SWIG_POINTER_DISOWN |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Minimizer" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
@@ -22337,7 +21428,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Minimizer *arg1 = (Fit::Minimizer *) 0 ;
   std::string *arg2 = 0 ;
@@ -22348,20 +21439,16 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_0(PyObject *SWIGUNUSEDPA
   int res2 = SWIG_OLDOBJ ;
   int res3 = SWIG_OLDOBJ ;
   int res4 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOO:Minimizer_setMinimizer",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
+  if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Minimizer_setMinimizer" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Minimizer * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Minimizer_setMinimizer" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -22372,7 +21459,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_0(PyObject *SWIGUNUSEDPA
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Minimizer_setMinimizer" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -22383,7 +21470,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_0(PyObject *SWIGUNUSEDPA
   }
   {
     std::string *ptr = (std::string *)0;
-    res4 = SWIG_AsPtr_std_string(obj3, &ptr);
+    res4 = SWIG_AsPtr_std_string(swig_obj[3], &ptr);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Minimizer_setMinimizer" "', argument " "4"" of type '" "std::string const &""'"); 
     }
@@ -22406,7 +21493,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Minimizer *arg1 = (Fit::Minimizer *) 0 ;
   std::string *arg2 = 0 ;
@@ -22415,19 +21502,16 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_1(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
   int res3 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Minimizer_setMinimizer",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
+  if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Minimizer_setMinimizer" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Minimizer * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Minimizer_setMinimizer" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -22438,7 +21522,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_1(PyObject *SWIGUNUSEDPA
   }
   {
     std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(obj2, &ptr);
+    res3 = SWIG_AsPtr_std_string(swig_obj[2], &ptr);
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Minimizer_setMinimizer" "', argument " "3"" of type '" "std::string const &""'"); 
     }
@@ -22459,25 +21543,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Minimizer *arg1 = (Fit::Minimizer *) 0 ;
   std::string *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Minimizer_setMinimizer",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Minimizer_setMinimizer" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Minimizer * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Minimizer_setMinimizer" "', argument " "2"" of type '" "std::string const &""'"); 
     }
@@ -22496,7 +21578,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   Fit::Minimizer *arg1 = (Fit::Minimizer *) 0 ;
   IMinimizer *arg2 = (IMinimizer *) 0 ;
@@ -22504,16 +21586,14 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer__SWIG_3(PyObject *SWIGUNUSEDPA
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Minimizer_setMinimizer",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Minimizer_setMinimizer" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Minimizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_IMinimizer, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_IMinimizer, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Minimizer_setMinimizer" "', argument " "2"" of type '" "IMinimizer *""'"); 
   }
@@ -22531,13 +21611,9 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
   PyObject *argv[5] = {
     0
   };
-  Py_ssize_t ii;
   
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
+  if (!(argc = SWIG_Python_UnpackTuple(args, "Minimizer_setMinimizer", 0, 4, argv))) SWIG_fail;
+  --argc;
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -22548,7 +21624,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_IMinimizer, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Minimizer_setMinimizer__SWIG_3(self, args);
+        return _wrap_Minimizer_setMinimizer__SWIG_3(self, argc, argv);
       }
     }
   }
@@ -22561,7 +21637,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
       int res = SWIG_AsPtr_std_string(argv[1], (std::string**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Minimizer_setMinimizer__SWIG_2(self, args);
+        return _wrap_Minimizer_setMinimizer__SWIG_2(self, argc, argv);
       }
     }
   }
@@ -22577,7 +21653,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
         int res = SWIG_AsPtr_std_string(argv[2], (std::string**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Minimizer_setMinimizer__SWIG_1(self, args);
+          return _wrap_Minimizer_setMinimizer__SWIG_1(self, argc, argv);
         }
       }
     }
@@ -22597,7 +21673,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
           int res = SWIG_AsPtr_std_string(argv[3], (std::string**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_Minimizer_setMinimizer__SWIG_0(self, args);
+            return _wrap_Minimizer_setMinimizer__SWIG_0(self, argc, argv);
           }
         }
       }
@@ -22605,7 +21681,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_setMinimizer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Minimizer_setMinimizer'.\n"
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Minimizer_setMinimizer'.\n"
     "  Possible C/C++ prototypes are:\n"
     "    Fit::Minimizer::setMinimizer(std::string const &,std::string const &,std::string const &)\n"
     "    Fit::Minimizer::setMinimizer(std::string const &,std::string const &)\n"
@@ -22626,18 +21702,16 @@ SWIGINTERN PyObject *_wrap_Minimizer_minimize_cpp(PyObject *SWIGUNUSEDPARM(self)
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject *swig_obj[3] ;
   Fit::MinimizerResult result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Minimizer_minimize_cpp",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "Minimizer_minimize_cpp", 3, 3, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Fit__Minimizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Minimizer_minimize_cpp" "', argument " "1"" of type '" "Fit::Minimizer *""'"); 
   }
   arg1 = reinterpret_cast< Fit::Minimizer * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_PyCallback,  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyCallback,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Minimizer_minimize_cpp" "', argument " "2"" of type '" "PyCallback &""'"); 
   }
@@ -22645,7 +21719,7 @@ SWIGINTERN PyObject *_wrap_Minimizer_minimize_cpp(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Minimizer_minimize_cpp" "', argument " "2"" of type '" "PyCallback &""'"); 
   }
   arg2 = reinterpret_cast< PyCallback * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_Fit__Parameters,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Minimizer_minimize_cpp" "', argument " "3"" of type '" "Fit::Parameters const &""'"); 
   }
@@ -22663,637 +21737,610 @@ fail:
 
 SWIGINTERN PyObject *Minimizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Fit__Minimizer, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *Minimizer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 static PyMethodDef SwigMethods[] = {
-	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
-	 { (char *)"delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_VARARGS, (char *)"delete_SwigPyIterator(SwigPyIterator self)"},
-	 { (char *)"SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_VARARGS, (char *)"SwigPyIterator_value(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, (char *)"\n"
-		"incr(size_t n=1) -> SwigPyIterator\n"
-		"SwigPyIterator_incr(SwigPyIterator self) -> SwigPyIterator\n"
-		""},
-	 { (char *)"SwigPyIterator_decr", _wrap_SwigPyIterator_decr, METH_VARARGS, (char *)"\n"
-		"decr(size_t n=1) -> SwigPyIterator\n"
-		"SwigPyIterator_decr(SwigPyIterator self) -> SwigPyIterator\n"
-		""},
-	 { (char *)"SwigPyIterator_distance", _wrap_SwigPyIterator_distance, METH_VARARGS, (char *)"SwigPyIterator_distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"},
-	 { (char *)"SwigPyIterator_equal", _wrap_SwigPyIterator_equal, METH_VARARGS, (char *)"SwigPyIterator_equal(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator_copy", _wrap_SwigPyIterator_copy, METH_VARARGS, (char *)"SwigPyIterator_copy(SwigPyIterator self) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator_next", _wrap_SwigPyIterator_next, METH_VARARGS, (char *)"SwigPyIterator_next(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator___next__", _wrap_SwigPyIterator___next__, METH_VARARGS, (char *)"SwigPyIterator___next__(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_previous", _wrap_SwigPyIterator_previous, METH_VARARGS, (char *)"SwigPyIterator_previous(SwigPyIterator self) -> PyObject *"},
-	 { (char *)"SwigPyIterator_advance", _wrap_SwigPyIterator_advance, METH_VARARGS, (char *)"SwigPyIterator_advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___eq__", _wrap_SwigPyIterator___eq__, METH_VARARGS, (char *)"SwigPyIterator___eq__(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator___ne__", _wrap_SwigPyIterator___ne__, METH_VARARGS, (char *)"SwigPyIterator___ne__(SwigPyIterator self, SwigPyIterator x) -> bool"},
-	 { (char *)"SwigPyIterator___iadd__", _wrap_SwigPyIterator___iadd__, METH_VARARGS, (char *)"SwigPyIterator___iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___isub__", _wrap_SwigPyIterator___isub__, METH_VARARGS, (char *)"SwigPyIterator___isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, (char *)"SwigPyIterator___add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
-	 { (char *)"SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, (char *)"\n"
-		"__sub__(ptrdiff_t n) -> SwigPyIterator\n"
+	 { "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL},
+	 { "delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_O, "delete_SwigPyIterator(SwigPyIterator self)"},
+	 { "SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_O, "SwigPyIterator_value(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, "SwigPyIterator_incr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"},
+	 { "SwigPyIterator_decr", _wrap_SwigPyIterator_decr, METH_VARARGS, "SwigPyIterator_decr(SwigPyIterator self, size_t n=1) -> SwigPyIterator"},
+	 { "SwigPyIterator_distance", _wrap_SwigPyIterator_distance, METH_VARARGS, "SwigPyIterator_distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"},
+	 { "SwigPyIterator_equal", _wrap_SwigPyIterator_equal, METH_VARARGS, "SwigPyIterator_equal(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator_copy", _wrap_SwigPyIterator_copy, METH_O, "SwigPyIterator_copy(SwigPyIterator self) -> SwigPyIterator"},
+	 { "SwigPyIterator_next", _wrap_SwigPyIterator_next, METH_O, "SwigPyIterator_next(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator___next__", _wrap_SwigPyIterator___next__, METH_O, "SwigPyIterator___next__(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_previous", _wrap_SwigPyIterator_previous, METH_O, "SwigPyIterator_previous(SwigPyIterator self) -> PyObject *"},
+	 { "SwigPyIterator_advance", _wrap_SwigPyIterator_advance, METH_VARARGS, "SwigPyIterator_advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___eq__", _wrap_SwigPyIterator___eq__, METH_VARARGS, "SwigPyIterator___eq__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator___ne__", _wrap_SwigPyIterator___ne__, METH_VARARGS, "SwigPyIterator___ne__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+	 { "SwigPyIterator___iadd__", _wrap_SwigPyIterator___iadd__, METH_VARARGS, "SwigPyIterator___iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___isub__", _wrap_SwigPyIterator___isub__, METH_VARARGS, "SwigPyIterator___isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, "SwigPyIterator___add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+	 { "SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, "\n"
+		"SwigPyIterator___sub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator\n"
 		"SwigPyIterator___sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t\n"
 		""},
-	 { (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vdouble1d_t_iterator", _wrap_vdouble1d_t_iterator, METH_VARARGS, (char *)"vdouble1d_t_iterator(vdouble1d_t self) -> SwigPyIterator"},
-	 { (char *)"vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_VARARGS, (char *)"vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_VARARGS, (char *)"vdouble1d_t___bool__(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_VARARGS, (char *)"vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, (char *)"vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"},
-	 { (char *)"vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n"
+	 { "SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_O, NULL},
+	 { "vdouble1d_t_iterator", _wrap_vdouble1d_t_iterator, METH_O, "vdouble1d_t_iterator(vdouble1d_t self) -> SwigPyIterator"},
+	 { "vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_O, "vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_O, "vdouble1d_t___bool__(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_O, "vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, "vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"},
+	 { "vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, "\n"
+		"vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n"
 		"vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n"
 		""},
-	 { (char *)"vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, (char *)"vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"},
-	 { (char *)"vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< double >::difference_type i)\n"
+	 { "vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, "vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"},
+	 { "vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___delitem__(vdouble1d_t self, std::vector< double >::difference_type i)\n"
 		"vdouble1d_t___delitem__(vdouble1d_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vdouble1d_t___getitem__", _wrap_vdouble1d_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vdouble1d_t\n"
+	 { "vdouble1d_t___getitem__", _wrap_vdouble1d_t___getitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___getitem__(vdouble1d_t self, PySliceObject * slice) -> vdouble1d_t\n"
 		"vdouble1d_t___getitem__(vdouble1d_t self, std::vector< double >::difference_type i) -> std::vector< double >::value_type const &\n"
 		""},
-	 { (char *)"vdouble1d_t___setitem__", _wrap_vdouble1d_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vdouble1d_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vdouble1d_t___setitem__", _wrap_vdouble1d_t___setitem__, METH_VARARGS, "\n"
+		"vdouble1d_t___setitem__(vdouble1d_t self, PySliceObject * slice, vdouble1d_t v)\n"
+		"vdouble1d_t___setitem__(vdouble1d_t self, PySliceObject * slice)\n"
 		"vdouble1d_t___setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"},
-	 { (char *)"vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, (char *)"vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_VARARGS, (char *)"vdouble1d_t_empty(vdouble1d_t self) -> bool"},
-	 { (char *)"vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_VARARGS, (char *)"vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, (char *)"vdouble1d_t_swap(vdouble1d_t self, vdouble1d_t v)"},
-	 { (char *)"vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_VARARGS, (char *)"vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"},
-	 { (char *)"vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_VARARGS, (char *)"vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"},
-	 { (char *)"vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_VARARGS, (char *)"vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
-	 { (char *)"vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_VARARGS, (char *)"vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
-	 { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"},
-	 { (char *)"vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_VARARGS, (char *)"vdouble1d_t_pop_back(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< double >::iterator pos) -> std::vector< double >::iterator\n"
+	 { "vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_O, "vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"},
+	 { "vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, "vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_O, "vdouble1d_t_empty(vdouble1d_t self) -> bool"},
+	 { "vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_O, "vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, "vdouble1d_t_swap(vdouble1d_t self, vdouble1d_t v)"},
+	 { "vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_O, "vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"},
+	 { "vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_O, "vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"},
+	 { "vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_O, "vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
+	 { "vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_O, "vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"},
+	 { "vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_O, "vdouble1d_t_clear(vdouble1d_t self)"},
+	 { "vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_O, "vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"},
+	 { "vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_O, "vdouble1d_t_pop_back(vdouble1d_t self)"},
+	 { "vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, "\n"
+		"vdouble1d_t_erase(vdouble1d_t self, std::vector< double >::iterator pos) -> std::vector< double >::iterator\n"
 		"vdouble1d_t_erase(vdouble1d_t self, std::vector< double >::iterator first, std::vector< double >::iterator last) -> std::vector< double >::iterator\n"
 		""},
-	 { (char *)"new_vdouble1d_t", _wrap_new_vdouble1d_t, METH_VARARGS, (char *)"\n"
+	 { "new_vdouble1d_t", _wrap_new_vdouble1d_t, METH_VARARGS, "\n"
 		"vdouble1d_t()\n"
-		"vdouble1d_t(vdouble1d_t arg2)\n"
+		"vdouble1d_t(vdouble1d_t other)\n"
 		"vdouble1d_t(std::vector< double >::size_type size)\n"
 		"new_vdouble1d_t(std::vector< double >::size_type size, std::vector< double >::value_type const & value) -> vdouble1d_t\n"
 		""},
-	 { (char *)"vdouble1d_t_push_back", _wrap_vdouble1d_t_push_back, METH_VARARGS, (char *)"vdouble1d_t_push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_front", _wrap_vdouble1d_t_front, METH_VARARGS, (char *)"vdouble1d_t_front(vdouble1d_t self) -> std::vector< double >::value_type const &"},
-	 { (char *)"vdouble1d_t_back", _wrap_vdouble1d_t_back, METH_VARARGS, (char *)"vdouble1d_t_back(vdouble1d_t self) -> std::vector< double >::value_type const &"},
-	 { (char *)"vdouble1d_t_assign", _wrap_vdouble1d_t_assign, METH_VARARGS, (char *)"vdouble1d_t_assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"},
-	 { (char *)"vdouble1d_t_resize", _wrap_vdouble1d_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< double >::size_type new_size)\n"
+	 { "vdouble1d_t_push_back", _wrap_vdouble1d_t_push_back, METH_VARARGS, "vdouble1d_t_push_back(vdouble1d_t self, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_front", _wrap_vdouble1d_t_front, METH_O, "vdouble1d_t_front(vdouble1d_t self) -> std::vector< double >::value_type const &"},
+	 { "vdouble1d_t_back", _wrap_vdouble1d_t_back, METH_O, "vdouble1d_t_back(vdouble1d_t self) -> std::vector< double >::value_type const &"},
+	 { "vdouble1d_t_assign", _wrap_vdouble1d_t_assign, METH_VARARGS, "vdouble1d_t_assign(vdouble1d_t self, std::vector< double >::size_type n, std::vector< double >::value_type const & x)"},
+	 { "vdouble1d_t_resize", _wrap_vdouble1d_t_resize, METH_VARARGS, "\n"
+		"vdouble1d_t_resize(vdouble1d_t self, std::vector< double >::size_type new_size)\n"
 		"vdouble1d_t_resize(vdouble1d_t self, std::vector< double >::size_type new_size, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_insert", _wrap_vdouble1d_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator\n"
+	 { "vdouble1d_t_insert", _wrap_vdouble1d_t_insert, METH_VARARGS, "\n"
+		"vdouble1d_t_insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::value_type const & x) -> std::vector< double >::iterator\n"
 		"vdouble1d_t_insert(vdouble1d_t self, std::vector< double >::iterator pos, std::vector< double >::size_type n, std::vector< double >::value_type const & x)\n"
 		""},
-	 { (char *)"vdouble1d_t_reserve", _wrap_vdouble1d_t_reserve, METH_VARARGS, (char *)"vdouble1d_t_reserve(vdouble1d_t self, std::vector< double >::size_type n)"},
-	 { (char *)"vdouble1d_t_capacity", _wrap_vdouble1d_t_capacity, METH_VARARGS, (char *)"vdouble1d_t_capacity(vdouble1d_t self) -> std::vector< double >::size_type"},
-	 { (char *)"delete_vdouble1d_t", _wrap_delete_vdouble1d_t, METH_VARARGS, (char *)"delete_vdouble1d_t(vdouble1d_t self)"},
-	 { (char *)"vdouble1d_t_swigregister", vdouble1d_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vdouble2d_t_iterator", _wrap_vdouble2d_t_iterator, METH_VARARGS, (char *)"vdouble2d_t_iterator(vdouble2d_t self) -> SwigPyIterator"},
-	 { (char *)"vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_VARARGS, (char *)"vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_VARARGS, (char *)"vdouble2d_t___bool__(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_VARARGS, (char *)"vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, (char *)"vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"},
-	 { (char *)"vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n"
+	 { "vdouble1d_t_reserve", _wrap_vdouble1d_t_reserve, METH_VARARGS, "vdouble1d_t_reserve(vdouble1d_t self, std::vector< double >::size_type n)"},
+	 { "vdouble1d_t_capacity", _wrap_vdouble1d_t_capacity, METH_O, "vdouble1d_t_capacity(vdouble1d_t self) -> std::vector< double >::size_type"},
+	 { "delete_vdouble1d_t", _wrap_delete_vdouble1d_t, METH_O, "delete_vdouble1d_t(vdouble1d_t self)"},
+	 { "vdouble1d_t_swigregister", vdouble1d_t_swigregister, METH_O, NULL},
+	 { "vdouble1d_t_swiginit", vdouble1d_t_swiginit, METH_VARARGS, NULL},
+	 { "vdouble2d_t_iterator", _wrap_vdouble2d_t_iterator, METH_O, "vdouble2d_t_iterator(vdouble2d_t self) -> SwigPyIterator"},
+	 { "vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_O, "vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_O, "vdouble2d_t___bool__(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_O, "vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, "vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"},
+	 { "vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, "\n"
+		"vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n"
 		"vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n"
 		""},
-	 { (char *)"vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, (char *)"vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"},
-	 { (char *)"vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::vector< double > >::difference_type i)\n"
+	 { "vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, "vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"},
+	 { "vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___delitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i)\n"
 		"vdouble2d_t___delitem__(vdouble2d_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vdouble2d_t___getitem__", _wrap_vdouble2d_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vdouble2d_t\n"
+	 { "vdouble2d_t___getitem__", _wrap_vdouble2d_t___getitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___getitem__(vdouble2d_t self, PySliceObject * slice) -> vdouble2d_t\n"
 		"vdouble2d_t___getitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i) -> vdouble1d_t\n"
 		""},
-	 { (char *)"vdouble2d_t___setitem__", _wrap_vdouble2d_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vdouble2d_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vdouble2d_t___setitem__", _wrap_vdouble2d_t___setitem__, METH_VARARGS, "\n"
+		"vdouble2d_t___setitem__(vdouble2d_t self, PySliceObject * slice, vdouble2d_t v)\n"
+		"vdouble2d_t___setitem__(vdouble2d_t self, PySliceObject * slice)\n"
 		"vdouble2d_t___setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, (char *)"vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_VARARGS, (char *)"vdouble2d_t_empty(vdouble2d_t self) -> bool"},
-	 { (char *)"vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_VARARGS, (char *)"vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, (char *)"vdouble2d_t_swap(vdouble2d_t self, vdouble2d_t v)"},
-	 { (char *)"vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_VARARGS, (char *)"vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
-	 { (char *)"vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_VARARGS, (char *)"vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
-	 { (char *)"vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_VARARGS, (char *)"vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
-	 { (char *)"vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_VARARGS, (char *)"vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
-	 { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"},
-	 { (char *)"vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_VARARGS, (char *)"vdouble2d_t_pop_back(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n"
+	 { "vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_O, "vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, "vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"},
+	 { "vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_O, "vdouble2d_t_empty(vdouble2d_t self) -> bool"},
+	 { "vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_O, "vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, "vdouble2d_t_swap(vdouble2d_t self, vdouble2d_t v)"},
+	 { "vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_O, "vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
+	 { "vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_O, "vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"},
+	 { "vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_O, "vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
+	 { "vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_O, "vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"},
+	 { "vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_O, "vdouble2d_t_clear(vdouble2d_t self)"},
+	 { "vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_O, "vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"},
+	 { "vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_O, "vdouble2d_t_pop_back(vdouble2d_t self)"},
+	 { "vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, "\n"
+		"vdouble2d_t_erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n"
 		"vdouble2d_t_erase(vdouble2d_t self, std::vector< std::vector< double > >::iterator first, std::vector< std::vector< double > >::iterator last) -> std::vector< std::vector< double > >::iterator\n"
 		""},
-	 { (char *)"new_vdouble2d_t", _wrap_new_vdouble2d_t, METH_VARARGS, (char *)"\n"
+	 { "new_vdouble2d_t", _wrap_new_vdouble2d_t, METH_VARARGS, "\n"
 		"vdouble2d_t()\n"
-		"vdouble2d_t(vdouble2d_t arg2)\n"
+		"vdouble2d_t(vdouble2d_t other)\n"
 		"vdouble2d_t(std::vector< std::vector< double > >::size_type size)\n"
 		"new_vdouble2d_t(std::vector< std::vector< double > >::size_type size, vdouble1d_t value) -> vdouble2d_t\n"
 		""},
-	 { (char *)"vdouble2d_t_push_back", _wrap_vdouble2d_t_push_back, METH_VARARGS, (char *)"vdouble2d_t_push_back(vdouble2d_t self, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_front", _wrap_vdouble2d_t_front, METH_VARARGS, (char *)"vdouble2d_t_front(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_back", _wrap_vdouble2d_t_back, METH_VARARGS, (char *)"vdouble2d_t_back(vdouble2d_t self) -> vdouble1d_t"},
-	 { (char *)"vdouble2d_t_assign", _wrap_vdouble2d_t_assign, METH_VARARGS, (char *)"vdouble2d_t_assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"},
-	 { (char *)"vdouble2d_t_resize", _wrap_vdouble2d_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::vector< double > >::size_type new_size)\n"
+	 { "vdouble2d_t_push_back", _wrap_vdouble2d_t_push_back, METH_VARARGS, "vdouble2d_t_push_back(vdouble2d_t self, vdouble1d_t x)"},
+	 { "vdouble2d_t_front", _wrap_vdouble2d_t_front, METH_O, "vdouble2d_t_front(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_back", _wrap_vdouble2d_t_back, METH_O, "vdouble2d_t_back(vdouble2d_t self) -> vdouble1d_t"},
+	 { "vdouble2d_t_assign", _wrap_vdouble2d_t_assign, METH_VARARGS, "vdouble2d_t_assign(vdouble2d_t self, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)"},
+	 { "vdouble2d_t_resize", _wrap_vdouble2d_t_resize, METH_VARARGS, "\n"
+		"vdouble2d_t_resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size)\n"
 		"vdouble2d_t_resize(vdouble2d_t self, std::vector< std::vector< double > >::size_type new_size, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_insert", _wrap_vdouble2d_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator\n"
+	 { "vdouble2d_t_insert", _wrap_vdouble2d_t_insert, METH_VARARGS, "\n"
+		"vdouble2d_t_insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, vdouble1d_t x) -> std::vector< std::vector< double > >::iterator\n"
 		"vdouble2d_t_insert(vdouble2d_t self, std::vector< std::vector< double > >::iterator pos, std::vector< std::vector< double > >::size_type n, vdouble1d_t x)\n"
 		""},
-	 { (char *)"vdouble2d_t_reserve", _wrap_vdouble2d_t_reserve, METH_VARARGS, (char *)"vdouble2d_t_reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"},
-	 { (char *)"vdouble2d_t_capacity", _wrap_vdouble2d_t_capacity, METH_VARARGS, (char *)"vdouble2d_t_capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
-	 { (char *)"delete_vdouble2d_t", _wrap_delete_vdouble2d_t, METH_VARARGS, (char *)"delete_vdouble2d_t(vdouble2d_t self)"},
-	 { (char *)"vdouble2d_t_swigregister", vdouble2d_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_integer_t_iterator", _wrap_vector_integer_t_iterator, METH_VARARGS, (char *)"vector_integer_t_iterator(vector_integer_t self) -> SwigPyIterator"},
-	 { (char *)"vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_VARARGS, (char *)"vector_integer_t___nonzero__(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_VARARGS, (char *)"vector_integer_t___bool__(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_VARARGS, (char *)"vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, (char *)"vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"},
-	 { (char *)"vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n"
+	 { "vdouble2d_t_reserve", _wrap_vdouble2d_t_reserve, METH_VARARGS, "vdouble2d_t_reserve(vdouble2d_t self, std::vector< std::vector< double > >::size_type n)"},
+	 { "vdouble2d_t_capacity", _wrap_vdouble2d_t_capacity, METH_O, "vdouble2d_t_capacity(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"},
+	 { "delete_vdouble2d_t", _wrap_delete_vdouble2d_t, METH_O, "delete_vdouble2d_t(vdouble2d_t self)"},
+	 { "vdouble2d_t_swigregister", vdouble2d_t_swigregister, METH_O, NULL},
+	 { "vdouble2d_t_swiginit", vdouble2d_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_integer_t_iterator", _wrap_vector_integer_t_iterator, METH_O, "vector_integer_t_iterator(vector_integer_t self) -> SwigPyIterator"},
+	 { "vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_O, "vector_integer_t___nonzero__(vector_integer_t self) -> bool"},
+	 { "vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_O, "vector_integer_t___bool__(vector_integer_t self) -> bool"},
+	 { "vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_O, "vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, "vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"},
+	 { "vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, "\n"
+		"vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n"
 		"vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n"
 		""},
-	 { (char *)"vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, (char *)"vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"},
-	 { (char *)"vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< int >::difference_type i)\n"
+	 { "vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, "vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"},
+	 { "vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, "\n"
+		"vector_integer_t___delitem__(vector_integer_t self, std::vector< int >::difference_type i)\n"
 		"vector_integer_t___delitem__(vector_integer_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_integer_t___getitem__", _wrap_vector_integer_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_integer_t\n"
+	 { "vector_integer_t___getitem__", _wrap_vector_integer_t___getitem__, METH_VARARGS, "\n"
+		"vector_integer_t___getitem__(vector_integer_t self, PySliceObject * slice) -> vector_integer_t\n"
 		"vector_integer_t___getitem__(vector_integer_t self, std::vector< int >::difference_type i) -> std::vector< int >::value_type const &\n"
 		""},
-	 { (char *)"vector_integer_t___setitem__", _wrap_vector_integer_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_integer_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_integer_t___setitem__", _wrap_vector_integer_t___setitem__, METH_VARARGS, "\n"
+		"vector_integer_t___setitem__(vector_integer_t self, PySliceObject * slice, vector_integer_t v)\n"
+		"vector_integer_t___setitem__(vector_integer_t self, PySliceObject * slice)\n"
 		"vector_integer_t___setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"},
-	 { (char *)"vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, (char *)"vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_VARARGS, (char *)"vector_integer_t_empty(vector_integer_t self) -> bool"},
-	 { (char *)"vector_integer_t_size", _wrap_vector_integer_t_size, METH_VARARGS, (char *)"vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, (char *)"vector_integer_t_swap(vector_integer_t self, vector_integer_t v)"},
-	 { (char *)"vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_VARARGS, (char *)"vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"},
-	 { (char *)"vector_integer_t_end", _wrap_vector_integer_t_end, METH_VARARGS, (char *)"vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"},
-	 { (char *)"vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_VARARGS, (char *)"vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
-	 { (char *)"vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_VARARGS, (char *)"vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
-	 { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"},
-	 { (char *)"vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_VARARGS, (char *)"vector_integer_t_pop_back(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< int >::iterator pos) -> std::vector< int >::iterator\n"
+	 { "vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_O, "vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"},
+	 { "vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, "vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_O, "vector_integer_t_empty(vector_integer_t self) -> bool"},
+	 { "vector_integer_t_size", _wrap_vector_integer_t_size, METH_O, "vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, "vector_integer_t_swap(vector_integer_t self, vector_integer_t v)"},
+	 { "vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_O, "vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"},
+	 { "vector_integer_t_end", _wrap_vector_integer_t_end, METH_O, "vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"},
+	 { "vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_O, "vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
+	 { "vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_O, "vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"},
+	 { "vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_O, "vector_integer_t_clear(vector_integer_t self)"},
+	 { "vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_O, "vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"},
+	 { "vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_O, "vector_integer_t_pop_back(vector_integer_t self)"},
+	 { "vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, "\n"
+		"vector_integer_t_erase(vector_integer_t self, std::vector< int >::iterator pos) -> std::vector< int >::iterator\n"
 		"vector_integer_t_erase(vector_integer_t self, std::vector< int >::iterator first, std::vector< int >::iterator last) -> std::vector< int >::iterator\n"
 		""},
-	 { (char *)"new_vector_integer_t", _wrap_new_vector_integer_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_integer_t", _wrap_new_vector_integer_t, METH_VARARGS, "\n"
 		"vector_integer_t()\n"
-		"vector_integer_t(vector_integer_t arg2)\n"
+		"vector_integer_t(vector_integer_t other)\n"
 		"vector_integer_t(std::vector< int >::size_type size)\n"
 		"new_vector_integer_t(std::vector< int >::size_type size, std::vector< int >::value_type const & value) -> vector_integer_t\n"
 		""},
-	 { (char *)"vector_integer_t_push_back", _wrap_vector_integer_t_push_back, METH_VARARGS, (char *)"vector_integer_t_push_back(vector_integer_t self, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_front", _wrap_vector_integer_t_front, METH_VARARGS, (char *)"vector_integer_t_front(vector_integer_t self) -> std::vector< int >::value_type const &"},
-	 { (char *)"vector_integer_t_back", _wrap_vector_integer_t_back, METH_VARARGS, (char *)"vector_integer_t_back(vector_integer_t self) -> std::vector< int >::value_type const &"},
-	 { (char *)"vector_integer_t_assign", _wrap_vector_integer_t_assign, METH_VARARGS, (char *)"vector_integer_t_assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"},
-	 { (char *)"vector_integer_t_resize", _wrap_vector_integer_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< int >::size_type new_size)\n"
+	 { "vector_integer_t_push_back", _wrap_vector_integer_t_push_back, METH_VARARGS, "vector_integer_t_push_back(vector_integer_t self, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_front", _wrap_vector_integer_t_front, METH_O, "vector_integer_t_front(vector_integer_t self) -> std::vector< int >::value_type const &"},
+	 { "vector_integer_t_back", _wrap_vector_integer_t_back, METH_O, "vector_integer_t_back(vector_integer_t self) -> std::vector< int >::value_type const &"},
+	 { "vector_integer_t_assign", _wrap_vector_integer_t_assign, METH_VARARGS, "vector_integer_t_assign(vector_integer_t self, std::vector< int >::size_type n, std::vector< int >::value_type const & x)"},
+	 { "vector_integer_t_resize", _wrap_vector_integer_t_resize, METH_VARARGS, "\n"
+		"vector_integer_t_resize(vector_integer_t self, std::vector< int >::size_type new_size)\n"
 		"vector_integer_t_resize(vector_integer_t self, std::vector< int >::size_type new_size, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_insert", _wrap_vector_integer_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator\n"
+	 { "vector_integer_t_insert", _wrap_vector_integer_t_insert, METH_VARARGS, "\n"
+		"vector_integer_t_insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::value_type const & x) -> std::vector< int >::iterator\n"
 		"vector_integer_t_insert(vector_integer_t self, std::vector< int >::iterator pos, std::vector< int >::size_type n, std::vector< int >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_integer_t_reserve", _wrap_vector_integer_t_reserve, METH_VARARGS, (char *)"vector_integer_t_reserve(vector_integer_t self, std::vector< int >::size_type n)"},
-	 { (char *)"vector_integer_t_capacity", _wrap_vector_integer_t_capacity, METH_VARARGS, (char *)"vector_integer_t_capacity(vector_integer_t self) -> std::vector< int >::size_type"},
-	 { (char *)"delete_vector_integer_t", _wrap_delete_vector_integer_t, METH_VARARGS, (char *)"delete_vector_integer_t(vector_integer_t self)"},
-	 { (char *)"vector_integer_t_swigregister", vector_integer_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_longinteger_t_iterator", _wrap_vector_longinteger_t_iterator, METH_VARARGS, (char *)"vector_longinteger_t_iterator(vector_longinteger_t self) -> SwigPyIterator"},
-	 { (char *)"vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_VARARGS, (char *)"vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_VARARGS, (char *)"vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_VARARGS, (char *)"vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, (char *)"vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"},
-	 { (char *)"vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n"
+	 { "vector_integer_t_reserve", _wrap_vector_integer_t_reserve, METH_VARARGS, "vector_integer_t_reserve(vector_integer_t self, std::vector< int >::size_type n)"},
+	 { "vector_integer_t_capacity", _wrap_vector_integer_t_capacity, METH_O, "vector_integer_t_capacity(vector_integer_t self) -> std::vector< int >::size_type"},
+	 { "delete_vector_integer_t", _wrap_delete_vector_integer_t, METH_O, "delete_vector_integer_t(vector_integer_t self)"},
+	 { "vector_integer_t_swigregister", vector_integer_t_swigregister, METH_O, NULL},
+	 { "vector_integer_t_swiginit", vector_integer_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_longinteger_t_iterator", _wrap_vector_longinteger_t_iterator, METH_O, "vector_longinteger_t_iterator(vector_longinteger_t self) -> SwigPyIterator"},
+	 { "vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_O, "vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_O, "vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_O, "vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, "vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"},
+	 { "vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, "\n"
+		"vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n"
 		"vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n"
 		""},
-	 { (char *)"vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, (char *)"vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"},
-	 { (char *)"vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< unsigned long >::difference_type i)\n"
+	 { "vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, "vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"},
+	 { "vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___delitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i)\n"
 		"vector_longinteger_t___delitem__(vector_longinteger_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_longinteger_t___getitem__", _wrap_vector_longinteger_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_longinteger_t\n"
+	 { "vector_longinteger_t___getitem__", _wrap_vector_longinteger_t___getitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___getitem__(vector_longinteger_t self, PySliceObject * slice) -> vector_longinteger_t\n"
 		"vector_longinteger_t___getitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i) -> std::vector< unsigned long >::value_type const &\n"
 		""},
-	 { (char *)"vector_longinteger_t___setitem__", _wrap_vector_longinteger_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_longinteger_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_longinteger_t___setitem__", _wrap_vector_longinteger_t___setitem__, METH_VARARGS, "\n"
+		"vector_longinteger_t___setitem__(vector_longinteger_t self, PySliceObject * slice, vector_longinteger_t v)\n"
+		"vector_longinteger_t___setitem__(vector_longinteger_t self, PySliceObject * slice)\n"
 		"vector_longinteger_t___setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"},
-	 { (char *)"vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, (char *)"vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_VARARGS, (char *)"vector_longinteger_t_empty(vector_longinteger_t self) -> bool"},
-	 { (char *)"vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_VARARGS, (char *)"vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, (char *)"vector_longinteger_t_swap(vector_longinteger_t self, vector_longinteger_t v)"},
-	 { (char *)"vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_VARARGS, (char *)"vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
-	 { (char *)"vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_VARARGS, (char *)"vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
-	 { (char *)"vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_VARARGS, (char *)"vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
-	 { (char *)"vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_VARARGS, (char *)"vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
-	 { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"},
-	 { (char *)"vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_VARARGS, (char *)"vector_longinteger_t_pop_back(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n"
+	 { "vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_O, "vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"},
+	 { "vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, "vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_O, "vector_longinteger_t_empty(vector_longinteger_t self) -> bool"},
+	 { "vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_O, "vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, "vector_longinteger_t_swap(vector_longinteger_t self, vector_longinteger_t v)"},
+	 { "vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_O, "vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
+	 { "vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_O, "vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"},
+	 { "vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_O, "vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
+	 { "vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_O, "vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"},
+	 { "vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_O, "vector_longinteger_t_clear(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_O, "vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"},
+	 { "vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_O, "vector_longinteger_t_pop_back(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, "\n"
+		"vector_longinteger_t_erase(vector_longinteger_t self, std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n"
 		"vector_longinteger_t_erase(vector_longinteger_t self, std::vector< unsigned long >::iterator first, std::vector< unsigned long >::iterator last) -> std::vector< unsigned long >::iterator\n"
 		""},
-	 { (char *)"new_vector_longinteger_t", _wrap_new_vector_longinteger_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_longinteger_t", _wrap_new_vector_longinteger_t, METH_VARARGS, "\n"
 		"vector_longinteger_t()\n"
-		"vector_longinteger_t(vector_longinteger_t arg2)\n"
+		"vector_longinteger_t(vector_longinteger_t other)\n"
 		"vector_longinteger_t(std::vector< unsigned long >::size_type size)\n"
 		"new_vector_longinteger_t(std::vector< unsigned long >::size_type size, std::vector< unsigned long >::value_type const & value) -> vector_longinteger_t\n"
 		""},
-	 { (char *)"vector_longinteger_t_push_back", _wrap_vector_longinteger_t_push_back, METH_VARARGS, (char *)"vector_longinteger_t_push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_front", _wrap_vector_longinteger_t_front, METH_VARARGS, (char *)"vector_longinteger_t_front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
-	 { (char *)"vector_longinteger_t_back", _wrap_vector_longinteger_t_back, METH_VARARGS, (char *)"vector_longinteger_t_back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
-	 { (char *)"vector_longinteger_t_assign", _wrap_vector_longinteger_t_assign, METH_VARARGS, (char *)"vector_longinteger_t_assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"},
-	 { (char *)"vector_longinteger_t_resize", _wrap_vector_longinteger_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< unsigned long >::size_type new_size)\n"
+	 { "vector_longinteger_t_push_back", _wrap_vector_longinteger_t_push_back, METH_VARARGS, "vector_longinteger_t_push_back(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_front", _wrap_vector_longinteger_t_front, METH_O, "vector_longinteger_t_front(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
+	 { "vector_longinteger_t_back", _wrap_vector_longinteger_t_back, METH_O, "vector_longinteger_t_back(vector_longinteger_t self) -> std::vector< unsigned long >::value_type const &"},
+	 { "vector_longinteger_t_assign", _wrap_vector_longinteger_t_assign, METH_VARARGS, "vector_longinteger_t_assign(vector_longinteger_t self, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)"},
+	 { "vector_longinteger_t_resize", _wrap_vector_longinteger_t_resize, METH_VARARGS, "\n"
+		"vector_longinteger_t_resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size)\n"
 		"vector_longinteger_t_resize(vector_longinteger_t self, std::vector< unsigned long >::size_type new_size, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_insert", _wrap_vector_longinteger_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator\n"
+	 { "vector_longinteger_t_insert", _wrap_vector_longinteger_t_insert, METH_VARARGS, "\n"
+		"vector_longinteger_t_insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::value_type const & x) -> std::vector< unsigned long >::iterator\n"
 		"vector_longinteger_t_insert(vector_longinteger_t self, std::vector< unsigned long >::iterator pos, std::vector< unsigned long >::size_type n, std::vector< unsigned long >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_longinteger_t_reserve", _wrap_vector_longinteger_t_reserve, METH_VARARGS, (char *)"vector_longinteger_t_reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"},
-	 { (char *)"vector_longinteger_t_capacity", _wrap_vector_longinteger_t_capacity, METH_VARARGS, (char *)"vector_longinteger_t_capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
-	 { (char *)"delete_vector_longinteger_t", _wrap_delete_vector_longinteger_t, METH_VARARGS, (char *)"delete_vector_longinteger_t(vector_longinteger_t self)"},
-	 { (char *)"vector_longinteger_t_swigregister", vector_longinteger_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_complex_t_iterator", _wrap_vector_complex_t_iterator, METH_VARARGS, (char *)"vector_complex_t_iterator(vector_complex_t self) -> SwigPyIterator"},
-	 { (char *)"vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_VARARGS, (char *)"vector_complex_t___nonzero__(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_VARARGS, (char *)"vector_complex_t___bool__(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_VARARGS, (char *)"vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, (char *)"vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"},
-	 { (char *)"vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n"
+	 { "vector_longinteger_t_reserve", _wrap_vector_longinteger_t_reserve, METH_VARARGS, "vector_longinteger_t_reserve(vector_longinteger_t self, std::vector< unsigned long >::size_type n)"},
+	 { "vector_longinteger_t_capacity", _wrap_vector_longinteger_t_capacity, METH_O, "vector_longinteger_t_capacity(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"},
+	 { "delete_vector_longinteger_t", _wrap_delete_vector_longinteger_t, METH_O, "delete_vector_longinteger_t(vector_longinteger_t self)"},
+	 { "vector_longinteger_t_swigregister", vector_longinteger_t_swigregister, METH_O, NULL},
+	 { "vector_longinteger_t_swiginit", vector_longinteger_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_complex_t_iterator", _wrap_vector_complex_t_iterator, METH_O, "vector_complex_t_iterator(vector_complex_t self) -> SwigPyIterator"},
+	 { "vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_O, "vector_complex_t___nonzero__(vector_complex_t self) -> bool"},
+	 { "vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_O, "vector_complex_t___bool__(vector_complex_t self) -> bool"},
+	 { "vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_O, "vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, "vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"},
+	 { "vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, "\n"
+		"vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n"
 		"vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n"
 		""},
-	 { (char *)"vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, (char *)"vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"},
-	 { (char *)"vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::complex< double > >::difference_type i)\n"
+	 { "vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, "vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"},
+	 { "vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, "\n"
+		"vector_complex_t___delitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i)\n"
 		"vector_complex_t___delitem__(vector_complex_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_complex_t___getitem__", _wrap_vector_complex_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_complex_t\n"
+	 { "vector_complex_t___getitem__", _wrap_vector_complex_t___getitem__, METH_VARARGS, "\n"
+		"vector_complex_t___getitem__(vector_complex_t self, PySliceObject * slice) -> vector_complex_t\n"
 		"vector_complex_t___getitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i) -> std::vector< std::complex< double > >::value_type const &\n"
 		""},
-	 { (char *)"vector_complex_t___setitem__", _wrap_vector_complex_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_complex_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_complex_t___setitem__", _wrap_vector_complex_t___setitem__, METH_VARARGS, "\n"
+		"vector_complex_t___setitem__(vector_complex_t self, PySliceObject * slice, vector_complex_t v)\n"
+		"vector_complex_t___setitem__(vector_complex_t self, PySliceObject * slice)\n"
 		"vector_complex_t___setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"},
-	 { (char *)"vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, (char *)"vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_VARARGS, (char *)"vector_complex_t_empty(vector_complex_t self) -> bool"},
-	 { (char *)"vector_complex_t_size", _wrap_vector_complex_t_size, METH_VARARGS, (char *)"vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, (char *)"vector_complex_t_swap(vector_complex_t self, vector_complex_t v)"},
-	 { (char *)"vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_VARARGS, (char *)"vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
-	 { (char *)"vector_complex_t_end", _wrap_vector_complex_t_end, METH_VARARGS, (char *)"vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
-	 { (char *)"vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_VARARGS, (char *)"vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
-	 { (char *)"vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_VARARGS, (char *)"vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
-	 { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"},
-	 { (char *)"vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_VARARGS, (char *)"vector_complex_t_pop_back(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n"
+	 { "vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_O, "vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"},
+	 { "vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, "vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_O, "vector_complex_t_empty(vector_complex_t self) -> bool"},
+	 { "vector_complex_t_size", _wrap_vector_complex_t_size, METH_O, "vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, "vector_complex_t_swap(vector_complex_t self, vector_complex_t v)"},
+	 { "vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_O, "vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
+	 { "vector_complex_t_end", _wrap_vector_complex_t_end, METH_O, "vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"},
+	 { "vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_O, "vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
+	 { "vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_O, "vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"},
+	 { "vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_O, "vector_complex_t_clear(vector_complex_t self)"},
+	 { "vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_O, "vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"},
+	 { "vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_O, "vector_complex_t_pop_back(vector_complex_t self)"},
+	 { "vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, "\n"
+		"vector_complex_t_erase(vector_complex_t self, std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n"
 		"vector_complex_t_erase(vector_complex_t self, std::vector< std::complex< double > >::iterator first, std::vector< std::complex< double > >::iterator last) -> std::vector< std::complex< double > >::iterator\n"
 		""},
-	 { (char *)"new_vector_complex_t", _wrap_new_vector_complex_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_complex_t", _wrap_new_vector_complex_t, METH_VARARGS, "\n"
 		"vector_complex_t()\n"
-		"vector_complex_t(vector_complex_t arg2)\n"
+		"vector_complex_t(vector_complex_t other)\n"
 		"vector_complex_t(std::vector< std::complex< double > >::size_type size)\n"
 		"new_vector_complex_t(std::vector< std::complex< double > >::size_type size, std::vector< std::complex< double > >::value_type const & value) -> vector_complex_t\n"
 		""},
-	 { (char *)"vector_complex_t_push_back", _wrap_vector_complex_t_push_back, METH_VARARGS, (char *)"vector_complex_t_push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_front", _wrap_vector_complex_t_front, METH_VARARGS, (char *)"vector_complex_t_front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
-	 { (char *)"vector_complex_t_back", _wrap_vector_complex_t_back, METH_VARARGS, (char *)"vector_complex_t_back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
-	 { (char *)"vector_complex_t_assign", _wrap_vector_complex_t_assign, METH_VARARGS, (char *)"vector_complex_t_assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"},
-	 { (char *)"vector_complex_t_resize", _wrap_vector_complex_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::complex< double > >::size_type new_size)\n"
+	 { "vector_complex_t_push_back", _wrap_vector_complex_t_push_back, METH_VARARGS, "vector_complex_t_push_back(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_front", _wrap_vector_complex_t_front, METH_O, "vector_complex_t_front(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
+	 { "vector_complex_t_back", _wrap_vector_complex_t_back, METH_O, "vector_complex_t_back(vector_complex_t self) -> std::vector< std::complex< double > >::value_type const &"},
+	 { "vector_complex_t_assign", _wrap_vector_complex_t_assign, METH_VARARGS, "vector_complex_t_assign(vector_complex_t self, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)"},
+	 { "vector_complex_t_resize", _wrap_vector_complex_t_resize, METH_VARARGS, "\n"
+		"vector_complex_t_resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size)\n"
 		"vector_complex_t_resize(vector_complex_t self, std::vector< std::complex< double > >::size_type new_size, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_insert", _wrap_vector_complex_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator\n"
+	 { "vector_complex_t_insert", _wrap_vector_complex_t_insert, METH_VARARGS, "\n"
+		"vector_complex_t_insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::value_type const & x) -> std::vector< std::complex< double > >::iterator\n"
 		"vector_complex_t_insert(vector_complex_t self, std::vector< std::complex< double > >::iterator pos, std::vector< std::complex< double > >::size_type n, std::vector< std::complex< double > >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_complex_t_reserve", _wrap_vector_complex_t_reserve, METH_VARARGS, (char *)"vector_complex_t_reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"},
-	 { (char *)"vector_complex_t_capacity", _wrap_vector_complex_t_capacity, METH_VARARGS, (char *)"vector_complex_t_capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
-	 { (char *)"delete_vector_complex_t", _wrap_delete_vector_complex_t, METH_VARARGS, (char *)"delete_vector_complex_t(vector_complex_t self)"},
-	 { (char *)"vector_complex_t_swigregister", vector_complex_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"vector_string_t_iterator", _wrap_vector_string_t_iterator, METH_VARARGS, (char *)"vector_string_t_iterator(vector_string_t self) -> SwigPyIterator"},
-	 { (char *)"vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_VARARGS, (char *)"vector_string_t___nonzero__(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_VARARGS, (char *)"vector_string_t___bool__(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t___len__", _wrap_vector_string_t___len__, METH_VARARGS, (char *)"vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, (char *)"vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"},
-	 { (char *)"vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, (char *)"\n"
-		"__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n"
+	 { "vector_complex_t_reserve", _wrap_vector_complex_t_reserve, METH_VARARGS, "vector_complex_t_reserve(vector_complex_t self, std::vector< std::complex< double > >::size_type n)"},
+	 { "vector_complex_t_capacity", _wrap_vector_complex_t_capacity, METH_O, "vector_complex_t_capacity(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"},
+	 { "delete_vector_complex_t", _wrap_delete_vector_complex_t, METH_O, "delete_vector_complex_t(vector_complex_t self)"},
+	 { "vector_complex_t_swigregister", vector_complex_t_swigregister, METH_O, NULL},
+	 { "vector_complex_t_swiginit", vector_complex_t_swiginit, METH_VARARGS, NULL},
+	 { "vector_string_t_iterator", _wrap_vector_string_t_iterator, METH_O, "vector_string_t_iterator(vector_string_t self) -> SwigPyIterator"},
+	 { "vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_O, "vector_string_t___nonzero__(vector_string_t self) -> bool"},
+	 { "vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_O, "vector_string_t___bool__(vector_string_t self) -> bool"},
+	 { "vector_string_t___len__", _wrap_vector_string_t___len__, METH_O, "vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, "vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"},
+	 { "vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, "\n"
+		"vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n"
 		"vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n"
 		""},
-	 { (char *)"vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, (char *)"vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"},
-	 { (char *)"vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, (char *)"\n"
-		"__delitem__(std::vector< std::string >::difference_type i)\n"
+	 { "vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, "vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"},
+	 { "vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, "\n"
+		"vector_string_t___delitem__(vector_string_t self, std::vector< std::string >::difference_type i)\n"
 		"vector_string_t___delitem__(vector_string_t self, PySliceObject * slice)\n"
 		""},
-	 { (char *)"vector_string_t___getitem__", _wrap_vector_string_t___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(PySliceObject * slice) -> vector_string_t\n"
+	 { "vector_string_t___getitem__", _wrap_vector_string_t___getitem__, METH_VARARGS, "\n"
+		"vector_string_t___getitem__(vector_string_t self, PySliceObject * slice) -> vector_string_t\n"
 		"vector_string_t___getitem__(vector_string_t self, std::vector< std::string >::difference_type i) -> std::vector< std::string >::value_type const &\n"
 		""},
-	 { (char *)"vector_string_t___setitem__", _wrap_vector_string_t___setitem__, METH_VARARGS, (char *)"\n"
-		"__setitem__(PySliceObject * slice, vector_string_t v)\n"
-		"__setitem__(PySliceObject * slice)\n"
+	 { "vector_string_t___setitem__", _wrap_vector_string_t___setitem__, METH_VARARGS, "\n"
+		"vector_string_t___setitem__(vector_string_t self, PySliceObject * slice, vector_string_t v)\n"
+		"vector_string_t___setitem__(vector_string_t self, PySliceObject * slice)\n"
 		"vector_string_t___setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"},
-	 { (char *)"vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, (char *)"vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_empty", _wrap_vector_string_t_empty, METH_VARARGS, (char *)"vector_string_t_empty(vector_string_t self) -> bool"},
-	 { (char *)"vector_string_t_size", _wrap_vector_string_t_size, METH_VARARGS, (char *)"vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, (char *)"vector_string_t_swap(vector_string_t self, vector_string_t v)"},
-	 { (char *)"vector_string_t_begin", _wrap_vector_string_t_begin, METH_VARARGS, (char *)"vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"},
-	 { (char *)"vector_string_t_end", _wrap_vector_string_t_end, METH_VARARGS, (char *)"vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"},
-	 { (char *)"vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_VARARGS, (char *)"vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
-	 { (char *)"vector_string_t_rend", _wrap_vector_string_t_rend, METH_VARARGS, (char *)"vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
-	 { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"},
-	 { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"},
-	 { (char *)"vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_VARARGS, (char *)"vector_string_t_pop_back(vector_string_t self)"},
-	 { (char *)"vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, (char *)"\n"
-		"erase(std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n"
+	 { "vector_string_t_pop", _wrap_vector_string_t_pop, METH_O, "vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"},
+	 { "vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, "vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_empty", _wrap_vector_string_t_empty, METH_O, "vector_string_t_empty(vector_string_t self) -> bool"},
+	 { "vector_string_t_size", _wrap_vector_string_t_size, METH_O, "vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, "vector_string_t_swap(vector_string_t self, vector_string_t v)"},
+	 { "vector_string_t_begin", _wrap_vector_string_t_begin, METH_O, "vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"},
+	 { "vector_string_t_end", _wrap_vector_string_t_end, METH_O, "vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"},
+	 { "vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_O, "vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
+	 { "vector_string_t_rend", _wrap_vector_string_t_rend, METH_O, "vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"},
+	 { "vector_string_t_clear", _wrap_vector_string_t_clear, METH_O, "vector_string_t_clear(vector_string_t self)"},
+	 { "vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_O, "vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"},
+	 { "vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_O, "vector_string_t_pop_back(vector_string_t self)"},
+	 { "vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, "\n"
+		"vector_string_t_erase(vector_string_t self, std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n"
 		"vector_string_t_erase(vector_string_t self, std::vector< std::string >::iterator first, std::vector< std::string >::iterator last) -> std::vector< std::string >::iterator\n"
 		""},
-	 { (char *)"new_vector_string_t", _wrap_new_vector_string_t, METH_VARARGS, (char *)"\n"
+	 { "new_vector_string_t", _wrap_new_vector_string_t, METH_VARARGS, "\n"
 		"vector_string_t()\n"
-		"vector_string_t(vector_string_t arg2)\n"
+		"vector_string_t(vector_string_t other)\n"
 		"vector_string_t(std::vector< std::string >::size_type size)\n"
 		"new_vector_string_t(std::vector< std::string >::size_type size, std::vector< std::string >::value_type const & value) -> vector_string_t\n"
 		""},
-	 { (char *)"vector_string_t_push_back", _wrap_vector_string_t_push_back, METH_VARARGS, (char *)"vector_string_t_push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_front", _wrap_vector_string_t_front, METH_VARARGS, (char *)"vector_string_t_front(vector_string_t self) -> std::vector< std::string >::value_type const &"},
-	 { (char *)"vector_string_t_back", _wrap_vector_string_t_back, METH_VARARGS, (char *)"vector_string_t_back(vector_string_t self) -> std::vector< std::string >::value_type const &"},
-	 { (char *)"vector_string_t_assign", _wrap_vector_string_t_assign, METH_VARARGS, (char *)"vector_string_t_assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"},
-	 { (char *)"vector_string_t_resize", _wrap_vector_string_t_resize, METH_VARARGS, (char *)"\n"
-		"resize(std::vector< std::string >::size_type new_size)\n"
+	 { "vector_string_t_push_back", _wrap_vector_string_t_push_back, METH_VARARGS, "vector_string_t_push_back(vector_string_t self, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_front", _wrap_vector_string_t_front, METH_O, "vector_string_t_front(vector_string_t self) -> std::vector< std::string >::value_type const &"},
+	 { "vector_string_t_back", _wrap_vector_string_t_back, METH_O, "vector_string_t_back(vector_string_t self) -> std::vector< std::string >::value_type const &"},
+	 { "vector_string_t_assign", _wrap_vector_string_t_assign, METH_VARARGS, "vector_string_t_assign(vector_string_t self, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)"},
+	 { "vector_string_t_resize", _wrap_vector_string_t_resize, METH_VARARGS, "\n"
+		"vector_string_t_resize(vector_string_t self, std::vector< std::string >::size_type new_size)\n"
 		"vector_string_t_resize(vector_string_t self, std::vector< std::string >::size_type new_size, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_insert", _wrap_vector_string_t_insert, METH_VARARGS, (char *)"\n"
-		"insert(std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator\n"
+	 { "vector_string_t_insert", _wrap_vector_string_t_insert, METH_VARARGS, "\n"
+		"vector_string_t_insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::value_type const & x) -> std::vector< std::string >::iterator\n"
 		"vector_string_t_insert(vector_string_t self, std::vector< std::string >::iterator pos, std::vector< std::string >::size_type n, std::vector< std::string >::value_type const & x)\n"
 		""},
-	 { (char *)"vector_string_t_reserve", _wrap_vector_string_t_reserve, METH_VARARGS, (char *)"vector_string_t_reserve(vector_string_t self, std::vector< std::string >::size_type n)"},
-	 { (char *)"vector_string_t_capacity", _wrap_vector_string_t_capacity, METH_VARARGS, (char *)"vector_string_t_capacity(vector_string_t self) -> std::vector< std::string >::size_type"},
-	 { (char *)"delete_vector_string_t", _wrap_delete_vector_string_t, METH_VARARGS, (char *)"delete_vector_string_t(vector_string_t self)"},
-	 { (char *)"vector_string_t_swigregister", vector_string_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_RealLimits", _wrap_new_RealLimits, METH_VARARGS, (char *)"\n"
+	 { "vector_string_t_reserve", _wrap_vector_string_t_reserve, METH_VARARGS, "vector_string_t_reserve(vector_string_t self, std::vector< std::string >::size_type n)"},
+	 { "vector_string_t_capacity", _wrap_vector_string_t_capacity, METH_O, "vector_string_t_capacity(vector_string_t self) -> std::vector< std::string >::size_type"},
+	 { "delete_vector_string_t", _wrap_delete_vector_string_t, METH_O, "delete_vector_string_t(vector_string_t self)"},
+	 { "vector_string_t_swigregister", vector_string_t_swigregister, METH_O, NULL},
+	 { "vector_string_t_swiginit", vector_string_t_swiginit, METH_VARARGS, NULL},
+	 { "new_RealLimits", _wrap_new_RealLimits, METH_NOARGS, "\n"
 		"new_RealLimits() -> RealLimits\n"
-		"\n"
 		"RealLimits::RealLimits()\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_hasLowerLimit", _wrap_RealLimits_hasLowerLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_hasLowerLimit", _wrap_RealLimits_hasLowerLimit, METH_O, "\n"
 		"RealLimits_hasLowerLimit(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::hasLowerLimit() const\n"
 		"\n"
 		"if has lower limit \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_lowerLimit", _wrap_RealLimits_lowerLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_lowerLimit", _wrap_RealLimits_lowerLimit, METH_O, "\n"
 		"RealLimits_lowerLimit(RealLimits self) -> double\n"
-		"\n"
 		"double RealLimits::lowerLimit() const\n"
 		"\n"
 		"Returns lower limit. \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_setLowerLimit", _wrap_RealLimits_setLowerLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_setLowerLimit", _wrap_RealLimits_setLowerLimit, METH_VARARGS, "\n"
 		"RealLimits_setLowerLimit(RealLimits self, double value)\n"
-		"\n"
 		"void RealLimits::setLowerLimit(double value)\n"
 		"\n"
 		"Sets lower limit. \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_removeLowerLimit", _wrap_RealLimits_removeLowerLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_removeLowerLimit", _wrap_RealLimits_removeLowerLimit, METH_O, "\n"
 		"RealLimits_removeLowerLimit(RealLimits self)\n"
-		"\n"
 		"void RealLimits::removeLowerLimit()\n"
 		"\n"
 		"remove lower limit \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_hasUpperLimit", _wrap_RealLimits_hasUpperLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_hasUpperLimit", _wrap_RealLimits_hasUpperLimit, METH_O, "\n"
 		"RealLimits_hasUpperLimit(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::hasUpperLimit() const\n"
 		"\n"
 		"if has upper limit \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_upperLimit", _wrap_RealLimits_upperLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_upperLimit", _wrap_RealLimits_upperLimit, METH_O, "\n"
 		"RealLimits_upperLimit(RealLimits self) -> double\n"
-		"\n"
 		"double RealLimits::upperLimit() const\n"
 		"\n"
 		"Returns upper limit. \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_setUpperLimit", _wrap_RealLimits_setUpperLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_setUpperLimit", _wrap_RealLimits_setUpperLimit, METH_VARARGS, "\n"
 		"RealLimits_setUpperLimit(RealLimits self, double value)\n"
-		"\n"
 		"void RealLimits::setUpperLimit(double value)\n"
 		"\n"
 		"Sets upper limit. \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_removeUpperLimit", _wrap_RealLimits_removeUpperLimit, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_removeUpperLimit", _wrap_RealLimits_removeUpperLimit, METH_O, "\n"
 		"RealLimits_removeUpperLimit(RealLimits self)\n"
-		"\n"
 		"void RealLimits::removeUpperLimit()\n"
 		"\n"
 		"remove upper limit \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_hasLowerAndUpperLimits", _wrap_RealLimits_hasLowerAndUpperLimits, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_hasLowerAndUpperLimits", _wrap_RealLimits_hasLowerAndUpperLimits, METH_O, "\n"
 		"RealLimits_hasLowerAndUpperLimits(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::hasLowerAndUpperLimits() const\n"
 		"\n"
 		"if has lower and upper limit \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_setLimits", _wrap_RealLimits_setLimits, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_setLimits", _wrap_RealLimits_setLimits, METH_VARARGS, "\n"
 		"RealLimits_setLimits(RealLimits self, double xmin, double xmax)\n"
-		"\n"
 		"void RealLimits::setLimits(double xmin, double xmax)\n"
 		"\n"
 		"Sets lower and upper limits. \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_removeLimits", _wrap_RealLimits_removeLimits, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_removeLimits", _wrap_RealLimits_removeLimits, METH_O, "\n"
 		"RealLimits_removeLimits(RealLimits self)\n"
-		"\n"
 		"void RealLimits::removeLimits()\n"
 		"\n"
 		"remove limits \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isInRange", _wrap_RealLimits_isInRange, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isInRange", _wrap_RealLimits_isInRange, METH_VARARGS, "\n"
 		"RealLimits_isInRange(RealLimits self, double value) -> bool\n"
-		"\n"
 		"bool RealLimits::isInRange(double value) const\n"
 		"\n"
 		"returns true if proposed value is in limits range \n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_lowerLimited", _wrap_RealLimits_lowerLimited, METH_VARARGS, (char *)"RealLimits_lowerLimited(double bound_value) -> RealLimits"},
-	 { (char *)"RealLimits_positive", _wrap_RealLimits_positive, METH_VARARGS, (char *)"RealLimits_positive() -> RealLimits"},
-	 { (char *)"RealLimits_nonnegative", _wrap_RealLimits_nonnegative, METH_VARARGS, (char *)"RealLimits_nonnegative() -> RealLimits"},
-	 { (char *)"RealLimits_upperLimited", _wrap_RealLimits_upperLimited, METH_VARARGS, (char *)"RealLimits_upperLimited(double bound_value) -> RealLimits"},
-	 { (char *)"RealLimits_limited", _wrap_RealLimits_limited, METH_VARARGS, (char *)"RealLimits_limited(double left_bound_value, double right_bound_value) -> RealLimits"},
-	 { (char *)"RealLimits_limitless", _wrap_RealLimits_limitless, METH_VARARGS, (char *)"RealLimits_limitless() -> RealLimits"},
-	 { (char *)"RealLimits_toString", _wrap_RealLimits_toString, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_lowerLimited", _wrap_RealLimits_lowerLimited, METH_O, "RealLimits_lowerLimited(double bound_value) -> RealLimits"},
+	 { "RealLimits_positive", _wrap_RealLimits_positive, METH_NOARGS, "RealLimits_positive() -> RealLimits"},
+	 { "RealLimits_nonnegative", _wrap_RealLimits_nonnegative, METH_NOARGS, "RealLimits_nonnegative() -> RealLimits"},
+	 { "RealLimits_upperLimited", _wrap_RealLimits_upperLimited, METH_O, "RealLimits_upperLimited(double bound_value) -> RealLimits"},
+	 { "RealLimits_limited", _wrap_RealLimits_limited, METH_VARARGS, "RealLimits_limited(double left_bound_value, double right_bound_value) -> RealLimits"},
+	 { "RealLimits_limitless", _wrap_RealLimits_limitless, METH_NOARGS, "RealLimits_limitless() -> RealLimits"},
+	 { "RealLimits_toString", _wrap_RealLimits_toString, METH_O, "\n"
 		"RealLimits_toString(RealLimits self) -> std::string\n"
-		"\n"
 		"std::string RealLimits::toString() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits___eq__", _wrap_RealLimits___eq__, METH_VARARGS, (char *)"RealLimits___eq__(RealLimits self, RealLimits other) -> bool"},
-	 { (char *)"RealLimits___ne__", _wrap_RealLimits___ne__, METH_VARARGS, (char *)"RealLimits___ne__(RealLimits self, RealLimits other) -> bool"},
-	 { (char *)"RealLimits_isLimitless", _wrap_RealLimits_isLimitless, METH_VARARGS, (char *)"\n"
+	 { "RealLimits___eq__", _wrap_RealLimits___eq__, METH_VARARGS, "RealLimits___eq__(RealLimits self, RealLimits other) -> bool"},
+	 { "RealLimits___ne__", _wrap_RealLimits___ne__, METH_VARARGS, "RealLimits___ne__(RealLimits self, RealLimits other) -> bool"},
+	 { "RealLimits_isLimitless", _wrap_RealLimits_isLimitless, METH_O, "\n"
 		"RealLimits_isLimitless(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isLimitless() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isPositive", _wrap_RealLimits_isPositive, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isPositive", _wrap_RealLimits_isPositive, METH_O, "\n"
 		"RealLimits_isPositive(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isPositive() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isNonnegative", _wrap_RealLimits_isNonnegative, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isNonnegative", _wrap_RealLimits_isNonnegative, METH_O, "\n"
 		"RealLimits_isNonnegative(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isNonnegative() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isLowerLimited", _wrap_RealLimits_isLowerLimited, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isLowerLimited", _wrap_RealLimits_isLowerLimited, METH_O, "\n"
 		"RealLimits_isLowerLimited(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isLowerLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isUpperLimited", _wrap_RealLimits_isUpperLimited, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isUpperLimited", _wrap_RealLimits_isUpperLimited, METH_O, "\n"
 		"RealLimits_isUpperLimited(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isUpperLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"RealLimits_isLimited", _wrap_RealLimits_isLimited, METH_VARARGS, (char *)"\n"
+	 { "RealLimits_isLimited", _wrap_RealLimits_isLimited, METH_O, "\n"
 		"RealLimits_isLimited(RealLimits self) -> bool\n"
-		"\n"
 		"bool RealLimits::isLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_RealLimits", _wrap_delete_RealLimits, METH_VARARGS, (char *)"delete_RealLimits(RealLimits self)"},
-	 { (char *)"RealLimits_swigregister", RealLimits_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_AttLimits", _wrap_new_AttLimits, METH_VARARGS, (char *)"\n"
+	 { "delete_RealLimits", _wrap_delete_RealLimits, METH_O, "delete_RealLimits(RealLimits self)"},
+	 { "RealLimits_swigregister", RealLimits_swigregister, METH_O, NULL},
+	 { "RealLimits_swiginit", RealLimits_swiginit, METH_VARARGS, NULL},
+	 { "new_AttLimits", _wrap_new_AttLimits, METH_NOARGS, "\n"
 		"new_AttLimits() -> AttLimits\n"
-		"\n"
 		"AttLimits::AttLimits()\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_limitless", _wrap_AttLimits_limitless, METH_VARARGS, (char *)"AttLimits_limitless() -> AttLimits"},
-	 { (char *)"AttLimits_lowerLimited", _wrap_AttLimits_lowerLimited, METH_VARARGS, (char *)"AttLimits_lowerLimited(double bound_value) -> AttLimits"},
-	 { (char *)"AttLimits_positive", _wrap_AttLimits_positive, METH_VARARGS, (char *)"AttLimits_positive() -> AttLimits"},
-	 { (char *)"AttLimits_nonnegative", _wrap_AttLimits_nonnegative, METH_VARARGS, (char *)"AttLimits_nonnegative() -> AttLimits"},
-	 { (char *)"AttLimits_upperLimited", _wrap_AttLimits_upperLimited, METH_VARARGS, (char *)"AttLimits_upperLimited(double bound_value) -> AttLimits"},
-	 { (char *)"AttLimits_limited", _wrap_AttLimits_limited, METH_VARARGS, (char *)"AttLimits_limited(double left_bound_value, double right_bound_value) -> AttLimits"},
-	 { (char *)"AttLimits_fixed", _wrap_AttLimits_fixed, METH_VARARGS, (char *)"AttLimits_fixed() -> AttLimits"},
-	 { (char *)"AttLimits_isFixed", _wrap_AttLimits_isFixed, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_limitless", _wrap_AttLimits_limitless, METH_NOARGS, "AttLimits_limitless() -> AttLimits"},
+	 { "AttLimits_lowerLimited", _wrap_AttLimits_lowerLimited, METH_O, "AttLimits_lowerLimited(double bound_value) -> AttLimits"},
+	 { "AttLimits_positive", _wrap_AttLimits_positive, METH_NOARGS, "AttLimits_positive() -> AttLimits"},
+	 { "AttLimits_nonnegative", _wrap_AttLimits_nonnegative, METH_NOARGS, "AttLimits_nonnegative() -> AttLimits"},
+	 { "AttLimits_upperLimited", _wrap_AttLimits_upperLimited, METH_O, "AttLimits_upperLimited(double bound_value) -> AttLimits"},
+	 { "AttLimits_limited", _wrap_AttLimits_limited, METH_VARARGS, "AttLimits_limited(double left_bound_value, double right_bound_value) -> AttLimits"},
+	 { "AttLimits_fixed", _wrap_AttLimits_fixed, METH_NOARGS, "AttLimits_fixed() -> AttLimits"},
+	 { "AttLimits_isFixed", _wrap_AttLimits_isFixed, METH_O, "\n"
 		"AttLimits_isFixed(AttLimits self) -> bool\n"
-		"\n"
 		"bool AttLimits::isFixed() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_isLimited", _wrap_AttLimits_isLimited, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_isLimited", _wrap_AttLimits_isLimited, METH_O, "\n"
 		"AttLimits_isLimited(AttLimits self) -> bool\n"
-		"\n"
 		"bool AttLimits::isLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_isUpperLimited", _wrap_AttLimits_isUpperLimited, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_isUpperLimited", _wrap_AttLimits_isUpperLimited, METH_O, "\n"
 		"AttLimits_isUpperLimited(AttLimits self) -> bool\n"
-		"\n"
 		"bool AttLimits::isUpperLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_isLowerLimited", _wrap_AttLimits_isLowerLimited, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_isLowerLimited", _wrap_AttLimits_isLowerLimited, METH_O, "\n"
 		"AttLimits_isLowerLimited(AttLimits self) -> bool\n"
-		"\n"
 		"bool AttLimits::isLowerLimited() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_isLimitless", _wrap_AttLimits_isLimitless, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_isLimitless", _wrap_AttLimits_isLimitless, METH_O, "\n"
 		"AttLimits_isLimitless(AttLimits self) -> bool\n"
-		"\n"
 		"bool AttLimits::isLimitless() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_lowerLimit", _wrap_AttLimits_lowerLimit, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_lowerLimit", _wrap_AttLimits_lowerLimit, METH_O, "\n"
 		"AttLimits_lowerLimit(AttLimits self) -> double\n"
-		"\n"
 		"double AttLimits::lowerLimit() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_upperLimit", _wrap_AttLimits_upperLimit, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_upperLimit", _wrap_AttLimits_upperLimit, METH_O, "\n"
 		"AttLimits_upperLimit(AttLimits self) -> double\n"
-		"\n"
 		"double AttLimits::upperLimit() const\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits_setFixed", _wrap_AttLimits_setFixed, METH_VARARGS, (char *)"\n"
+	 { "AttLimits_setFixed", _wrap_AttLimits_setFixed, METH_VARARGS, "\n"
 		"AttLimits_setFixed(AttLimits self, bool isFixed)\n"
-		"\n"
 		"void AttLimits::setFixed(bool isFixed)\n"
 		"\n"
 		""},
-	 { (char *)"AttLimits___eq__", _wrap_AttLimits___eq__, METH_VARARGS, (char *)"AttLimits___eq__(AttLimits self, AttLimits other) -> bool"},
-	 { (char *)"AttLimits___ne__", _wrap_AttLimits___ne__, METH_VARARGS, (char *)"AttLimits___ne__(AttLimits self, AttLimits other) -> bool"},
-	 { (char *)"AttLimits_toString", _wrap_AttLimits_toString, METH_VARARGS, (char *)"\n"
+	 { "AttLimits___eq__", _wrap_AttLimits___eq__, METH_VARARGS, "AttLimits___eq__(AttLimits self, AttLimits other) -> bool"},
+	 { "AttLimits___ne__", _wrap_AttLimits___ne__, METH_VARARGS, "AttLimits___ne__(AttLimits self, AttLimits other) -> bool"},
+	 { "AttLimits_toString", _wrap_AttLimits_toString, METH_O, "\n"
 		"AttLimits_toString(AttLimits self) -> std::string\n"
-		"\n"
 		"std::string AttLimits::toString() const\n"
 		"\n"
 		""},
-	 { (char *)"delete_AttLimits", _wrap_delete_AttLimits, METH_VARARGS, (char *)"delete_AttLimits(AttLimits self)"},
-	 { (char *)"AttLimits_swigregister", AttLimits_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Parameter", _wrap_new_Parameter, METH_VARARGS, (char *)"\n"
+	 { "delete_AttLimits", _wrap_delete_AttLimits, METH_O, "delete_AttLimits(AttLimits self)"},
+	 { "AttLimits_swigregister", AttLimits_swigregister, METH_O, NULL},
+	 { "AttLimits_swiginit", AttLimits_swiginit, METH_VARARGS, NULL},
+	 { "new_Parameter", _wrap_new_Parameter, METH_VARARGS, "\n"
 		"Parameter()\n"
-		"Parameter(std::string const & name, double value, AttLimits limits, double step=0.0)\n"
-		"Parameter(std::string const & name, double value, AttLimits limits)\n"
-		"new_Parameter(std::string const & name, double value) -> Parameter\n"
-		"\n"
+		"Parameter(std::string const & name, double value, AttLimits limits=AttLimits::limitless(), double step=0.0)\n"
 		"Parameter::Parameter(const std::string &name, double value, const AttLimits &limits=AttLimits::limitless(), double step=0.0)\n"
 		"\n"
 		"Fit parameter constructor.\n"
@@ -23314,288 +22361,248 @@ static PyMethodDef SwigMethods[] = {
 		"initial step of fit parameter during the minimization, will be calculated automatically, if zero. \n"
 		"\n"
 		""},
-	 { (char *)"Parameter_name", _wrap_Parameter_name, METH_VARARGS, (char *)"\n"
+	 { "Parameter_name", _wrap_Parameter_name, METH_O, "\n"
 		"Parameter_name(Parameter self) -> std::string\n"
-		"\n"
 		"std::string Parameter::name() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_startValue", _wrap_Parameter_startValue, METH_VARARGS, (char *)"\n"
+	 { "Parameter_startValue", _wrap_Parameter_startValue, METH_O, "\n"
 		"Parameter_startValue(Parameter self) -> double\n"
-		"\n"
 		"double Parameter::startValue() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_limits", _wrap_Parameter_limits, METH_VARARGS, (char *)"\n"
+	 { "Parameter_limits", _wrap_Parameter_limits, METH_O, "\n"
 		"Parameter_limits(Parameter self) -> AttLimits\n"
-		"\n"
 		"AttLimits Parameter::limits() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_value", _wrap_Parameter_value, METH_VARARGS, (char *)"\n"
+	 { "Parameter_value", _wrap_Parameter_value, METH_O, "\n"
 		"Parameter_value(Parameter self) -> double\n"
-		"\n"
 		"double Parameter::value() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_setValue", _wrap_Parameter_setValue, METH_VARARGS, (char *)"\n"
+	 { "Parameter_setValue", _wrap_Parameter_setValue, METH_VARARGS, "\n"
 		"Parameter_setValue(Parameter self, double value)\n"
-		"\n"
 		"void Parameter::setValue(double value)\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_step", _wrap_Parameter_step, METH_VARARGS, (char *)"\n"
+	 { "Parameter_step", _wrap_Parameter_step, METH_O, "\n"
 		"Parameter_step(Parameter self) -> double\n"
-		"\n"
 		"double Parameter::step() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_error", _wrap_Parameter_error, METH_VARARGS, (char *)"\n"
+	 { "Parameter_error", _wrap_Parameter_error, METH_O, "\n"
 		"Parameter_error(Parameter self) -> double\n"
-		"\n"
 		"double Parameter::error() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameter_setError", _wrap_Parameter_setError, METH_VARARGS, (char *)"\n"
+	 { "Parameter_setError", _wrap_Parameter_setError, METH_VARARGS, "\n"
 		"Parameter_setError(Parameter self, double value)\n"
-		"\n"
 		"void Parameter::setError(double value)\n"
 		"\n"
 		""},
-	 { (char *)"delete_Parameter", _wrap_delete_Parameter, METH_VARARGS, (char *)"delete_Parameter(Parameter self)"},
-	 { (char *)"Parameter_swigregister", Parameter_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Parameters", _wrap_new_Parameters, METH_VARARGS, (char *)"\n"
+	 { "delete_Parameter", _wrap_delete_Parameter, METH_O, "delete_Parameter(Parameter self)"},
+	 { "Parameter_swigregister", Parameter_swigregister, METH_O, NULL},
+	 { "Parameter_swiginit", Parameter_swiginit, METH_VARARGS, NULL},
+	 { "new_Parameters", _wrap_new_Parameters, METH_NOARGS, "\n"
 		"new_Parameters() -> Parameters\n"
-		"\n"
 		"Fit::Parameters::Parameters()=default\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_add_cpp", _wrap_Parameters_add_cpp, METH_VARARGS, (char *)"\n"
+	 { "Parameters_add_cpp", _wrap_Parameters_add_cpp, METH_VARARGS, "\n"
 		"Parameters_add_cpp(Parameters self, Parameter par)\n"
-		"\n"
 		"void Parameters::add(const Parameter &par)\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_begin", _wrap_Parameters_begin, METH_VARARGS, (char *)"\n"
-		"begin() -> Fit::Parameters::const_iterator\n"
+	 { "Parameters_begin", _wrap_Parameters_begin, METH_VARARGS, "\n"
+		"Parameters_begin(Parameters self) -> Fit::Parameters::const_iterator\n"
 		"Parameters_begin(Parameters self) -> Fit::Parameters::iterator\n"
-		"\n"
 		"iterator Fit::Parameters::begin()\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_end", _wrap_Parameters_end, METH_VARARGS, (char *)"\n"
-		"end() -> Fit::Parameters::const_iterator\n"
+	 { "Parameters_end", _wrap_Parameters_end, METH_VARARGS, "\n"
+		"Parameters_end(Parameters self) -> Fit::Parameters::const_iterator\n"
 		"Parameters_end(Parameters self) -> Fit::Parameters::iterator\n"
-		"\n"
 		"iterator Fit::Parameters::end()\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_size", _wrap_Parameters_size, METH_VARARGS, (char *)"\n"
+	 { "Parameters_size", _wrap_Parameters_size, METH_O, "\n"
 		"Parameters_size(Parameters self) -> size_t\n"
-		"\n"
 		"size_t Parameters::size() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_values", _wrap_Parameters_values, METH_VARARGS, (char *)"\n"
+	 { "Parameters_values", _wrap_Parameters_values, METH_O, "\n"
 		"Parameters_values(Parameters self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > Parameters::values() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_setValues", _wrap_Parameters_setValues, METH_VARARGS, (char *)"\n"
+	 { "Parameters_setValues", _wrap_Parameters_setValues, METH_VARARGS, "\n"
 		"Parameters_setValues(Parameters self, vdouble1d_t values)\n"
-		"\n"
 		"void Parameters::setValues(const std::vector< double > &values)\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_errors", _wrap_Parameters_errors, METH_VARARGS, (char *)"\n"
+	 { "Parameters_errors", _wrap_Parameters_errors, METH_O, "\n"
 		"Parameters_errors(Parameters self) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > Parameters::errors() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_setErrors", _wrap_Parameters_setErrors, METH_VARARGS, (char *)"\n"
+	 { "Parameters_setErrors", _wrap_Parameters_setErrors, METH_VARARGS, "\n"
 		"Parameters_setErrors(Parameters self, vdouble1d_t errors)\n"
-		"\n"
 		"void Parameters::setErrors(const std::vector< double > &errors)\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_correlationMatrix", _wrap_Parameters_correlationMatrix, METH_VARARGS, (char *)"\n"
+	 { "Parameters_correlationMatrix", _wrap_Parameters_correlationMatrix, METH_O, "\n"
 		"Parameters_correlationMatrix(Parameters self) -> vdouble2d_t\n"
-		"\n"
 		"Parameters::corr_matrix_t Parameters::correlationMatrix() const\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_setCorrelationMatrix", _wrap_Parameters_setCorrelationMatrix, METH_VARARGS, (char *)"\n"
+	 { "Parameters_setCorrelationMatrix", _wrap_Parameters_setCorrelationMatrix, METH_VARARGS, "\n"
 		"Parameters_setCorrelationMatrix(Parameters self, vdouble2d_t matrix)\n"
-		"\n"
 		"void Parameters::setCorrelationMatrix(const corr_matrix_t &matrix)\n"
 		"\n"
 		""},
-	 { (char *)"Parameters_freeParameterCount", _wrap_Parameters_freeParameterCount, METH_VARARGS, (char *)"\n"
+	 { "Parameters_freeParameterCount", _wrap_Parameters_freeParameterCount, METH_O, "\n"
 		"Parameters_freeParameterCount(Parameters self) -> size_t\n"
-		"\n"
 		"size_t Parameters::freeParameterCount() const\n"
 		"\n"
 		"Returns number of free parameters. \n"
 		"\n"
 		""},
-	 { (char *)"Parameters___getitem__", _wrap_Parameters___getitem__, METH_VARARGS, (char *)"\n"
-		"__getitem__(std::string name) -> Parameter\n"
+	 { "Parameters___getitem__", _wrap_Parameters___getitem__, METH_VARARGS, "\n"
+		"Parameters___getitem__(Parameters self, std::string name) -> Parameter\n"
 		"Parameters___getitem__(Parameters self, size_t index) -> Parameter\n"
 		""},
-	 { (char *)"delete_Parameters", _wrap_delete_Parameters, METH_VARARGS, (char *)"delete_Parameters(Parameters self)"},
-	 { (char *)"Parameters_swigregister", Parameters_swigregister, METH_VARARGS, NULL},
-	 { (char *)"delete_IMinimizer", _wrap_delete_IMinimizer, METH_VARARGS, (char *)"\n"
+	 { "delete_Parameters", _wrap_delete_Parameters, METH_O, "delete_Parameters(Parameters self)"},
+	 { "Parameters_swigregister", Parameters_swigregister, METH_O, NULL},
+	 { "Parameters_swiginit", Parameters_swiginit, METH_VARARGS, NULL},
+	 { "delete_IMinimizer", _wrap_delete_IMinimizer, METH_O, "\n"
 		"delete_IMinimizer(IMinimizer self)\n"
-		"\n"
 		"IMinimizer::~IMinimizer()\n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_minimizerName", _wrap_IMinimizer_minimizerName, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_minimizerName", _wrap_IMinimizer_minimizerName, METH_O, "\n"
 		"IMinimizer_minimizerName(IMinimizer self) -> std::string\n"
-		"\n"
 		"virtual std::string IMinimizer::minimizerName() const =0\n"
 		"\n"
 		"return name of the minimizer \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_algorithmName", _wrap_IMinimizer_algorithmName, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_algorithmName", _wrap_IMinimizer_algorithmName, METH_O, "\n"
 		"IMinimizer_algorithmName(IMinimizer self) -> std::string\n"
-		"\n"
 		"virtual std::string IMinimizer::algorithmName() const =0\n"
 		"\n"
 		"return name of the minimization algorithm \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_minimize_scalar", _wrap_IMinimizer_minimize_scalar, METH_VARARGS, (char *)"\n"
-		"IMinimizer_minimize_scalar(IMinimizer self, fcn_scalar_t arg3, Parameters arg4) -> MinimizerResult\n"
-		"\n"
+	 { "IMinimizer_minimize_scalar", _wrap_IMinimizer_minimize_scalar, METH_VARARGS, "\n"
+		"IMinimizer_minimize_scalar(IMinimizer self, fcn_scalar_t arg2, Parameters arg3) -> MinimizerResult\n"
 		"Fit::MinimizerResult IMinimizer::minimize_scalar(fcn_scalar_t, Fit::Parameters)\n"
 		"\n"
 		"run minimization \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_minimize_residual", _wrap_IMinimizer_minimize_residual, METH_VARARGS, (char *)"\n"
-		"IMinimizer_minimize_residual(IMinimizer self, fcn_residual_t arg3, Parameters arg4) -> MinimizerResult\n"
-		"\n"
+	 { "IMinimizer_minimize_residual", _wrap_IMinimizer_minimize_residual, METH_VARARGS, "\n"
+		"IMinimizer_minimize_residual(IMinimizer self, fcn_residual_t arg2, Parameters arg3) -> MinimizerResult\n"
 		"Fit::MinimizerResult IMinimizer::minimize_residual(fcn_residual_t, Fit::Parameters)\n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_clear", _wrap_IMinimizer_clear, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_clear", _wrap_IMinimizer_clear, METH_O, "\n"
 		"IMinimizer_clear(IMinimizer self)\n"
-		"\n"
 		"virtual void IMinimizer::clear()\n"
 		"\n"
 		"clear resources (parameters) for consecutives minimizations \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_minValue", _wrap_IMinimizer_minValue, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_minValue", _wrap_IMinimizer_minValue, METH_O, "\n"
 		"IMinimizer_minValue(IMinimizer self) -> double\n"
-		"\n"
 		"double IMinimizer::minValue() const\n"
 		"\n"
 		"Returns minimum function value. \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_setOptions", _wrap_IMinimizer_setOptions, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_setOptions", _wrap_IMinimizer_setOptions, METH_VARARGS, "\n"
 		"IMinimizer_setOptions(IMinimizer self, std::string const & options)\n"
-		"\n"
 		"void IMinimizer::setOptions(const std::string &options)\n"
 		"\n"
 		"Sets option string to the minimizer. \n"
 		"\n"
 		""},
-	 { (char *)"IMinimizer_swigregister", IMinimizer_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_MinimizerCatalogue", _wrap_new_MinimizerCatalogue, METH_VARARGS, (char *)"\n"
+	 { "IMinimizer_swigregister", IMinimizer_swigregister, METH_O, NULL},
+	 { "new_MinimizerCatalogue", _wrap_new_MinimizerCatalogue, METH_NOARGS, "\n"
 		"new_MinimizerCatalogue() -> MinimizerCatalogue\n"
-		"\n"
 		"MinimizerCatalogue::MinimizerCatalogue()\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerCatalogue_toString", _wrap_MinimizerCatalogue_toString, METH_VARARGS, (char *)"\n"
+	 { "MinimizerCatalogue_toString", _wrap_MinimizerCatalogue_toString, METH_O, "\n"
 		"MinimizerCatalogue_toString(MinimizerCatalogue self) -> std::string\n"
-		"\n"
 		"std::string MinimizerCatalogue::toString() const\n"
 		"\n"
 		"Returns multiline string representing catalogue content. \n"
 		"\n"
 		""},
-	 { (char *)"MinimizerCatalogue_minimizerNames", _wrap_MinimizerCatalogue_minimizerNames, METH_VARARGS, (char *)"\n"
+	 { "MinimizerCatalogue_minimizerNames", _wrap_MinimizerCatalogue_minimizerNames, METH_O, "\n"
 		"MinimizerCatalogue_minimizerNames(MinimizerCatalogue self) -> vector_string_t\n"
-		"\n"
 		"std::vector< std::string > MinimizerCatalogue::minimizerNames() const\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerCatalogue_algorithmNames", _wrap_MinimizerCatalogue_algorithmNames, METH_VARARGS, (char *)"\n"
+	 { "MinimizerCatalogue_algorithmNames", _wrap_MinimizerCatalogue_algorithmNames, METH_VARARGS, "\n"
 		"MinimizerCatalogue_algorithmNames(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t\n"
-		"\n"
 		"std::vector< std::string > MinimizerCatalogue::algorithmNames(const std::string &minimizerName) const\n"
 		"\n"
 		"Returns list of algorithms defined for the minimizer with a given name. \n"
 		"\n"
 		""},
-	 { (char *)"MinimizerCatalogue_algorithmDescriptions", _wrap_MinimizerCatalogue_algorithmDescriptions, METH_VARARGS, (char *)"\n"
+	 { "MinimizerCatalogue_algorithmDescriptions", _wrap_MinimizerCatalogue_algorithmDescriptions, METH_VARARGS, "\n"
 		"MinimizerCatalogue_algorithmDescriptions(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t\n"
-		"\n"
 		"std::vector< std::string > MinimizerCatalogue::algorithmDescriptions(const std::string &minimizerName) const\n"
 		"\n"
 		"Returns list of algorithm's descriptions for the minimizer with a given name . \n"
 		"\n"
 		""},
-	 { (char *)"MinimizerCatalogue_minimizerInfo", _wrap_MinimizerCatalogue_minimizerInfo, METH_VARARGS, (char *)"\n"
+	 { "MinimizerCatalogue_minimizerInfo", _wrap_MinimizerCatalogue_minimizerInfo, METH_VARARGS, "\n"
 		"MinimizerCatalogue_minimizerInfo(MinimizerCatalogue self, std::string const & minimizerName) -> MinimizerInfo const &\n"
-		"\n"
 		"const MinimizerInfo & MinimizerCatalogue::minimizerInfo(const std::string &minimizerName) const\n"
 		"\n"
 		"Returns info for minimizer with given name. \n"
 		"\n"
 		""},
-	 { (char *)"delete_MinimizerCatalogue", _wrap_delete_MinimizerCatalogue, METH_VARARGS, (char *)"delete_MinimizerCatalogue(MinimizerCatalogue self)"},
-	 { (char *)"MinimizerCatalogue_swigregister", MinimizerCatalogue_swigregister, METH_VARARGS, NULL},
-	 { (char *)"MinimizerFactory_createMinimizer", _wrap_MinimizerFactory_createMinimizer, METH_VARARGS, (char *)"\n"
-		"createMinimizer(std::string const & minimizerName, std::string const & algorithmType, std::string const & optionString) -> IMinimizer\n"
-		"createMinimizer(std::string const & minimizerName, std::string const & algorithmType) -> IMinimizer\n"
-		"MinimizerFactory_createMinimizer(std::string const & minimizerName) -> IMinimizer\n"
-		""},
-	 { (char *)"MinimizerFactory_printCatalogue", _wrap_MinimizerFactory_printCatalogue, METH_VARARGS, (char *)"MinimizerFactory_printCatalogue()"},
-	 { (char *)"MinimizerFactory_catalogueToString", _wrap_MinimizerFactory_catalogueToString, METH_VARARGS, (char *)"MinimizerFactory_catalogueToString() -> std::string"},
-	 { (char *)"MinimizerFactory_catalogueDetailsToString", _wrap_MinimizerFactory_catalogueDetailsToString, METH_VARARGS, (char *)"MinimizerFactory_catalogueDetailsToString() -> std::string"},
-	 { (char *)"MinimizerFactory_catalogue", _wrap_MinimizerFactory_catalogue, METH_VARARGS, (char *)"MinimizerFactory_catalogue() -> MinimizerCatalogue"},
-	 { (char *)"new_MinimizerFactory", _wrap_new_MinimizerFactory, METH_VARARGS, (char *)"\n"
+	 { "delete_MinimizerCatalogue", _wrap_delete_MinimizerCatalogue, METH_O, "delete_MinimizerCatalogue(MinimizerCatalogue self)"},
+	 { "MinimizerCatalogue_swigregister", MinimizerCatalogue_swigregister, METH_O, NULL},
+	 { "MinimizerCatalogue_swiginit", MinimizerCatalogue_swiginit, METH_VARARGS, NULL},
+	 { "MinimizerFactory_createMinimizer", _wrap_MinimizerFactory_createMinimizer, METH_VARARGS, "MinimizerFactory_createMinimizer(std::string const & minimizerName, std::string const & algorithmType=\"\", std::string const & optionString=\"\") -> IMinimizer"},
+	 { "MinimizerFactory_printCatalogue", _wrap_MinimizerFactory_printCatalogue, METH_NOARGS, "MinimizerFactory_printCatalogue()"},
+	 { "MinimizerFactory_catalogueToString", _wrap_MinimizerFactory_catalogueToString, METH_NOARGS, "MinimizerFactory_catalogueToString() -> std::string"},
+	 { "MinimizerFactory_catalogueDetailsToString", _wrap_MinimizerFactory_catalogueDetailsToString, METH_NOARGS, "MinimizerFactory_catalogueDetailsToString() -> std::string"},
+	 { "MinimizerFactory_catalogue", _wrap_MinimizerFactory_catalogue, METH_NOARGS, "MinimizerFactory_catalogue() -> MinimizerCatalogue"},
+	 { "new_MinimizerFactory", _wrap_new_MinimizerFactory, METH_NOARGS, "\n"
 		"new_MinimizerFactory() -> MinimizerFactory\n"
 		"\n"
 		"\n"
-		"\n"
 		"Factory to create minimizers.\n"
 		"\n"
 		"C++ includes: MinimizerFactory.h\n"
 		"\n"
 		""},
-	 { (char *)"delete_MinimizerFactory", _wrap_delete_MinimizerFactory, METH_VARARGS, (char *)"delete_MinimizerFactory(MinimizerFactory self)"},
-	 { (char *)"MinimizerFactory_swigregister", MinimizerFactory_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_PyCallback", _wrap_new_PyCallback, METH_VARARGS, (char *)"\n"
-		"PyCallback(PyCallback::CallbackType callback_type)\n"
-		"new_PyCallback(PyObject * arg2) -> PyCallback\n"
-		"\n"
+	 { "delete_MinimizerFactory", _wrap_delete_MinimizerFactory, METH_O, "delete_MinimizerFactory(MinimizerFactory self)"},
+	 { "MinimizerFactory_swigregister", MinimizerFactory_swigregister, METH_O, NULL},
+	 { "MinimizerFactory_swiginit", MinimizerFactory_swiginit, METH_VARARGS, NULL},
+	 { "new_PyCallback", _wrap_new_PyCallback, METH_VARARGS, "\n"
+		"PyCallback(PyCallback::CallbackType callback_type=SCALAR)\n"
 		"PyCallback::PyCallback(CallbackType callback_type=SCALAR)\n"
 		"\n"
 		""},
-	 { (char *)"delete_PyCallback", _wrap_delete_PyCallback, METH_VARARGS, (char *)"\n"
+	 { "delete_PyCallback", _wrap_delete_PyCallback, METH_O, "\n"
 		"delete_PyCallback(PyCallback self)\n"
-		"\n"
 		"PyCallback::~PyCallback()\n"
 		"\n"
 		""},
-	 { (char *)"PyCallback_callback_type", _wrap_PyCallback_callback_type, METH_VARARGS, (char *)"\n"
+	 { "PyCallback_callback_type", _wrap_PyCallback_callback_type, METH_O, "\n"
 		"PyCallback_callback_type(PyCallback self) -> PyCallback::CallbackType\n"
-		"\n"
 		"PyCallback::CallbackType PyCallback::callback_type() const\n"
 		"\n"
 		""},
-	 { (char *)"PyCallback_call_scalar", _wrap_PyCallback_call_scalar, METH_VARARGS, (char *)"\n"
+	 { "PyCallback_call_scalar", _wrap_PyCallback_call_scalar, METH_VARARGS, "\n"
 		"PyCallback_call_scalar(PyCallback self, Parameters pars) -> double\n"
-		"\n"
 		"double PyCallback::call_scalar(Fit::Parameters pars)\n"
 		"\n"
 		"Call Python callable and returns its result. Intended to be overloaded in Python.\n"
@@ -23609,9 +22616,8 @@ static PyMethodDef SwigMethods[] = {
 		"value of objective function. \n"
 		"\n"
 		""},
-	 { (char *)"PyCallback_call_residuals", _wrap_PyCallback_call_residuals, METH_VARARGS, (char *)"\n"
+	 { "PyCallback_call_residuals", _wrap_PyCallback_call_residuals, METH_VARARGS, "\n"
 		"PyCallback_call_residuals(PyCallback self, Parameters arg0) -> vdouble1d_t\n"
-		"\n"
 		"std::vector< double > PyCallback::call_residuals(Fit::Parameters)\n"
 		"\n"
 		"Call Python callable and returns its result. Intended to be overloaded in Python.\n"
@@ -23625,104 +22631,95 @@ static PyMethodDef SwigMethods[] = {
 		"vector of residuals \n"
 		"\n"
 		""},
-	 { (char *)"disown_PyCallback", _wrap_disown_PyCallback, METH_VARARGS, NULL},
-	 { (char *)"PyCallback_swigregister", PyCallback_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_MinimizerResult", _wrap_new_MinimizerResult, METH_VARARGS, (char *)"\n"
+	 { "disown_PyCallback", _wrap_disown_PyCallback, METH_O, NULL},
+	 { "PyCallback_swigregister", PyCallback_swigregister, METH_O, NULL},
+	 { "PyCallback_swiginit", PyCallback_swiginit, METH_VARARGS, NULL},
+	 { "new_MinimizerResult", _wrap_new_MinimizerResult, METH_NOARGS, "\n"
 		"new_MinimizerResult() -> MinimizerResult\n"
-		"\n"
 		"MinimizerResult::MinimizerResult()\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setParameters", _wrap_MinimizerResult_setParameters, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setParameters", _wrap_MinimizerResult_setParameters, METH_VARARGS, "\n"
 		"MinimizerResult_setParameters(MinimizerResult self, Parameters parameters)\n"
-		"\n"
 		"void MinimizerResult::setParameters(const Parameters &parameters)\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_parameters", _wrap_MinimizerResult_parameters, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_parameters", _wrap_MinimizerResult_parameters, METH_O, "\n"
 		"MinimizerResult_parameters(MinimizerResult self) -> Parameters\n"
-		"\n"
 		"Parameters MinimizerResult::parameters() const\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setMinValue", _wrap_MinimizerResult_setMinValue, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setMinValue", _wrap_MinimizerResult_setMinValue, METH_VARARGS, "\n"
 		"MinimizerResult_setMinValue(MinimizerResult self, double value)\n"
-		"\n"
 		"void MinimizerResult::setMinValue(double value)\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_minValue", _wrap_MinimizerResult_minValue, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_minValue", _wrap_MinimizerResult_minValue, METH_O, "\n"
 		"MinimizerResult_minValue(MinimizerResult self) -> double\n"
-		"\n"
 		"double MinimizerResult::minValue() const\n"
 		"\n"
 		"Minimum value of objective function found by minimizer. \n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_toString", _wrap_MinimizerResult_toString, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_toString", _wrap_MinimizerResult_toString, METH_O, "\n"
 		"MinimizerResult_toString(MinimizerResult self) -> std::string\n"
-		"\n"
 		"std::string MinimizerResult::toString() const\n"
 		"\n"
 		"Returns multi-line string representing minimization results. \n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setReport", _wrap_MinimizerResult_setReport, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setReport", _wrap_MinimizerResult_setReport, METH_VARARGS, "\n"
 		"MinimizerResult_setReport(MinimizerResult self, std::string const & value)\n"
-		"\n"
 		"void MinimizerResult::setReport(const std::string &value)\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setDuration", _wrap_MinimizerResult_setDuration, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setDuration", _wrap_MinimizerResult_setDuration, METH_VARARGS, "\n"
 		"MinimizerResult_setDuration(MinimizerResult self, double value)\n"
-		"\n"
 		"void MinimizerResult::setDuration(double value)\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setNumberOfCalls", _wrap_MinimizerResult_setNumberOfCalls, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setNumberOfCalls", _wrap_MinimizerResult_setNumberOfCalls, METH_VARARGS, "\n"
 		"MinimizerResult_setNumberOfCalls(MinimizerResult self, int value)\n"
-		"\n"
 		"void MinimizerResult::setNumberOfCalls(int value)\n"
 		"\n"
 		""},
-	 { (char *)"MinimizerResult_setNumberOfGradientCalls", _wrap_MinimizerResult_setNumberOfGradientCalls, METH_VARARGS, (char *)"\n"
+	 { "MinimizerResult_setNumberOfGradientCalls", _wrap_MinimizerResult_setNumberOfGradientCalls, METH_VARARGS, "\n"
 		"MinimizerResult_setNumberOfGradientCalls(MinimizerResult self, int value)\n"
-		"\n"
 		"void MinimizerResult::setNumberOfGradientCalls(int value)\n"
 		"\n"
 		""},
-	 { (char *)"delete_MinimizerResult", _wrap_delete_MinimizerResult, METH_VARARGS, (char *)"delete_MinimizerResult(MinimizerResult self)"},
-	 { (char *)"MinimizerResult_swigregister", MinimizerResult_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_Minimizer", _wrap_new_Minimizer, METH_VARARGS, (char *)"\n"
+	 { "delete_MinimizerResult", _wrap_delete_MinimizerResult, METH_O, "delete_MinimizerResult(MinimizerResult self)"},
+	 { "MinimizerResult_swigregister", MinimizerResult_swigregister, METH_O, NULL},
+	 { "MinimizerResult_swiginit", MinimizerResult_swiginit, METH_VARARGS, NULL},
+	 { "new_Minimizer", _wrap_new_Minimizer, METH_NOARGS, "\n"
 		"new_Minimizer() -> Minimizer\n"
-		"\n"
 		"Minimizer::Minimizer()\n"
 		"\n"
 		""},
-	 { (char *)"delete_Minimizer", _wrap_delete_Minimizer, METH_VARARGS, (char *)"\n"
+	 { "delete_Minimizer", _wrap_delete_Minimizer, METH_O, "\n"
 		"delete_Minimizer(Minimizer self)\n"
-		"\n"
 		"Minimizer::~Minimizer()\n"
 		"\n"
 		""},
-	 { (char *)"Minimizer_setMinimizer", _wrap_Minimizer_setMinimizer, METH_VARARGS, (char *)"\n"
-		"setMinimizer(std::string const & minimizerName, std::string const & algorithmName, std::string const & options)\n"
-		"setMinimizer(std::string const & minimizerName, std::string const & algorithmName)\n"
-		"setMinimizer(std::string const & minimizerName)\n"
+	 { "Minimizer_setMinimizer", _wrap_Minimizer_setMinimizer, METH_VARARGS, "\n"
+		"Minimizer_setMinimizer(Minimizer self, std::string const & minimizerName, std::string const & algorithmName=\"\", std::string const & options=\"\")\n"
 		"Minimizer_setMinimizer(Minimizer self, IMinimizer minimizer)\n"
-		"\n"
 		"void Minimizer::setMinimizer(IMinimizer *minimizer)\n"
 		"\n"
 		""},
-	 { (char *)"Minimizer_minimize_cpp", _wrap_Minimizer_minimize_cpp, METH_VARARGS, (char *)"\n"
+	 { "Minimizer_minimize_cpp", _wrap_Minimizer_minimize_cpp, METH_VARARGS, "\n"
 		"Minimizer_minimize_cpp(Minimizer self, PyCallback callback, Parameters parameters) -> MinimizerResult\n"
-		"\n"
 		"MinimizerResult Minimizer::minimize(PyCallback &callback, const Parameters &parameters)\n"
 		"\n"
 		"Finds minimum of user objective function (to be called from Python). \n"
 		"\n"
 		""},
-	 { (char *)"Minimizer_swigregister", Minimizer_swigregister, METH_VARARGS, NULL},
+	 { "Minimizer_swigregister", Minimizer_swigregister, METH_O, NULL},
+	 { "Minimizer_swiginit", Minimizer_swiginit, METH_VARARGS, NULL},
+	 { NULL, NULL, 0, NULL }
+};
+
+static PyMethodDef SwigMethods_proxydocs[] = {
 	 { NULL, NULL, 0, NULL }
 };
 
@@ -24038,7 +23035,7 @@ SWIG_InitializeModule(void *clientdata) {
   
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
-  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+  printf("SWIG_InitializeModule: size %lu\n", (unsigned long)swig_module.size);
 #endif
   for (i = 0; i < swig_module.size; ++i) {
     swig_type_info *type = 0;
@@ -24046,7 +23043,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_cast_info *cast;
     
 #ifdef SWIGRUNTIME_DEBUG
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
 #endif
     
     /* if there is another module already loaded */
@@ -24121,7 +23118,7 @@ SWIG_InitializeModule(void *clientdata) {
   for (i = 0; i < swig_module.size; ++i) {
     int j = 0;
     swig_cast_info *cast = swig_module.cast_initial[i];
-    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
     while (cast->type) {
       printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
       cast++;
@@ -24243,17 +23240,6 @@ extern "C" {
     return str;
   }
   
-  SWIGINTERN int
-  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-    char *tmp;
-    PyObject *str = swig_varlink_str(v);
-    fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-    SWIG_Python_str_DelForPy3(tmp);
-    Py_DECREF(str);
-    return 0;
-  }
-  
   SWIGINTERN void
   swig_varlink_dealloc(swig_varlinkobject *v) {
     swig_globalvar *var = v->vars;
@@ -24312,11 +23298,11 @@ extern "C" {
         PyObject_HEAD_INIT(NULL)
         0,                                  /* ob_size */
 #endif
-        (char *)"swigvarlink",              /* tp_name */
+        "swigvarlink",                      /* tp_name */
         sizeof(swig_varlinkobject),         /* tp_basicsize */
         0,                                  /* tp_itemsize */
         (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-        (printfunc) swig_varlink_print,     /* tp_print */
+        0,                                  /* tp_print */
         (getattrfunc) swig_varlink_getattr, /* tp_getattr */
         (setattrfunc) swig_varlink_setattr, /* tp_setattr */
         0,                                  /* tp_compare */
@@ -24336,15 +23322,9 @@ extern "C" {
         0,                                  /* tp_clear */
         0,                                  /* tp_richcompare */
         0,                                  /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
         0,                                  /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
         0,                                  /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
         0,                                  /* tp_finalize */
 #endif
@@ -24352,20 +23332,14 @@ extern "C" {
         0,                                  /* tp_allocs */
         0,                                  /* tp_frees */
         0,                                  /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
         0,                                  /* tp_prev */
-#endif
         0                                   /* tp_next */
 #endif
       };
       varlink_type = tmp;
       type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-      varlink_type.ob_type = &PyType_Type;
-#else
       if (PyType_Ready(&varlink_type) < 0)
       return NULL;
-#endif
     }
     return &varlink_type;
   }
@@ -24381,14 +23355,14 @@ extern "C" {
   }
   
   SWIGINTERN void 
-  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+  SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
     swig_varlinkobject *v = (swig_varlinkobject *) p;
     swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
     if (gv) {
       size_t size = strlen(name)+1;
       gv->name = (char *)malloc(size);
       if (gv->name) {
-        strncpy(gv->name,name,size);
+        memcpy(gv->name, name, size);
         gv->get_attr = get_attr;
         gv->set_attr = set_attr;
         gv->next = v->vars;
@@ -24399,9 +23373,11 @@ extern "C" {
   
   SWIGINTERN PyObject *
   SWIG_globals(void) {
-    static PyObject *_SWIG_globals = 0; 
-    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
-    return _SWIG_globals;
+    static PyObject *globals = 0;
+    if (!globals) {
+      globals = SWIG_newvarlink();
+    }
+    return globals;
   }
   
   /* -----------------------------------------------------------------------------
@@ -24467,9 +23443,9 @@ extern "C" {
             char *ndoc = (char*)malloc(ldoc + lptr + 10);
             if (ndoc) {
               char *buff = ndoc;
-              strncpy(buff, methods[i].ml_doc, ldoc);
+              memcpy(buff, methods[i].ml_doc, ldoc);
               buff += ldoc;
-              strncpy(buff, "swig_ptr: ", 10);
+              memcpy(buff, "swig_ptr: ", 10);
               buff += 10;
               SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
               methods[i].ml_doc = ndoc;
@@ -24480,6 +23456,64 @@ extern "C" {
     }
   } 
   
+  /* -----------------------------------------------------------------------------
+   * Method creation and docstring support functions
+   * ----------------------------------------------------------------------------- */
+  
+  /* -----------------------------------------------------------------------------
+   * Function to find the method definition with the correct docstring for the
+   * proxy module as opposed to the low-level API
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name) {
+    /* Find the function in the modified method table */
+    size_t offset = 0;
+    int found = 0;
+    while (SwigMethods_proxydocs[offset].ml_meth != NULL) {
+      if (strcmp(SwigMethods_proxydocs[offset].ml_name, name) == 0) {
+        found = 1;
+        break;
+      }
+      offset++;
+    }
+    /* Use the copy with the modified docstring if available */
+    return found ? &SwigMethods_proxydocs[offset] : NULL;
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * Wrapper of PyInstanceMethod_New() used in Python 3
+   * It is exported to the generated module, used for -fastproxy
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
+    if (PyCFunction_Check(func)) {
+      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
+      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
+      if (ml)
+      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
+    }
+#if PY_VERSION_HEX >= 0x03000000
+    return PyInstanceMethod_New(func);
+#else
+    return PyMethod_New(func, NULL, NULL);
+#endif
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * Wrapper of PyStaticMethod_New()
+   * It is exported to the generated module, used for -fastproxy
+   * ----------------------------------------------------------------------------- */
+  
+  SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
+    if (PyCFunction_Check(func)) {
+      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
+      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
+      if (ml)
+      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
+    }
+    return PyStaticMethod_New(func);
+  }
+  
 #ifdef __cplusplus
 }
 #endif
@@ -24499,20 +23533,12 @@ PyObject*
 void
 #endif
 SWIG_init(void) {
-  PyObject *m, *d, *md;
+  PyObject *m, *d, *md, *globals;
+  
 #if PY_VERSION_HEX >= 0x03000000
   static struct PyModuleDef SWIG_module = {
-# if PY_VERSION_HEX >= 0x03020000
     PyModuleDef_HEAD_INIT,
-# else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-# endif
-    (char *) SWIG_name,
+    SWIG_name,
     NULL,
     -1,
     SwigMethods,
@@ -24531,8 +23557,8 @@ SWIG_init(void) {
     (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
   };
   static SwigPyGetSet thisown_getset_closure = {
-    (PyCFunction) SwigPyObject_own,
-    (PyCFunction) SwigPyObject_own
+    SwigPyObject_own,
+    SwigPyObject_own
   };
   static PyGetSetDef thisown_getset_def = {
     (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
@@ -24563,13 +23589,23 @@ SWIG_init(void) {
   assert(metatype);
 #endif
   
+  (void)globals;
+  
+  /* Create singletons now to avoid potential deadlocks with multi-threaded usage after module initialization */
+  SWIG_This();
+  SWIG_Python_TypeCache();
+  SwigPyPacked_type();
+#ifndef SWIGPYTHON_BUILTIN
+  SwigPyObject_type();
+#endif
+  
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
 #if PY_VERSION_HEX >= 0x03000000
   m = PyModule_Create(&SWIG_module);
 #else
-  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+  m = Py_InitModule(SWIG_name, SwigMethods);
 #endif
   
   md = d = PyModule_GetDict(m);
@@ -24619,6 +23655,10 @@ SWIG_init(void) {
   
   SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
   
+  // thread safe initialization
+  swig::container_owner_attribute();
+  
+  
   import_array();
   
   SWIG_Python_SetConstant(d, "PyCallback_SCALAR",SWIG_From_int(static_cast< int >(PyCallback::SCALAR)));
diff --git a/auto/Wrap/libBornAgainFit_wrap.h b/auto/Wrap/libBornAgainFit_wrap.h
index 91deb3bfc0a31bb2a295690b88dc2f2b7bdcfa7c..ec6610edd3d72acb7afffbae1c4542565ff23624 100644
--- a/auto/Wrap/libBornAgainFit_wrap.h
+++ b/auto/Wrap/libBornAgainFit_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -21,7 +21,7 @@ public:
     SwigDirector_PyCallback(PyObject *self, PyCallback::CallbackType callback_type = PyCallback::SCALAR);
     virtual ~SwigDirector_PyCallback();
     virtual double call_scalar(Fit::Parameters pars);
-    virtual std::vector< double,std::allocator< double > > call_residuals(Fit::Parameters arg0);
+    virtual std::vector< double, std::allocator< double > > call_residuals(Fit::Parameters arg0);
 
 /* Internal director utilities */
 public:
diff --git a/auto/Wrap/swig_runtime.h b/auto/Wrap/swig_runtime.h
index de3fda4358271c36fbaf611150d8bc567608a740..abc07c95740d46e9e4eb7d3bfbd4bfa71a1b9c11 100644
--- a/auto/Wrap/swig_runtime.h
+++ b/auto/Wrap/swig_runtime.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 4.0.1
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -192,6 +192,7 @@
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
+#define SWIG_POINTER_NO_NULL       0x4
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -759,14 +760,16 @@ SWIGINTERN char*
 SWIG_Python_str_AsChar(PyObject *str)
 {
 #if PY_VERSION_HEX >= 0x03000000
-  char *cstr;
-  char *newstr;
-  Py_ssize_t len;
+  char *newstr = 0;
   str = PyUnicode_AsUTF8String(str);
-  PyBytes_AsStringAndSize(str, &cstr, &len);
-  newstr = (char *) malloc(len+1);
-  memcpy(newstr, cstr, len+1);
-  Py_XDECREF(str);
+  if (str) {
+    char *cstr;
+    Py_ssize_t len;
+    PyBytes_AsStringAndSize(str, &cstr, &len);
+    newstr = (char *) malloc(len+1);
+    memcpy(newstr, cstr, len+1);
+    Py_XDECREF(str);
+  }
   return newstr;
 #else
   return PyString_AsString(str);
@@ -790,144 +793,14 @@ SWIG_Python_str_FromChar(const char *c)
 #endif
 }
 
-/* Add PyOS_snprintf for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
-#  define PyOS_snprintf _snprintf
-# else
-#  define PyOS_snprintf snprintf
-# endif
-#endif
-
-/* A crude PyString_FromFormat implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-
-#ifndef SWIG_PYBUFFER_SIZE
-# define SWIG_PYBUFFER_SIZE 1024
-#endif
-
-static PyObject *
-PyString_FromFormat(const char *fmt, ...) {
-  va_list ap;
-  char buf[SWIG_PYBUFFER_SIZE * 2];
-  int res;
-  va_start(ap, fmt);
-  res = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
-}
-#endif
-
 #ifndef PyObject_DEL
 # define PyObject_DEL PyObject_Del
 #endif
 
-/* A crude PyExc_StopIteration exception for old Pythons */
-#if PY_VERSION_HEX < 0x02020000
-# ifndef PyExc_StopIteration
-#  define PyExc_StopIteration PyExc_RuntimeError
-# endif
-# ifndef PyObject_GenericGetAttr
-#  define PyObject_GenericGetAttr 0
-# endif
-#endif
-
-/* Py_NotImplemented is defined in 2.1 and up. */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef Py_NotImplemented
-#  define Py_NotImplemented PyExc_RuntimeError
-# endif
-#endif
-
-/* A crude PyString_AsStringAndSize implementation for old Pythons */
-#if PY_VERSION_HEX < 0x02010000
-# ifndef PyString_AsStringAndSize
-#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
-# endif
-#endif
-
-/* PySequence_Size for old Pythons */
-#if PY_VERSION_HEX < 0x02000000
-# ifndef PySequence_Size
-#  define PySequence_Size PySequence_Length
-# endif
-#endif
-
-/* PyBool_FromLong for old Pythons */
-#if PY_VERSION_HEX < 0x02030000
-static
-PyObject *PyBool_FromLong(long ok)
-{
-  PyObject *result = ok ? Py_True : Py_False;
-  Py_INCREF(result);
-  return result;
-}
-#endif
-
-/* Py_ssize_t for old Pythons */
-/* This code is as recommended by: */
-/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-# define PY_SSIZE_T_MAX INT_MAX
-# define PY_SSIZE_T_MIN INT_MIN
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intintargfunc ssizessizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-typedef intintobjargproc ssizessizeobjargproc;
-typedef getreadbufferproc readbufferproc;
-typedef getwritebufferproc writebufferproc;
-typedef getsegcountproc segcountproc;
-typedef getcharbufferproc charbufferproc;
-static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
-{
-  long result = 0;
-  PyObject *i = PyNumber_Int(x);
-  if (i) {
-    result = PyInt_AsLong(i);
-    Py_DECREF(i);
-  }
-  return result;
-}
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
-#endif
-
-#if PY_VERSION_HEX < 0x02040000
-#define Py_VISIT(op)				\
-  do { 						\
-    if (op) {					\
-      int vret = visit((op), arg);		\
-      if (vret)					\
-        return vret;				\
-    }						\
-  } while (0)
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef struct {
-  PyTypeObject type;
-  PyNumberMethods as_number;
-  PyMappingMethods as_mapping;
-  PySequenceMethods as_sequence;
-  PyBufferProcs as_buffer;
-  PyObject *name, *slots;
-} PyHeapTypeObject;
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef destructor freefunc;
-#endif
-
-#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
-     (PY_MAJOR_VERSION > 3))
+// SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user
+// interface files check for it.
 # define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-#endif
+# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
 
 #if PY_VERSION_HEX < 0x03020000
 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
@@ -989,14 +862,17 @@ SWIG_Python_AddErrorMsg(const char* mesg)
   PyObject *value = 0;
   PyObject *traceback = 0;
 
-  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (PyErr_Occurred())
+    PyErr_Fetch(&type, &value, &traceback);
   if (value) {
-    char *tmp;
     PyObject *old_str = PyObject_Str(value);
+    const char *tmp = SWIG_Python_str_AsChar(old_str);
     PyErr_Clear();
     Py_XINCREF(type);
-
-    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    if (tmp)
+      PyErr_Format(type, "%s %s", tmp, mesg);
+    else
+      PyErr_Format(type, "%s", mesg);
     SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
@@ -1004,6 +880,37 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
+
+SWIGRUNTIME int
+SWIG_Python_TypeErrorOccurred(PyObject *obj)
+{
+  PyObject *error;
+  if (obj)
+    return 0;
+  error = PyErr_Occurred();
+  return error && PyErr_GivenExceptionMatches(error, PyExc_TypeError);
+}
+
+SWIGRUNTIME void
+SWIG_Python_RaiseOrModifyTypeError(const char *message)
+{
+  if (SWIG_Python_TypeErrorOccurred(NULL)) {
+    /* Use existing TypeError to preserve stacktrace and enhance with given message */
+    PyObject *newvalue;
+    PyObject *type = NULL, *value = NULL, *traceback = NULL;
+    PyErr_Fetch(&type, &value, &traceback);
+#if PY_VERSION_HEX >= 0x03000000
+    newvalue = PyUnicode_FromFormat("%S\nAdditional information:\n%s", value, message);
+#else
+    newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message);
+#endif
+    Py_XDECREF(value);
+    PyErr_Restore(type, newvalue, traceback);
+  } else {
+    /* Raise TypeError using given message */
+    PyErr_SetString(PyExc_TypeError, message);
+  }
+}
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -1011,9 +918,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 #endif
 #if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
 #  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
-#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
-#      define SWIG_PYTHON_USE_GIL
-#    endif
+#    define SWIG_PYTHON_USE_GIL
 #  endif
 #  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
 #    ifndef SWIG_PYTHON_INITIALIZE_THREADS
@@ -1089,30 +994,13 @@ extern "C" {
 /* Constant information structure */
 typedef struct swig_const_info {
   int type;
-  char *name;
+  const char *name;
   long lvalue;
   double dvalue;
   void   *pvalue;
   swig_type_info **ptype;
 } swig_const_info;
 
-
-/* -----------------------------------------------------------------------------
- * Wrapper of PyInstanceMethod_New() used in Python 3
- * It is exported to the generated module, used for -fastproxy
- * ----------------------------------------------------------------------------- */
-#if PY_VERSION_HEX >= 0x03000000
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
-{
-  return PyInstanceMethod_New(func);
-}
-#else
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
-{
-  return NULL;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif
@@ -1126,6 +1014,14 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
  *
  * ----------------------------------------------------------------------------- */
 
+#if PY_VERSION_HEX < 0x02070000 /* 2.7.0 */
+# error "This version of SWIG only supports Python >= 2.7"
+#endif
+
+#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03020000
+# error "This version of SWIG only supports Python 3 >= 3.2"
+#endif
+
 /* Common SWIG API */
 
 /* for raw pointers */
@@ -1209,11 +1105,7 @@ SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);
   if (public_interface)
     SwigPyBuiltin_AddPublicSymbol(public_interface, name);
@@ -1223,11 +1115,7 @@ SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *nam
 
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
   PyDict_SetItemString(d, name, obj);
-#endif
   Py_DECREF(obj);                            
 }
 
@@ -1237,7 +1125,6 @@ SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {
 
 SWIGINTERN PyObject*
 SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
-#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
   if (!result) {
     result = obj;
   } else if (result == Py_None) {
@@ -1253,29 +1140,6 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
     Py_DECREF(obj);
   }
   return result;
-#else
-  PyObject*   o2;
-  PyObject*   o3;
-  if (!result) {
-    result = obj;
-  } else if (result == Py_None) {
-    Py_DECREF(result);
-    result = obj;
-  } else {
-    if (!PyTuple_Check(result)) {
-      o2 = result;
-      result = PyTuple_New(1);
-      PyTuple_SET_ITEM(result, 0, o2);
-    }
-    o3 = PyTuple_New(1);
-    PyTuple_SET_ITEM(o3, 0, obj);
-    o2 = result;
-    result = PySequence_Concat(o2, o3);
-    Py_DECREF(o2);
-    Py_DECREF(o3);
-  }
-  return result;
-#endif
 }
 
 /* Unpack the argument tuple */
@@ -1327,11 +1191,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 }
 
 /* A functor is a function object with one single object argument */
-#if PY_VERSION_HEX >= 0x02020000
 #define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
-#else
-#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
-#endif
 
 /*
   Helper for static pointer initialization for both C and C++ code, for example
@@ -1360,35 +1220,6 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 extern "C" {
 #endif
 
-/*  How to access Py_None */
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  ifndef SWIG_PYTHON_NO_BUILD_NONE
-#    ifndef SWIG_PYTHON_BUILD_NONE
-#      define SWIG_PYTHON_BUILD_NONE
-#    endif
-#  endif
-#endif
-
-#ifdef SWIG_PYTHON_BUILD_NONE
-#  ifdef Py_None
-#   undef Py_None
-#   define Py_None SWIG_Py_None()
-#  endif
-SWIGRUNTIMEINLINE PyObject * 
-_SWIG_Py_None(void)
-{
-  PyObject *none = Py_BuildValue((char*)"");
-  Py_DECREF(none);
-  return none;
-}
-SWIGRUNTIME PyObject * 
-SWIG_Py_None(void)
-{
-  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
-  return none;
-}
-#endif
-
 /* The python void return value */
 
 SWIGRUNTIMEINLINE PyObject * 
@@ -1415,7 +1246,10 @@ SWIGRUNTIMEINLINE int
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
   SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
-  return data ? data->implicitconv : 0;
+  int fail = data ? data->implicitconv : 0;
+  if (fail)
+    PyErr_SetString(PyExc_TypeError, "Implicit conversion is prohibited for explicit constructors.");
+  return fail;
 }
 
 SWIGRUNTIMEINLINE PyObject *
@@ -1442,11 +1276,7 @@ SwigPyClientData_New(PyObject* obj)
       data->newargs = obj;
       Py_INCREF(obj);
     } else {
-#if (PY_VERSION_HEX < 0x02020000)
-      data->newraw = 0;
-#else
-      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
-#endif
+      data->newraw = PyObject_GetAttrString(data->klass, "__new__");
       if (data->newraw) {
 	Py_INCREF(data->newraw);
 	data->newargs = PyTuple_New(1);
@@ -1457,7 +1287,7 @@ SwigPyClientData_New(PyObject* obj)
       Py_INCREF(data->newargs);
     }
     /* the destroy method, aka as the C++ delete method */
-    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    data->destroy = PyObject_GetAttrString(data->klass, "__swig_destroy__");
     if (PyErr_Occurred()) {
       PyErr_Clear();
       data->destroy = 0;
@@ -1466,11 +1296,7 @@ SwigPyClientData_New(PyObject* obj)
       int flags;
       Py_INCREF(data->destroy);
       flags = PyCFunction_GET_FLAGS(data->destroy);
-#ifdef METH_O
       data->delargs = !(flags & (METH_O));
-#else
-      data->delargs = 0;
-#endif
     } else {
       data->delargs = 0;
     }
@@ -1558,20 +1384,12 @@ SwigPyObject_hex(SwigPyObject *v)
 }
 
 SWIGRUNTIME PyObject *
-#ifdef METH_NOARGS
 SwigPyObject_repr(SwigPyObject *v)
-#else
-SwigPyObject_repr(SwigPyObject *v, PyObject *args)
-#endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
   PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
   if (v->next) {
-# ifdef METH_NOARGS
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-# else
-    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-# endif
 # if PY_VERSION_HEX >= 0x03000000
     PyObject *joined = PyUnicode_Concat(repr, nrep);
     Py_DecRef(repr);
@@ -1584,6 +1402,14 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
   return repr;  
 }
 
+/* We need a version taking two PyObject* parameters so it's a valid
+ * PyCFunction to use in swigobject_methods[]. */
+SWIGRUNTIME PyObject *
+SwigPyObject_repr2(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
+{
+  return SwigPyObject_repr((SwigPyObject*)v);
+}
+
 SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
@@ -1657,14 +1483,14 @@ SwigPyObject_dealloc(PyObject *v)
       PyObject *res;
 
       /* PyObject_CallFunction() has the potential to silently drop
-         the active active exception.  In cases of unnamed temporary
+         the active exception.  In cases of unnamed temporary
          variable or where we just finished iterating over a generator
          StopIteration will be active right now, and this needs to
          remain true upon return from SwigPyObject_dealloc.  So save
          and restore. */
       
-      PyObject *val = NULL, *type = NULL, *tb = NULL;
-      PyErr_Fetch(&val, &type, &tb);
+      PyObject *type = NULL, *value = NULL, *traceback = NULL;
+      PyErr_Fetch(&type, &value, &traceback);
 
       if (data->delargs) {
         /* we need to create a temporary object to carry the destroy operation */
@@ -1679,7 +1505,7 @@ SwigPyObject_dealloc(PyObject *v)
       if (!res)
         PyErr_WriteUnraisable(destroy);
 
-      PyErr_Restore(val, type, tb);
+      PyErr_Restore(type, value, traceback);
 
       Py_XDECREF(res);
     } 
@@ -1698,11 +1524,6 @@ SWIGRUNTIME PyObject*
 SwigPyObject_append(PyObject* v, PyObject* next)
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
-#ifndef METH_O
-  PyObject *tmp = 0;
-  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
-  next = tmp;
-#endif
   if (!SwigPyObject_Check(next)) {
     PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
     return NULL;
@@ -1713,11 +1534,7 @@ SwigPyObject_append(PyObject* v, PyObject* next)
 }
 
 SWIGRUNTIME PyObject* 
-#ifdef METH_NOARGS
-SwigPyObject_next(PyObject* v)
-#else
 SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
@@ -1729,11 +1546,7 @@ SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_disown(PyObject *v)
-#else
 SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
@@ -1741,11 +1554,7 @@ SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 }
 
 SWIGINTERN PyObject*
-#ifdef METH_NOARGS
-SwigPyObject_acquire(PyObject *v)
-#else
 SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
-#endif
 {
   SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
@@ -1756,70 +1565,32 @@ SWIGINTERN PyObject*
 SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
-#if (PY_VERSION_HEX < 0x02020000)
-  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#elif (PY_VERSION_HEX < 0x02050000)
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
-#else
-  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
-#endif
-    {
-      return NULL;
+  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) {
+    return NULL;
+  } else {
+    SwigPyObject *sobj = (SwigPyObject *)v;
+    PyObject *obj = PyBool_FromLong(sobj->own);
+    if (val) {
+      if (PyObject_IsTrue(val)) {
+        SwigPyObject_acquire(v,args);
+      } else {
+        SwigPyObject_disown(v,args);
+      }
     } 
-  else
-    {
-      SwigPyObject *sobj = (SwigPyObject *)v;
-      PyObject *obj = PyBool_FromLong(sobj->own);
-      if (val) {
-#ifdef METH_NOARGS
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v);
-	} else {
-	  SwigPyObject_disown(v);
-	}
-#else
-	if (PyObject_IsTrue(val)) {
-	  SwigPyObject_acquire(v,args);
-	} else {
-	  SwigPyObject_disown(v,args);
-	}
-#endif
-      } 
-      return obj;
-    }
+    return obj;
+  }
 }
 
-#ifdef METH_O
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {"disown",  SwigPyObject_disown,  METH_NOARGS,  "releases ownership of the pointer"},
+  {"acquire", SwigPyObject_acquire, METH_NOARGS,  "acquires ownership of the pointer"},
+  {"own",     SwigPyObject_own,     METH_VARARGS, "returns/sets ownership of the pointer"},
+  {"append",  SwigPyObject_append,  METH_O,       "appends another 'this' object"},
+  {"next",    SwigPyObject_next,    METH_NOARGS,  "returns the next 'this' object"},
+  {"__repr__",SwigPyObject_repr2,   METH_NOARGS,  "returns object representation"},
   {0, 0, 0, 0}  
 };
-#else
-static PyMethodDef
-swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
-  {0, 0, 0, 0}  
-};
-#endif
-
-#if PY_VERSION_HEX < 0x02020000
-SWIGINTERN PyObject *
-SwigPyObject_getattr(SwigPyObject *sobj,char *name)
-{
-  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
-}
-#endif
 
 SWIGRUNTIME PyTypeObject*
 SwigPyObject_TypeOnce(void) {
@@ -1864,12 +1635,8 @@ SwigPyObject_TypeOnce(void) {
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */
 #elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
-#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+#else
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
-    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
@@ -1883,16 +1650,12 @@ SwigPyObject_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyObject",               /* tp_name */
+      "SwigPyObject",                       /* tp_name */
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
       0,                                    /* tp_print */
-#if PY_VERSION_HEX < 0x02020000
-      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
-#else
       (getattrfunc)0,                       /* tp_getattr */
-#endif
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX >= 0x03000000
       0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
@@ -1915,7 +1678,6 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_clear */
       (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       swigobject_methods,                   /* tp_methods */
@@ -1936,13 +1698,8 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -1950,20 +1707,14 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpyobject_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpyobject_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpyobject_type) < 0)
       return NULL;
-#endif
   }
   return &swigpyobject_type;
 }
@@ -1992,20 +1743,6 @@ typedef struct {
   size_t size;
 } SwigPyPacked;
 
-SWIGRUNTIME int
-SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char result[SWIG_BUFFER_SIZE];
-  fputs("<Swig Packed ", fp); 
-  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    fputs("at ", fp); 
-    fputs(result, fp); 
-  }
-  fputs(v->ty->name,fp); 
-  fputs(">", fp);
-  return 0; 
-}
-  
 SWIGRUNTIME PyObject *
 SwigPyPacked_repr(SwigPyPacked *v)
 {
@@ -2034,7 +1771,7 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
   size_t i = v->size;
   size_t j = w->size;
   int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
-  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+  return s ? s : strncmp((const char *)v->pack, (const char *)w->pack, 2*v->size);
 }
 
 SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
@@ -2074,11 +1811,11 @@ SwigPyPacked_TypeOnce(void) {
       PyObject_HEAD_INIT(NULL)
       0,                                    /* ob_size */
 #endif
-      (char *)"SwigPyPacked",               /* tp_name */
+      "SwigPyPacked",                       /* tp_name */
       sizeof(SwigPyPacked),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
+      0,                                    /* tp_print */
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000
@@ -2102,7 +1839,6 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_clear */
       0,                                    /* tp_richcompare */
       0,                                    /* tp_weaklistoffset */
-#if PY_VERSION_HEX >= 0x02020000
       0,                                    /* tp_iter */
       0,                                    /* tp_iternext */
       0,                                    /* tp_methods */
@@ -2123,13 +1859,8 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_cache */
       0,                                    /* tp_subclasses */
       0,                                    /* tp_weaklist */
-#endif
-#if PY_VERSION_HEX >= 0x02030000
       0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
       0,                                    /* tp_version_tag */
-#endif
 #if PY_VERSION_HEX >= 0x03040000
       0,                                    /* tp_finalize */
 #endif
@@ -2137,20 +1868,14 @@ SwigPyPacked_TypeOnce(void) {
       0,                                    /* tp_allocs */
       0,                                    /* tp_frees */
       0,                                    /* tp_maxalloc */
-#if PY_VERSION_HEX >= 0x02050000
       0,                                    /* tp_prev */
-#endif
       0                                     /* tp_next */
 #endif
     };
     swigpypacked_type = tmp;
     type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
-    swigpypacked_type.ob_type = &PyType_Type;
-#else
     if (PyType_Ready(&swigpypacked_type) < 0)
       return NULL;
-#endif
   }
   return &swigpypacked_type;
 }
@@ -2191,20 +1916,14 @@ SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
  * pointers/data manipulation
  * ----------------------------------------------------------------------------- */
 
-SWIGRUNTIMEINLINE PyObject *
-_SWIG_This(void)
-{
-    return SWIG_Python_str_FromChar("this");
-}
-
-static PyObject *swig_this = NULL;
+static PyObject *Swig_This_global = NULL;
 
 SWIGRUNTIME PyObject *
 SWIG_This(void)
 {
-  if (swig_this == NULL)
-    swig_this = _SWIG_This();
-  return swig_this;
+  if (Swig_This_global == NULL)
+    Swig_This_global = SWIG_Python_str_FromChar("this");
+  return Swig_This_global;
 }
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
@@ -2236,7 +1955,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
   obj = 0;
 
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
   if (PyInstance_Check(pyobj)) {
     obj = _PyInstance_Lookup(pyobj, SWIG_This());      
   } else {
@@ -2306,7 +2025,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
   if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
-    return SWIG_OK;
+    return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
   }
 
   res = SWIG_ERROR;
@@ -2386,13 +2105,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
           }
         }
       }
-    }
-    if (!SWIG_IsOK(res) && obj == Py_None) {
-      if (ptr)
-        *ptr = 0;
-      if (PyErr_Occurred())
-        PyErr_Clear();
-      res = SWIG_OK;
+      if (!SWIG_IsOK(res) && obj == Py_None) {
+        if (ptr)
+          *ptr = 0;
+        if (PyErr_Occurred())
+          PyErr_Clear();
+        res = SWIG_OK;
+      }
     }
   }
   return res;
@@ -2406,31 +2125,28 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     return SWIG_ConvertPtr(obj, ptr, ty, 0);
   } else {
     void *vptr = 0;
-    
+    swig_cast_info *tc;
+
     /* here we get the method pointer for callbacks */
     const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
     if (desc)
       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-    if (!desc) 
+    if (!desc)
       return SWIG_ERROR;
-    if (ty) {
-      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
+    tc = SWIG_TypeCheck(desc,ty);
+    if (tc) {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     } else {
-      *ptr = vptr;
+      return SWIG_ERROR;
     }
     return SWIG_OK;
   }
 }
 
-/* Convert a packed value value */
+/* Convert a packed pointer value */
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
@@ -2458,7 +2174,6 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 SWIGRUNTIME PyObject* 
 SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
-#if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
   PyObject *newraw = data->newraw;
   if (newraw) {
@@ -2481,10 +2196,18 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
     }
   } else {
 #if PY_VERSION_HEX >= 0x03000000
-    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    if (inst) {
-      PyObject_SetAttr(inst, SWIG_This(), swig_this);
-      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    PyObject *empty_args = PyTuple_New(0);
+    if (empty_args) {
+      PyObject *empty_kwargs = PyDict_New();
+      if (empty_kwargs) {
+        inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, empty_kwargs);
+        Py_DECREF(empty_kwargs);
+        if (inst) {
+          PyObject_SetAttr(inst, SWIG_This(), swig_this);
+          Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+        }
+      }
+      Py_DECREF(empty_args);
     }
 #else
     PyObject *dict = PyDict_New();
@@ -2496,45 +2219,13 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 #endif
   }
   return inst;
-#else
-#if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst = 0;
-  PyObject *dict = PyDict_New();
-  if (dict) {
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-  }
-  return (PyObject *) inst;
-#else
-  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
-  if (inst == NULL) {
-    return NULL;
-  }
-  inst->in_class = (PyClassObject *)data->newargs;
-  Py_INCREF(inst->in_class);
-  inst->in_dict = PyDict_New();
-  if (inst->in_dict == NULL) {
-    Py_DECREF(inst);
-    return NULL;
-  }
-#ifdef Py_TPFLAGS_HAVE_WEAKREFS
-  inst->in_weakreflist = NULL;
-#endif
-#ifdef Py_TPFLAGS_GC
-  PyObject_GC_Init(inst);
-#endif
-  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
-  return (PyObject *) inst;
-#endif
-#endif
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
 {
  PyObject *dict;
-#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
  PyObject **dictptr = _PyObject_GetDictPtr(inst);
  if (dictptr != NULL) {
    dict = *dictptr;
@@ -2546,7 +2237,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
    return;
  }
 #endif
- dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ dict = PyObject_GetAttrString(inst, "__dict__");
  PyDict_SetItem(dict, SWIG_This(), swig_this);
  Py_DECREF(dict);
 } 
@@ -2645,12 +2336,7 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
 #ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
 #else
-# ifdef SWIGPY_USE_CAPSULE
     type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-# else
-    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-# endif
     if (PyErr_Occurred()) {
       PyErr_Clear();
       type_pointer = (void *)0;
@@ -2660,48 +2346,10 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return (swig_module_info *) type_pointer;
 }
 
-#if PY_MAJOR_VERSION < 2
-/* PyModule_AddObject function was introduced in Python 2.0.  The following function
-   is copied out of Python/modsupport.c in python version 2.3.4 */
-SWIGINTERN int
-PyModule_AddObject(PyObject *m, char *name, PyObject *o)
-{
-  PyObject *dict;
-  if (!PyModule_Check(m)) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg");
-    return SWIG_ERROR;
-  }
-  if (!o) {
-    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value");
-    return SWIG_ERROR;
-  }
-  
-  dict = PyModule_GetDict(m);
-  if (dict == NULL) {
-    /* Internal error -- modules must have a dict! */
-    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
-		 PyModule_GetName(m));
-    return SWIG_ERROR;
-  }
-  if (PyDict_SetItemString(dict, name, o))
-    return SWIG_ERROR;
-  Py_DECREF(o);
-  return SWIG_OK;
-}
-#endif
-
 SWIGRUNTIME void
-#ifdef SWIGPY_USE_CAPSULE
 SWIG_Python_DestroyModule(PyObject *obj)
-#else
-SWIG_Python_DestroyModule(void *vptr)
-#endif
 {
-#ifdef SWIGPY_USE_CAPSULE
   swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
-#else
-  swig_module_info *swig_module = (swig_module_info *) vptr;
-#endif
   swig_type_info **types = swig_module->types;
   size_t i;
   for (i =0; i < swig_module->size; ++i) {
@@ -2712,33 +2360,24 @@ SWIG_Python_DestroyModule(void *vptr)
     }
   }
   Py_DECREF(SWIG_This());
-  swig_this = NULL;
+  Swig_This_global = NULL;
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
 #if PY_VERSION_HEX >= 0x03000000
  /* Add a dummy module object into sys.modules */
-  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+  PyObject *module = PyImport_AddModule("swig_runtime_data" SWIG_RUNTIME_VERSION);
 #else
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
+  PyObject *module = Py_InitModule("swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
 #endif
-#ifdef SWIGPY_USE_CAPSULE
   PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
   if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
+    PyModule_AddObject(module, "type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
   } else {
     Py_XDECREF(pointer);
   }
-#else
-  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#endif
 }
 
 /* The python cached type query */
@@ -2756,20 +2395,12 @@ SWIG_Python_TypeQuery(const char *type)
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
-#ifdef SWIGPY_USE_CAPSULE
     descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
-#else
-    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-#endif
   } else {
     swig_module_info *swig_module = SWIG_GetModule(0);
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
-#ifdef SWIGPY_USE_CAPSULE
       obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-#else
-      obj = PyCObject_FromVoidPtr(descriptor, NULL);
-#endif
       PyDict_SetItem(cache, key, obj);
       Py_DECREF(obj);
     }
@@ -2794,14 +2425,15 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront)
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
-      char *tmp;
       PyObject *old_str = PyObject_Str(value);
+      const char *tmp = SWIG_Python_str_AsChar(old_str);
+      const char *errmesg = tmp ? tmp : "Invalid error message";
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
+	PyErr_Format(type, "%s %s", mesg, errmesg);
       } else {
-	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+	PyErr_Format(type, "%s %s", errmesg, mesg);
       }
       SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
@@ -2927,6 +2559,8 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       Py_INCREF(name);
     } else {
       encoded_name = PyUnicode_AsUTF8String(name);
+      if (!encoded_name)
+        return -1;
     }
     PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
     Py_DECREF(encoded_name);
diff --git a/cmake/bornagain/modules/SearchInstalledSoftware.cmake b/cmake/bornagain/modules/SearchInstalledSoftware.cmake
index 218eadf20df6ec65f5f2330be471ff75082e3eba..e009ed7aef6a5067655ef584cd8e6ce7c42d0996 100644
--- a/cmake/bornagain/modules/SearchInstalledSoftware.cmake
+++ b/cmake/bornagain/modules/SearchInstalledSoftware.cmake
@@ -84,7 +84,7 @@ endif()
 
 # --- Swig ---
 if(BORNAGAIN_PYTHON AND BORNAGAIN_GENERATE_BINDINGS)
-    find_package(SWIG 3.0 REQUIRED)
+    find_package(SWIG 4.0 REQUIRED)
     include(${SWIG_USE_FILE})
     message(STATUS "Found SWIG version ${SWIG_VERSION} at ${SWIG_EXECUTABLE} with flags '${SWIG_FLAGS}'; CMake definitions in ${SWIG_USE_FILE}")
 endif()